From fc0ea1b740aa76093e97ad7ac283e2c8520c09f1 Mon Sep 17 00:00:00 2001
From: yiwenliu <yiwenliu@yiwenlius-MacBook-Pro.local>
Date: Sun, 15 Jan 2017 01:05:28 -0800
Subject: [PATCH 1/2] Check if it is always disabled before enabling any editor

---
 src/editors/array.js       | 26 ++++++++++++++------------
 src/editors/base64.js      |  6 ++++--
 src/editors/checkbox.js    |  2 +-
 src/editors/enum.js        |  6 ++++--
 src/editors/multiple.js    | 14 ++++++++------
 src/editors/multiselect.js |  2 +-
 src/editors/object.js      | 18 ++++++++++--------
 src/editors/select.js      |  2 +-
 src/editors/selectize.js   |  2 +-
 src/editors/string.js      |  2 +-
 src/editors/upload.js      |  6 ++++--
 11 files changed, 49 insertions(+), 37 deletions(-)

diff --git a/src/editors/array.js b/src/editors/array.js
index ca05e109d..4327d414d 100644
--- a/src/editors/array.js
+++ b/src/editors/array.js
@@ -29,20 +29,22 @@ JSONEditor.defaults.editors.array = JSONEditor.AbstractEditor.extend({
     }
   },
   enable: function() {
-    if(this.add_row_button) this.add_row_button.disabled = false;
-    if(this.remove_all_rows_button) this.remove_all_rows_button.disabled = false;
-    if(this.delete_last_row_button) this.delete_last_row_button.disabled = false;
-    
-    if(this.rows) {
-      for(var i=0; i<this.rows.length; i++) {
-        this.rows[i].enable();
-        
-        if(this.rows[i].moveup_button) this.rows[i].moveup_button.disabled = false;
-        if(this.rows[i].movedown_button) this.rows[i].movedown_button.disabled = false;
-        if(this.rows[i].delete_button) this.rows[i].delete_button.disabled = false;
+    if(!this.always_disabled) {
+      if(this.add_row_button) this.add_row_button.disabled = false;
+      if(this.remove_all_rows_button) this.remove_all_rows_button.disabled = false;
+      if(this.delete_last_row_button) this.delete_last_row_button.disabled = false;
+      
+      if(this.rows) {
+        for(var i=0; i<this.rows.length; i++) {
+          this.rows[i].enable();
+          
+          if(this.rows[i].moveup_button) this.rows[i].moveup_button.disabled = false;
+          if(this.rows[i].movedown_button) this.rows[i].movedown_button.disabled = false;
+          if(this.rows[i].delete_button) this.rows[i].delete_button.disabled = false;
+        }
       }
+      this._super();
     }
-    this._super();
   },
   disable: function() {
     if(this.add_row_button) this.add_row_button.disabled = true;
diff --git a/src/editors/base64.js b/src/editors/base64.js
index 70bc37ea5..bf37d4a0b 100644
--- a/src/editors/base64.js
+++ b/src/editors/base64.js
@@ -67,8 +67,10 @@ JSONEditor.defaults.editors.base64 = JSONEditor.AbstractEditor.extend({
     }
   },
   enable: function() {
-    if(this.uploader) this.uploader.disabled = false;
-    this._super();
+    if(!this.always_disabled) {
+      if(this.uploader) this.uploader.disabled = false;
+      this._super();
+    }
   },
   disable: function() {
     if(this.uploader) this.uploader.disabled = true;
diff --git a/src/editors/checkbox.js b/src/editors/checkbox.js
index ee26cf6c0..6e50ab302 100644
--- a/src/editors/checkbox.js
+++ b/src/editors/checkbox.js
@@ -45,8 +45,8 @@ JSONEditor.defaults.editors.checkbox = JSONEditor.AbstractEditor.extend({
   enable: function() {
     if(!this.always_disabled) {
       this.input.disabled = false;
+      this._super();
     }
-    this._super();
   },
   disable: function() {
     this.input.disabled = true;
diff --git a/src/editors/enum.js b/src/editors/enum.js
index 367a3ab6d..97207de43 100644
--- a/src/editors/enum.js
+++ b/src/editors/enum.js
@@ -62,8 +62,10 @@ JSONEditor.defaults.editors["enum"] = JSONEditor.AbstractEditor.extend({
     this.display_area.innerHTML = this.html_values[this.selected];
   },
   enable: function() {
-    if(!this.always_disabled) this.switcher.disabled = false;
-    this._super();
+    if(!this.always_disabled) {
+      this.switcher.disabled = false;
+      this._super();
+    }
   },
   disable: function() {
     this.switcher.disabled = true;
diff --git a/src/editors/multiple.js b/src/editors/multiple.js
index 71279e0a6..c4d19c7fd 100644
--- a/src/editors/multiple.js
+++ b/src/editors/multiple.js
@@ -24,14 +24,16 @@ JSONEditor.defaults.editors.multiple = JSONEditor.AbstractEditor.extend({
     return Math.max(this.editors[this.type].getNumColumns(),4);
   },
   enable: function() {
-    if(this.editors) {
-      for(var i=0; i<this.editors.length; i++) {
-        if(!this.editors[i]) continue;
-        this.editors[i].enable();
+    if(!this.always_disabled) {
+      if(this.editors) {
+        for(var i=0; i<this.editors.length; i++) {
+          if(!this.editors[i]) continue;
+          this.editors[i].enable();
+        }
       }
+      this.switcher.disabled = false;
+      this._super();
     }
-    this.switcher.disabled = false;
-    this._super();
   },
   disable: function() {
     if(this.editors) {
diff --git a/src/editors/multiselect.js b/src/editors/multiselect.js
index 8b436359d..31068f67a 100644
--- a/src/editors/multiselect.js
+++ b/src/editors/multiselect.js
@@ -176,8 +176,8 @@ JSONEditor.defaults.editors.multiselect = JSONEditor.AbstractEditor.extend({
         }
       }
       if(this.select2) this.select2.select2("enable",true);
+      this._super();
     }
-    this._super();
   },
   disable: function() {
     if(this.input) {
diff --git a/src/editors/object.js b/src/editors/object.js
index 22410db84..caf93a360 100644
--- a/src/editors/object.js
+++ b/src/editors/object.js
@@ -27,14 +27,16 @@ JSONEditor.defaults.editors.object = JSONEditor.AbstractEditor.extend({
     return Math.max(Math.min(12,this.maxwidth),3);
   },
   enable: function() {
-    if(this.editjson_button) this.editjson_button.disabled = false;
-    if(this.addproperty_button) this.addproperty_button.disabled = false;
-
-    this._super();
-    if(this.editors) {
-      for(var i in this.editors) {
-        if(!this.editors.hasOwnProperty(i)) continue;
-        this.editors[i].enable();
+    if(!this.always_disabled) {
+      if(this.editjson_button) this.editjson_button.disabled = false;
+      if(this.addproperty_button) this.addproperty_button.disabled = false;
+
+      this._super();
+      if(this.editors) {
+        for(var i in this.editors) {
+          if(!this.editors.hasOwnProperty(i)) continue;
+          this.editors[i].enable();
+        }
       }
     }
   },
diff --git a/src/editors/select.js b/src/editors/select.js
index ee5473b6d..6c75cabfd 100644
--- a/src/editors/select.js
+++ b/src/editors/select.js
@@ -333,8 +333,8 @@ JSONEditor.defaults.editors.select = JSONEditor.AbstractEditor.extend({
     if(!this.always_disabled) {
       this.input.disabled = false;
       if(this.select2) this.select2.select2("enable",true);
+      this._super();
     }
-    this._super();
   },
   disable: function() {
     this.input.disabled = true;
diff --git a/src/editors/selectize.js b/src/editors/selectize.js
index 5dca5235a..03b9bf6f4 100644
--- a/src/editors/selectize.js
+++ b/src/editors/selectize.js
@@ -324,8 +324,8 @@ JSONEditor.defaults.editors.selectize = JSONEditor.AbstractEditor.extend({
       if(this.selectize) {
         this.selectize[0].selectize.unlock();
       }
+      this._super();
     }
-    this._super();
   },
   disable: function() {
     this.input.disabled = true;
diff --git a/src/editors/string.js b/src/editors/string.js
index 826589874..d8724f7f9 100644
--- a/src/editors/string.js
+++ b/src/editors/string.js
@@ -277,8 +277,8 @@ JSONEditor.defaults.editors.string = JSONEditor.AbstractEditor.extend({
     if(!this.always_disabled) {
       this.input.disabled = false;
       // TODO: WYSIWYG and Markdown editors
+      this._super();
     }
-    this._super();
   },
   disable: function() {
     this.input.disabled = true;
diff --git a/src/editors/upload.js b/src/editors/upload.js
index 88de8a9b9..50d17c9e1 100644
--- a/src/editors/upload.js
+++ b/src/editors/upload.js
@@ -109,8 +109,10 @@ JSONEditor.defaults.editors.upload = JSONEditor.AbstractEditor.extend({
     });
   },
   enable: function() {
-    if(this.uploader) this.uploader.disabled = false;
-    this._super();
+    if(!this.always_disabled) {
+      if(this.uploader) this.uploader.disabled = false;
+      this._super();
+    }
   },
   disable: function() {
     if(this.uploader) this.uploader.disabled = true;

From 72bfa10f419e2af67a86238311e4d279423d4b85 Mon Sep 17 00:00:00 2001
From: yiwenliu <yiwenliu@yiwenlius-MacBook-Pro.local>
Date: Sun, 15 Jan 2017 03:15:07 -0800
Subject: [PATCH 2/2] If function disable is called with param always_disabled
 set to true, update flag always_disabled for any editor

---
 src/editors/array.js       | 5 +++--
 src/editors/base64.js      | 3 ++-
 src/editors/checkbox.js    | 3 ++-
 src/editors/enum.js        | 3 ++-
 src/editors/multiple.js    | 5 +++--
 src/editors/multiselect.js | 3 ++-
 src/editors/object.js      | 5 +++--
 src/editors/select.js      | 3 ++-
 src/editors/selectize.js   | 3 ++-
 src/editors/string.js      | 3 ++-
 src/editors/upload.js      | 3 ++-
 11 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/src/editors/array.js b/src/editors/array.js
index 4327d414d..c8ad7492d 100644
--- a/src/editors/array.js
+++ b/src/editors/array.js
@@ -46,14 +46,15 @@ JSONEditor.defaults.editors.array = JSONEditor.AbstractEditor.extend({
       this._super();
     }
   },
-  disable: function() {
+  disable: function(always_disabled) {
+    if(always_disabled) this.always_disabled = true;
     if(this.add_row_button) this.add_row_button.disabled = true;
     if(this.remove_all_rows_button) this.remove_all_rows_button.disabled = true;
     if(this.delete_last_row_button) this.delete_last_row_button.disabled = true;
 
     if(this.rows) {
       for(var i=0; i<this.rows.length; i++) {
-        this.rows[i].disable();
+        this.rows[i].disable(always_disabled);
         
         if(this.rows[i].moveup_button) this.rows[i].moveup_button.disabled = true;
         if(this.rows[i].movedown_button) this.rows[i].movedown_button.disabled = true;
diff --git a/src/editors/base64.js b/src/editors/base64.js
index bf37d4a0b..21c7da31b 100644
--- a/src/editors/base64.js
+++ b/src/editors/base64.js
@@ -72,7 +72,8 @@ JSONEditor.defaults.editors.base64 = JSONEditor.AbstractEditor.extend({
       this._super();
     }
   },
-  disable: function() {
+  disable: function(always_disabled) {
+    if(always_disabled) this.always_disabled = true;
     if(this.uploader) this.uploader.disabled = true;
     this._super();
   },
diff --git a/src/editors/checkbox.js b/src/editors/checkbox.js
index 6e50ab302..11aba3afa 100644
--- a/src/editors/checkbox.js
+++ b/src/editors/checkbox.js
@@ -48,7 +48,8 @@ JSONEditor.defaults.editors.checkbox = JSONEditor.AbstractEditor.extend({
       this._super();
     }
   },
-  disable: function() {
+  disable: function(always_disabled) {
+    if(always_disabled) this.always_disabled = true;
     this.input.disabled = true;
     this._super();
   },
diff --git a/src/editors/enum.js b/src/editors/enum.js
index 97207de43..9326865c0 100644
--- a/src/editors/enum.js
+++ b/src/editors/enum.js
@@ -67,7 +67,8 @@ JSONEditor.defaults.editors["enum"] = JSONEditor.AbstractEditor.extend({
       this._super();
     }
   },
-  disable: function() {
+  disable: function(always_disabled) {
+    if(always_disabled) this.always_disabled = true;
     this.switcher.disabled = true;
     this._super();
   },
diff --git a/src/editors/multiple.js b/src/editors/multiple.js
index c4d19c7fd..afec57285 100644
--- a/src/editors/multiple.js
+++ b/src/editors/multiple.js
@@ -35,11 +35,12 @@ JSONEditor.defaults.editors.multiple = JSONEditor.AbstractEditor.extend({
       this._super();
     }
   },
-  disable: function() {
+  disable: function(always_disabled) {
+    if(always_disabled) this.always_disabled = true;
     if(this.editors) {
       for(var i=0; i<this.editors.length; i++) {
         if(!this.editors[i]) continue;
-        this.editors[i].disable();
+        this.editors[i].disable(always_disabled);
       }
     }
     this.switcher.disabled = true;
diff --git a/src/editors/multiselect.js b/src/editors/multiselect.js
index 31068f67a..fcf84ab36 100644
--- a/src/editors/multiselect.js
+++ b/src/editors/multiselect.js
@@ -179,7 +179,8 @@ JSONEditor.defaults.editors.multiselect = JSONEditor.AbstractEditor.extend({
       this._super();
     }
   },
-  disable: function() {
+  disable: function(always_disabled) {
+    if(always_disabled) this.always_disabled = true;
     if(this.input) {
       this.input.disabled = true;
     }
diff --git a/src/editors/object.js b/src/editors/object.js
index caf93a360..a8939a0c7 100644
--- a/src/editors/object.js
+++ b/src/editors/object.js
@@ -40,7 +40,8 @@ JSONEditor.defaults.editors.object = JSONEditor.AbstractEditor.extend({
       }
     }
   },
-  disable: function() {
+  disable: function(always_disabled) {
+    if(always_disabled) this.always_disabled = true;
     if(this.editjson_button) this.editjson_button.disabled = true;
     if(this.addproperty_button) this.addproperty_button.disabled = true;
     this.hideEditJSON();
@@ -49,7 +50,7 @@ JSONEditor.defaults.editors.object = JSONEditor.AbstractEditor.extend({
     if(this.editors) {
       for(var i in this.editors) {
         if(!this.editors.hasOwnProperty(i)) continue;
-        this.editors[i].disable();
+        this.editors[i].disable(always_disabled);
       }
     }
   },
diff --git a/src/editors/select.js b/src/editors/select.js
index 6c75cabfd..5e3a71a9a 100644
--- a/src/editors/select.js
+++ b/src/editors/select.js
@@ -336,7 +336,8 @@ JSONEditor.defaults.editors.select = JSONEditor.AbstractEditor.extend({
       this._super();
     }
   },
-  disable: function() {
+  disable: function(always_disabled) {
+    if(always_disabled) this.always_disabled = true;
     this.input.disabled = true;
     if(this.select2) this.select2.select2("enable",false);
     this._super();
diff --git a/src/editors/selectize.js b/src/editors/selectize.js
index 03b9bf6f4..74c2486f7 100644
--- a/src/editors/selectize.js
+++ b/src/editors/selectize.js
@@ -327,7 +327,8 @@ JSONEditor.defaults.editors.selectize = JSONEditor.AbstractEditor.extend({
       this._super();
     }
   },
-  disable: function() {
+  disable: function(always_disabled) {
+    if(always_disabled) this.always_disabled = true;
     this.input.disabled = true;
     if(this.selectize) {
       this.selectize[0].selectize.lock();
diff --git a/src/editors/string.js b/src/editors/string.js
index d8724f7f9..e03ede9f7 100644
--- a/src/editors/string.js
+++ b/src/editors/string.js
@@ -280,7 +280,8 @@ JSONEditor.defaults.editors.string = JSONEditor.AbstractEditor.extend({
       this._super();
     }
   },
-  disable: function() {
+  disable: function(always_disabled) {
+    if(always_disabled) this.always_disabled = true;
     this.input.disabled = true;
     // TODO: WYSIWYG and Markdown editors
     this._super();
diff --git a/src/editors/upload.js b/src/editors/upload.js
index 50d17c9e1..23b500a47 100644
--- a/src/editors/upload.js
+++ b/src/editors/upload.js
@@ -114,7 +114,8 @@ JSONEditor.defaults.editors.upload = JSONEditor.AbstractEditor.extend({
       this._super();
     }
   },
-  disable: function() {
+  disable: function(always_disabled) {
+    if(always_disabled) this.always_disabled = true;
     if(this.uploader) this.uploader.disabled = true;
     this._super();
   },