]> glassweightruler.freedombox.rocks Git - Ventoy.git/blobdiff - LinuxGUI/WebUI/index.html
projects / Ventoy.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fix the boot issue for Parted Magic (#3304)
[Ventoy.git] / LinuxGUI / WebUI / index.html
diff --git a/LinuxGUI/WebUI/index.html b/LinuxGUI/WebUI/index.html
index 5c91c977fa5ff0fedd683ded6369595f7c6a8792..fa90c0452f759e3af36b9e5770a5b39cc94ebbf4 100644 (file)
--- a/LinuxGUI/WebUI/index.html
+++ b/LinuxGUI/WebUI/index.html
@@ -171,7 +171,7 @@
     </style>\r
 </head>\r
 \r
-<body style="overflow:hidden">\r
+<body style="overflow:hidden;">\r
     <div class="wrapper" >\r
         <!-- Content Wrapper. Contains page content -->\r
         <div id='vtoy_main_div' style='width:540px; position:absolute;'>\r
@@ -198,7 +198,7 @@
                 \r
                         <div class="form-group" style="width:520px;">\r
                             <div class="col-sm-6" style="float:left; width:350px;">\r
-                                <input type="number" min="1" class="form-control" id="vtoy_preserve_space" style="font-family: couriew new;font-size: 14px;"/>                                \r
+                                <input type="text" maxlength="14" class="form-control" id="vtoy_preserve_space" style="font-family: couriew new;font-size: 14px;"/>                                \r
                             </div>\r
                             <div class="col-sm-6" style="float:left; width:150px;">\r
                                 <select id="vtoy_space_unit_dropbox" class="form-control valid vtoyselect2" aria-invalid="false">\r
@@ -342,6 +342,7 @@
     var vtoy_cur_process_disk_name;\r
     var vtoy_chrome_app_mode = (window.location.href.indexOf('chrome-app') >= 0) ? 1 : 0;\r
 \r
+\r
     function sort_language_list() {\r
         var tmp;\r
         for (var i = 0; i < vtoy_language_data.length; i++) {\r
@@ -381,7 +382,17 @@
         $('h3#vtoy_local_ver_title').text(vtoy_cur_language.STR_LOCAL_VER);\r
         $('h3#vtoy_dev_ver_title').text(vtoy_cur_language.STR_DISK_VER);\r
         $('span#vtoy_status_title').text(vtoy_cur_language.STR_STATUS);\r
-        $('span#vtoy_dev_title').text(vtoy_cur_language.STR_DEVICE);\r
+        \r
+        if ($('#vtoy_preserve_space_checkbox').is(':checked')) {\r
+            var valx = $('#vtoy_preserve_space').val();\r
+            if ($('#vtoy_space_unit_dropbox').val() > 0) {\r
+                $('span#vtoy_dev_title').text(vtoy_cur_language.STR_DEVICE + ' [ -' + valx + 'MB ]');\r
+            } else {\r
+                $('span#vtoy_dev_title').text(vtoy_cur_language.STR_DEVICE + ' [ -' + valx + 'GB ]');\r
+            }\r
+        } else {\r
+            $('span#vtoy_dev_title').text(vtoy_cur_language.STR_DEVICE);\r
+        }\r
         \r
         $('span#vtoy_menu_secure_boot').text(vtoy_cur_language.STR_MENU_SECURE_BOOT);\r
         $('span#vtoy_menu_part_style').text(vtoy_cur_language.STR_MENU_PART_STYLE);\r
@@ -525,7 +536,28 @@
         $('#vtoy_set_part_cfg_modal').modal({backdrop: 'static', keyboard: false});\r
     }\r
     \r
-    $("#vtoy_modal_btn_ok").click(function(){  \r
+    $("#vtoy_modal_btn_ok").click(function(){\r
+        if ($('#vtoy_preserve_space_checkbox').is(':checked')) {\r
+            var valx = $('#vtoy_preserve_space').val();\r
+            if (valx.length > 14) {\r
+                ventoy_display_alert('error', vtoy_cur_language.STR_SPACE_VAL_INVALID);\r
+                return;\r
+            }\r
+            \r
+            var regPat = /^\d+$/;\r
+            if (!(regPat.test(valx))) {\r
+                ventoy_display_alert('error', vtoy_cur_language.STR_SPACE_VAL_INVALID);\r
+                return;\r
+            }\r
+            \r
+            if ($('#vtoy_space_unit_dropbox').val() > 0) {\r
+                $('span#vtoy_dev_title').text(vtoy_cur_language.STR_DEVICE + ' [ -' + valx + 'MB ]');\r
+            } else {\r
+                $('span#vtoy_dev_title').text(vtoy_cur_language.STR_DEVICE + ' [ -' + valx + 'GB ]');\r
+            }\r
+        } else {\r
+            $('span#vtoy_dev_title').text(vtoy_cur_language.STR_DEVICE);\r
+        }\r
         $("#vtoy_set_part_cfg_modal").modal('hide');\r
     });\r
     \r
@@ -548,11 +580,16 @@
     }\r
         \r
     function ResizeWindow() {\r
-        //console.log(window.screen.width + ' [x1] ' + window.screen.height);        \r
+        //console.log(window.screen.availWidth + ' [x1] ' + window.screen.availHeight);        \r
         //console.log(vtoy_app_width + ' [x2] ' + vtoy_app_height);\r
-        //console.log((window.screen.width - vtoy_app_width) / 2 + ' [x3] ' + (window.screen.height - vtoy_app_height) / 2);        \r
-        window.moveTo((window.screen.width - vtoy_app_width) / 2, (window.screen.height - vtoy_app_height) / 2);\r
-        window.resizeTo(vtoy_app_width, vtoy_app_height);\r
+        //console.log((window.screen.availWidth - vtoy_app_width) / 2 + ' [x3] ' + (window.screen.availHeight - vtoy_app_height) / 2);        \r
+        \r
+        window.onresize = function() { };\r
+        \r
+        window.resizeTo(vtoy_app_width, vtoy_app_height);        \r
+        window.moveTo((window.screen.availWidth - vtoy_app_width) / 2, (window.screen.availHeight - vtoy_app_height) / 2);\r
+        \r
+        window.onresize = ResizeWindow;\r
     }\r
 \r
     function MoveMainDivToCenter() {\r
@@ -724,6 +761,8 @@
                 vtoy_in_progress = true;\r
                 progressDisableItem(vtoy_in_progress);\r
                 queryProgress(1);\r
+            }else if (data.result === '4kn') {\r
+                ventoy_display_alert('error', vtoy_cur_language.STR_4KN_UNSUPPORTED);\r
             } else {\r
                 ventoy_display_alert('error', vtoy_cur_language.STR_INSTALL_FAILED);\r
             }\r
@@ -749,6 +788,11 @@
         \r
         if ($('#vtoy_preserve_space_checkbox').is(':checked')) {\r
             var valx = $('#vtoy_preserve_space').val();\r
+            if (valx.length > 14) {\r
+                ventoy_display_alert('error', vtoy_cur_language.STR_SPACE_VAL_INVALID);\r
+                return;\r
+            }\r
+\r
             if (valx > 0) {\r
                 if ($('#vtoy_space_unit_dropbox').val() > 0) {\r
                     reserve = valx * 1024 * 1024;\r
@@ -975,9 +1019,6 @@
     $('#vtoy_part_align_4kb').prop("checked", true);\r
     \r
     if (vtoy_chrome_app_mode) {\r
-        window.onresize = function() {\r
-            ResizeWindow();\r
-        }\r
         ResizeWindow();\r
     } else {\r
         $('#vtoy_main_div').css("border", '2px solid #f4f4f4');\r
@@ -1004,7 +1045,7 @@
     }\r
     \r
     on_select_mbr();\r
-    secure_boot_check(0);\r
+    secure_boot_check(1);\r
     \r
     on_enable_preserve_space();\r
     \r
https://github.com/ventoy/Ventoy