Merge branch '000000-dev' into feature/754

wpsharks · Jun 7, 2016 · a66ab02 · a66ab02
2 parents ce3aa34 + 2d325f5
commit a66ab02
Show file tree

Hide file tree

Showing 8 changed files with 53 additions and 42 deletions.
diff --git a/src/client-s/js/menu-pages.js b/src/client-s/js/menu-pages.js
@@ -22,7 +22,7 @@
     $('[data-action]', plugin.$menuPage).on('click', plugin.doDataAction);
     $('[data-toggle-target]', plugin.$menuPage).on('click', plugin.doDataToggleTarget);
 
-    $('select[name$="_enable\\]"]', plugin.$menuPage).not('.-no-if-enabled').on('change', plugin.enableDisable).trigger('change');
+    $('select[name$="_enable\\]"], select[data-toggle~="enable-disable"]', plugin.$menuPage).not('.-no-if-enabled').on('change', plugin.enableDisable).trigger('change');
 
     /*![pro strip-from='lite']*/
     $('textarea[name$="\[cdn_hosts\]"]', plugin.$menuPage).on('input propertychange', plugin.handleCdnHostsChange);
@@ -75,7 +75,8 @@
     var $this = $(this),
       thisValue = $this.val(),
       thisName = $this.attr('name'),
-      enabled = Number(thisValue) >= 1,
+      thisEnabledStrings = String($this.data('enabledStrings') || '1,2,3,4,5').split(/,+/),
+      enabled = $.inArray(thisValue, thisEnabledStrings) !== -1,
 
       $thisPanelBody = $this.closest('.plugin-menu-page-panel-body'),
 

diff --git a/src/client-s/js/menu-pages.min.js b/src/client-s/js/menu-pages.min.js