Upd: some enhancements

jcorporation · Aug 10, 2023 · 66abf1a · 66abf1a
1 parent ee95c7e
commit 66abf1a
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 22 deletions.
diff --git a/docs/references/translating_status.md b/docs/references/translating_status.md
@@ -1,12 +1,12 @@
-- es-AR: 111 missing phrases
-- es-ES: 762 missing phrases
-- es-VE: 766 missing phrases
-- fi-FI: 763 missing phrases
-- fr-FR: 111 missing phrases
-- it-IT: 111 missing phrases
-- ja-JP: 113 missing phrases
-- ko-KR: 111 missing phrases
-- nl-NL: 111 missing phrases
-- pl-PL: 941 missing phrases
-- ru-RU: 209 missing phrases
-- zh-Hans: 111 missing phrases
+- es-AR: 114 missing phrases
+- es-ES: 765 missing phrases
+- es-VE: 769 missing phrases
+- fi-FI: 766 missing phrases
+- fr-FR: 114 missing phrases
+- it-IT: 114 missing phrases
+- ja-JP: 116 missing phrases
+- ko-KR: 114 missing phrases
+- nl-NL: 114 missing phrases
+- pl-PL: 944 missing phrases
+- ru-RU: 212 missing phrases
+- zh-Hans: 114 missing phrases
diff --git a/htdocs/index.html b/htdocs/index.html
@@ -1585,7 +1585,7 @@ <h4 data-phrase="Cloud"></h4>
           <button type="button" class="btn btn-secondary" data-bs-dismiss="modal" data-phrase="Cancel"></button>
           <div>
             <button id="modalSettingsApplyBtn" type="button" class="btn btn-success me-2 protected" data-href='{"cmd": "saveSettings", "options": [false]}' data-phrase="Apply"></button>
-            <button type="button" class="btn btn-success protected" data-href='{"cmd": "saveSettings", "options": [true]}' data-phrase="Save"></button>
+            <button id="modalSettingsSaveBtn"type="button" class="btn btn-success protected" data-href='{"cmd": "saveSettings", "options": [true]}' data-phrase="Save"></button>
           </div>
         </div>
       </div>
@@ -1753,7 +1753,7 @@ <h5 class="modal-title"><span class="mi title-icon">settings_ethernet</span> <sp
         </div>
         <div class="modal-footer justify-content-between">
           <button type="button" class="btn btn-secondary alwaysEnabled" data-bs-dismiss="modal" data-phrase="Cancel"></button>
-          <button type="button" class="btn btn-success alwaysEnabled protected" data-href='{"cmd": "saveConnection", "options": []}' data-phrase="Save"></button>
+          <button id="modalConnectionApplyBtn" type="button" class="btn btn-success alwaysEnabled protected" data-href='{"cmd": "saveConnection", "options": []}' data-phrase="Save"></button>
         </div>
       </div>
     </div>

diff --git a/htdocs/js/globales.js b/htdocs/js/globales.js
@@ -714,7 +714,8 @@ const settingsWebuiFields = {
         "validate": {
             "cmd": "validateUintEl",
             "options": []
-        }
+        },
+        "unit": "Pixel"
     },
     "bgColor": {
         "defaultValue": "#060708",

diff --git a/htdocs/js/modalConnection.js b/htdocs/js/modalConnection.js
@@ -103,6 +103,7 @@ function saveConnection() {
 
         settingsParams.mpdBinarylimit = settingsParams.mpdBinarylimit * 1024;
         settingsParams.mpdTimeout = settingsParams.mpdTimeout * 1000;
+        btnWaitingId('modalConnectionApplyBtn', true);
         sendAPIpartition('default', 'MYMPD_API_CONNECTION_SAVE', settingsParams, saveConnectionClose, true);
     }
 }
