Add propertyOrder support, fix SCEditor, fix validator ready bug.

*  New schema keword "propertyOrder" that lets you set order of object properties, both in the form and in returned JSON.  Fixes #110
*  Fix SCEditor bug that wasn't updating the JSON value. Fixes #118
*  Fix bug with validation results not being ready immediately for non-ajax uses. Fixes #130. Fixes #124

Author: jdorn

README.md

@@ -404,6 +404,42 @@ Show a video preview (using HTML5 video)
 The `href` property is a template that gets re-evaluated everytime the value changes.
 The variable `self` is always available.  Look at the __Dependencies__ section below for how to include other fields or use a custom template engine.
 
+### Property Ordering
+
+There is no way to specify property ordering in JSON Schema (although this may change in v5 of the spec).
+
+JSON Editor introduces a new keyword `propertyOrder` for this purpose.  The default property order if unspecified is 1000.  Properties with the same order will use normal JSON key ordering.
+
+```json
+{
+  "type": "object",
+  "properties": {
+    "prop1": {
+      "type": "string"
+    },
+    "prop2": {
+      "type": "string",
+      "propertyOrder": 10
+    },
+    "prop3": {
+      "type": "string",
+      "propertyOrder": 1001
+    },
+    "prop4": {
+      "type": "string",
+      "propertyOrder": 1
+    }
+  }
+}
+```
+
+In the above example schema, `prop1` does not have an order specified, so it will default to 1000.
+So, the final order of properties in the form (and in returned JSON data) will be:
+
+1.  prop4 (order 1)
+2.  prop2 (order 10)
+3.  prop1 (order 1000)
+4.  prop3 (order 1001)
 
 ### format
 

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "json-editor",
-  "version": "0.6.12",
+  "version": "0.6.13",
   "authors": [
     "Jeremy Dorn <[email protected]>"
   ],

dist/jsoneditor.js

@@ -1,4 +1,4 @@
-/*! JSON Editor v0.6.12 - JSON Schema -> HTML Editor
+/*! JSON Editor v0.6.13 - JSON Schema -> HTML Editor
  * By Jeremy Dorn - https://github.com/jdorn/json-editor/
  * Released under the MIT license
  *
@@ -234,6 +234,8 @@ JSONEditor.prototype = {
       // Starting data
       if(self.options.startval) self.root.setValue(self.options.startval);
 
+      self.validation_results = self.validator.validate(self.root.getValue());
+      self.root.showValidationErrors(self.validation_results);
       self.ready = true;
 
       // Fire ready event asynchronously
@@ -2179,6 +2181,7 @@ JSONEditor.defaults.editors.string = JSONEditor.AbstractEditor.extend({
           $('#sceditor-start-marker,#sceditor-end-marker,.sceditor-nlf',val).remove();
           // Set the value and update
           self.input.value = val.html();
+          self.value = self.input.value;
           if(self.parent) self.parent.onChildEditorChange(self);
           else self.jsoneditor.onChange();
           self.jsoneditor.notifyWatchers(self.path);
@@ -2723,11 +2726,6 @@ JSONEditor.defaults.editors.object = JSONEditor.AbstractEditor.extend({
         self.maxwidth += self.editors[key].getNumColumns();
       });
 
-      // Initial layout
-      this.layoutEditors();
-      // Do it again now that we know the approximate heights of elements
-      this.layoutEditors();
-
       // Control buttons
       this.title_controls = this.getTheme().getHeaderButtonHolder();
       this.editjson_controls = this.getTheme().getHeaderButtonHolder();
@@ -2792,6 +2790,27 @@ JSONEditor.defaults.editors.object = JSONEditor.AbstractEditor.extend({
       this.refreshAddProperties();
     }
 
+    // Sort editors by propertyOrder
+    var sorted = {};
+    var keys = Object.keys(this.editors);
+    keys = keys.sort(function(a,b) {
+      var ordera = self.editors[a].schema.propertyOrder;
+      var orderb = self.editors[b].schema.propertyOrder;
+      if(typeof ordera !== "number") ordera = 1000;
+      if(typeof orderb !== "number") orderb = 1000;
+      
+      return ordera - orderb;
+    });
+    for(var i=0; i<keys.length; i++) {
+      sorted[keys[i]] = this.editors[keys[i]];
+    }
+    this.editors = sorted;
+
+    // Initial layout
+    this.layoutEditors();
+    // Do it again now that we know the approximate heights of elements
+    this.layoutEditors();
+    
     this.jsoneditor.notifyWatchers(this.path);
   },
   showEditJSON: function() {

dist/jsoneditor.min.js

@@ -49,6 +49,8 @@ JSONEditor.prototype = {
       // Starting data
       if(self.options.startval) self.root.setValue(self.options.startval);
 
+      self.validation_results = self.validator.validate(self.root.getValue());
+      self.root.showValidationErrors(self.validation_results);
       self.ready = true;
 
       // Fire ready event asynchronously

src/core.js

@@ -304,11 +304,6 @@ JSONEditor.defaults.editors.object = JSONEditor.AbstractEditor.extend({
         self.maxwidth += self.editors[key].getNumColumns();
       });
 
-      // Initial layout
-      this.layoutEditors();
-      // Do it again now that we know the approximate heights of elements
-      this.layoutEditors();
-
       // Control buttons
       this.title_controls = this.getTheme().getHeaderButtonHolder();
       this.editjson_controls = this.getTheme().getHeaderButtonHolder();
@@ -373,6 +368,27 @@ JSONEditor.defaults.editors.object = JSONEditor.AbstractEditor.extend({
       this.refreshAddProperties();
     }
 
+    // Sort editors by propertyOrder
+    var sorted = {};
+    var keys = Object.keys(this.editors);
+    keys = keys.sort(function(a,b) {
+      var ordera = self.editors[a].schema.propertyOrder;
+      var orderb = self.editors[b].schema.propertyOrder;
+      if(typeof ordera !== "number") ordera = 1000;
+      if(typeof orderb !== "number") orderb = 1000;
+      
+      return ordera - orderb;
+    });
+    for(var i=0; i<keys.length; i++) {
+      sorted[keys[i]] = this.editors[keys[i]];
+    }
+    this.editors = sorted;
+
+    // Initial layout
+    this.layoutEditors();
+    // Do it again now that we know the approximate heights of elements
+    this.layoutEditors();
+    
     this.jsoneditor.notifyWatchers(this.path);
   },
   showEditJSON: function() {

src/editors/object.js

@@ -351,6 +351,7 @@ JSONEditor.defaults.editors.string = JSONEditor.AbstractEditor.extend({
           $('#sceditor-start-marker,#sceditor-end-marker,.sceditor-nlf',val).remove();
           // Set the value and update
           self.input.value = val.html();
+          self.value = self.input.value;
           if(self.parent) self.parent.onChildEditorChange(self);
           else self.jsoneditor.onChange();
           self.jsoneditor.notifyWatchers(self.path);

src/editors/string.js

@@ -1,4 +1,4 @@
-/*! JSON Editor v0.6.12 - JSON Schema -> HTML Editor
+/*! JSON Editor v0.6.13 - JSON Schema -> HTML Editor
  * By Jeremy Dorn - https://github.com/jdorn/json-editor/
  * Released under the MIT license
  *