bug fix

[Ventoy.git] / Plugson / www / static / js / vtoy.js

diff --git a/Plugson/www/static/js/vtoy.js b/Plugson/www/static/js/vtoy.js
index 0940108e1550f47b1778517dd54c2680e775caad..68719254a0c6d1ca4f08d15952b2927abd857fd1 100644 (file)
--- a/Plugson/www/static/js/vtoy.js
+++ b/Plugson/www/static/js/vtoy.js
@@ -2,6 +2,13 @@
 function ventoy_replace_slash(str) {\r
     var str1 = str.replace(/\\/g, '/');\r
     var str2 = str1.replace(/\/\//g, '/');\r
+    \r
+    if (str2 && str2.length > 0) {\r
+        if (str2.substr(-1) === "/") {\r
+            return str2.substr(0, str2.length - 1);\r
+        }\r
+    }\r
+    \r
     return str2;\r
 }\r
 \r
@@ -479,6 +486,8 @@ var g_vtoy_cur_language_en =
     "STR_SECURE_BOOT_ENABLE": "Enable",\r
     "STR_SECURE_BOOT_DISABLE": "Disable",\r
     "STR_SYNTAX_ERROR_TIP": "Syntax error detected in ventoy.json, so the configuration is not loaded!",\r
+    "STR_INVALID_CONFIG_TIP": "Invalid configuration detected in ventoy.json, so the configuration is not loaded!",\r
+    "STR_CONFIG_SAVE_ERROR_TIP": "Failed to write ventoy.json file. Check VentoyPlugson.log for more details!",\r
 \r
     "STR_XXX": "xxx"\r
 };\r
@@ -613,7 +622,8 @@ var g_vtoy_cur_language_cn =
     "STR_SECURE_BOOT_ENABLE": "开启",\r
     "STR_SECURE_BOOT_DISABLE": "未开启",\r
     "STR_SYNTAX_ERROR_TIP": "ventoy.json 文件中存在语法错误，配置未加载!",\r
-\r
+    "STR_INVALID_CONFIG_TIP": "ventoy.json 文件中存在错误配置，配置未加载!",\r
+    "STR_CONFIG_SAVE_ERROR_TIP": "ventoy.json 文件写入失败，详细信息请参考 VentoyPlugson.log 文件!",\r
 \r
 \r
     "STR_XXX": "xxx"\r
@@ -1064,13 +1074,13 @@ var g_type_select_validator = $("#TypeSelectForm").validate({
 function VtoySelectType(cb, para) {\r
 \r
     $('#TypeSelectForm #TypeSelForm_lang_1').text(g_vtoy_cur_language.STR_SELECT);\r
-\r
+    \r
     if (g_current_language === 'en') {\r
-        $('#SetDirForm #SetDirForm_lang_2').text(" OK");\r
-        $('#SetDirForm #SetDirForm_lang_3').text("Cancel");\r
+        $('#TypeSelectForm #TypeSelForm_lang_2').text(" OK");\r
+        $('#TypeSelectForm #TypeSelForm_lang_3').text("Cancel");\r
     } else {\r
-        $('#SetDirForm #SetDirForm_lang_2').text("确定");\r
-        $('#SetDirForm #SetDirForm_lang_3').text("取消");\r
+        $('#TypeSelectForm #TypeSelForm_lang_2').text("确定");\r
+        $('#TypeSelectForm #TypeSelForm_lang_3').text("取消");\r
     }\r
     \r
     var $tbl = $("#id_type_select_table tbody");\r
@@ -1133,11 +1143,11 @@ function VtoySetKey(cb, para) {
     $('#SetKeyForm #SetKeyForm_lang_3').text(para.title2);\r
 \r
     if (g_current_language === 'en') {\r
-        $('#SetDirForm #SetDirForm_lang_4').text(" OK");\r
-        $('#SetDirForm #SetDirForm_lang_5').text("Cancel");\r
+        $('#SetKeyForm #SetKeyForm_lang_4').text(" OK");\r
+        $('#SetKeyForm #SetKeyForm_lang_5').text("Cancel");\r
     } else {\r
-        $('#SetDirForm #SetDirForm_lang_4').text("确定");\r
-        $('#SetDirForm #SetDirForm_lang_5').text("取消");\r
+        $('#SetKeyForm #SetKeyForm_lang_4').text("确定");\r
+        $('#SetKeyForm #SetKeyForm_lang_5').text("取消");\r
     }\r
     \r
     g_set_key_callback = cb;\r
@@ -1395,15 +1405,15 @@ function VtoySetDirFile(cb, para) {
     $('#SetDirFileModal #SetDirFileForm_label2').text(para.label2);\r
 \r
     if (g_current_language === 'en') {\r
-        $('#SetDirFileModal #SetDirFileModal_ok').text(" OK");\r
-        $('#SetDirFileModal #SetDirFileModal_cancel').text("Cancel");\r
+        $('#SetDirFileModal #SetDirFileForm_ok').text(" OK");\r
+        $('#SetDirFileModal #SetDirFileForm_cancel').text("Cancel");\r
 \r
         $('#SetDirFileModal #id_note_dirfile_cn').hide();\r
         $('#SetDirFileModal #id_note_dirfile_en').show();\r
 \r
     } else {\r
-        $('#SetDirFileModal #SetDirFileModal_ok').text("确定");\r
-        $('#SetDirFileModal #SetDirFileModal_cancel').text("取消");\r
+        $('#SetDirFileModal #SetDirFileForm_ok').text("确定");\r
+        $('#SetDirFileModal #SetDirFileForm_cancel').text("取消");\r
 \r
         $('#SetDirFileModal #id_note_dirfile_en').hide();\r
         $('#SetDirFileModal #id_note_dirfile_cn').show();\r