@@ -113,6 +114,7 @@ function saveConnection() {
  * @returns {void}
  */
 function saveConnectionClose(obj) {
+    btnWaitingId('modalConnectionApplyBtn', false);
     if (obj.error) {
         if (highlightInvalidInput('modalConnection', obj) === false) {
             showModalAlert(obj);

diff --git a/htdocs/js/modalSettings.js b/htdocs/js/modalSettings.js
@@ -289,9 +289,11 @@ function saveSettings(closeModal) {
         settingsParams.tagListBrowse = getTagMultiSelectValues(document.getElementById('modalSettingsBrowseTagsList'), false);
 
         if (closeModal === true) {
+            btnWaitingId('modalSettingsSaveBtn', true);
             sendAPIpartition('default', 'MYMPD_API_SETTINGS_SET', settingsParams, saveSettingsClose, true);
         }
         else {
+            btnWaitingId('modalSettingsApplyBtn', true);
             sendAPIpartition('default', 'MYMPD_API_SETTINGS_SET', settingsParams, saveSettingsApply, true);
         }
     }
@@ -307,6 +309,7 @@ function saveSettingsClose(obj) {
         if (highlightInvalidInput('modalSettings', obj) === false) {
             showModalAlert(obj);
         }
+        btnWaitingId('modalSettingsSaveBtn', false);
     }
     else {
         savePartitionSettings(true);
@@ -323,6 +326,7 @@ function saveSettingsApply(obj) {
         if (highlightInvalidInput('modalSettings', obj) === false) {
             showModalAlert(obj);
         }
+        btnWaitingId('modalSettingsApplyBtn', false);
     }
     else {
         savePartitionSettings(false);
@@ -358,9 +362,9 @@ function savePartitionSettingsApply(obj) {
         }
     }
     else {
-        btnWaitingId('modalSettingsApplyBtn', true);
         getSettings();
     }
+    btnWaitingId('modalSettingsApplyBtn', false);
 }
 
 /**
@@ -378,6 +382,7 @@ function savePartitionSettingsClose(obj) {
         getSettings();
         uiElements.modalSettings.hide();
     }
+    btnWaitingId('modalSettingsSaveBtn', false);
 }
 
 /**

diff --git a/htdocs/js/utility.js b/htdocs/js/utility.js
@@ -167,10 +167,7 @@ function zeroPad(num, places) {
  * @returns {number} the number or 0 on convert failure
  */
 function parseNumber(str) {
-    const nr = Number(str);
-    return Number.isNaN(nr) === true
-        ? 0
-        : nr;
+    return Number(str);
 }
 
 /**

diff --git a/htdocs/js/validate.js b/htdocs/js/validate.js
@@ -66,8 +66,8 @@ function setIsInvalidId(id) {
  */
 function setIsInvalid(el) {
     //set is-invalid also on parent node
+    el.classList.add('is-invalid');
     el.parentNode.classList.add('is-invalid');
-    el.parentNode.parentNode.classList.add('is-invalid');
 }
 
 /**

diff --git a/src/i18n/extra_phrases.txt b/src/i18n/extra_phrases.txt
@@ -249,3 +249,6 @@ Warning
 wasapi
 Web notifications
 Work
+Invalid json value type: MJSON_TOK_NULL
+Invalid json value type: MJSON_TOK_INVALID
+Invalid json value type: MJSON_TOK_UNKNOWN
diff --git a/src/i18n/json/de-DE.json b/src/i18n/json/de-DE.json
@@ -1064,5 +1064,9 @@
     "Only sort tags allowed": "Es sind nur Sort-Tags erlaubt",
     "Preset loaded successfully": "Voreinstellung erfolgreich geladen",
     "Allowed binary limit range is between 4kB and 256kB": "Binary Limit muss zwischen 4kB und 256KB sein",
-    "DB": "DB"
+    "DB": "DB",
+    "Pixel": "Pixel",
+    "Invalid json value type: MJSON_TOK_NULL": "Ungültiger Wertetyp",
+    "Invalid json value type: MJSON_TOK_INVALID": "Ungültiger Wertetyp",
+    "Invalid json value type: MJSON_TOK_UNKNOWN": "Ungültiger Wertetyp"
 }