Merge pull request #691 from mosvov/switch-all-checkbox-default-value

Set Switch all checkbox defaults based on the majority of the switches
betaflight · Oct 16, 2017 · 7bb293e · 7bb293e
2 parents 0b3315d + 09912c9
commit 7bb293e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/tabs/osd.html b/tabs/osd.html
@@ -22,7 +22,7 @@ <h1 class="tab_title">
                                     <span i18n="osdSetupElementsTitle" />
                                     <span class="switch-all-elements">
                                         <label for="switch-all"><span i18n="osdSetupElementsSwitchAll" />: </label>
-                                        <input type="checkbox" checked id="switch-all" name="switch-all" class="togglesmall"></input>
+                                        <input type="checkbox" id="switch-all" name="switch-all" class="togglesmall"></input>
                                     </span>
                                 </div>
                             </div>

diff --git a/tabs/osd.js b/tabs/osd.js
@@ -1307,11 +1307,12 @@ TABS.osd.initialize = function (callback) {
 
             // display fields on/off and position
             var $displayFields = $('#element-fields').empty();
+            var enabledCount = 0;
             for (let field of OSD.data.display_items) {
               // versioning related, if the field doesn't exist at the current flight controller version, just skip it
               if (!field.name) { continue; }
+              if (field.isVisible) { enabledCount++; }
 
-              var checked = field.isVisible ? 'checked' : '';
               var $field = $('<div class="switchable-field field-'+field.index+'"/>');
               var desc = null;
               if (field.desc && field.desc.length) {
@@ -1359,6 +1360,10 @@ TABS.osd.initialize = function (callback) {
               }
               $displayFields.append($field);
             }
+            //Set Switch all checkbox defaults based on the majority of the switches
+            var checked = enabledCount >= (OSD.data.display_items.length / 2);
+            $('input#switch-all').prop('checked', checked).change();
+
             GUI.switchery();
             // buffer the preview
             OSD.data.preview = [];
@@ -1533,7 +1538,10 @@ TABS.osd.initialize = function (callback) {
         });
 
         //Switch all elements
-        $('input#switch-all').change(function () {
+        $('input#switch-all').change(function (event) {
+            //if we just change value based on the majority of the switches
+            if (event.isTrigger) return;
+
             var new_state = $(this).is(':checked');
 
             var updateList = [];