added support for schema promises and updating schema.

bumped dependency versions.
updated demo

Author: rodikh

.jscs.json

@@ -20,10 +20,6 @@
     "disallowKeywordsOnNewLine": ["else"],
     "safeContextKeyword": ["self"],
     "requireLineFeedAtFileEnd": true,
-    "validateJSDoc": {
-        "checkParamNames": true,
-        "checkRedundantParams": true
-    },
     "disallowSpacesInNamedFunctionExpression": {
         "beforeOpeningRoundBrace": true
     },

.jshintrc

@@ -4,7 +4,7 @@
     "eqeqeq": true,
     "forin": true,
     "immed": true,
-    "latedef": true,
+    "latedef": false,
     "newcap": true,
     "noarg": true,
     "noempty": true,

bower.json

@@ -20,7 +20,7 @@
         "node_modules"
     ],
     "dependencies": {
-        "json-editor": "^0.7.18",
+        "json-editor": "^0.7.28",
         "angular": "1.*"
     }
 }

demo/app.js

@@ -40,7 +40,7 @@ angular.module('demoApp', ['angular-json-editor']).config(function (JSONEditorPr
         console.dir(data);
     };
 
-}).controller('AsyncAppController', function ($scope, $http, $timeout) {
+}).controller('AsyncAppController', function ($scope, $http) {
 
     // Load with $http
     $scope.mySchema = $http.get('schema.json');
@@ -70,10 +70,12 @@ angular.module('demoApp', ['angular-json-editor']).config(function (JSONEditorPr
         };
     };
 
-}).controller('AsyncButtonsController', function ($scope) {
-
+}).controller('AsyncButtonsController', function ($scope, $http) {
     $scope.onSubmit = function () {
         console.log('onSubmit data in async controller', $scope.editor.getValue());
     };
 
+    $scope.changeSchema = function () {
+        $scope.schema = $http.get('schema2.json');
+    };
 });

demo/index.html

@@ -45,7 +45,10 @@ <h2>Asynchronous values</h2>
             <span class="glyphicon glyphicon-check"></span>
             Submit
         </button>
-
+        <button type="button" class="btn btn-primary" ng-click="changeSchema($event)">
+            <span class="glyphicon glyphicon-plus"></span>
+            Update Schema
+        </button>
     </json-editor>
 </div>
 

demo/schema2.json

@@ -0,0 +1,35 @@
+{
+  "type": "object",
+  "title": "Item Object Schema 2",
+  "required": true,
+  "additionalProperties": false,
+  "properties": {
+    "thingname": {
+      "type": "string",
+      "title": "Thing name",
+      "required": true,
+      "minLength": 1
+    },
+    "length": {
+      "type": "integer",
+      "title": "Length",
+      "required": true,
+      "min": 0
+    },
+    "isCool": {
+      "type": "boolean",
+      "title": "Is cool?",
+      "required": true
+    },
+    "info": {
+      "type": "object",
+      "name": "Information",
+      "properties": {
+        "phone": {
+          "type": "integer",
+          "name": "phone"
+        }
+      }
+    }
+  }
+}

demo/startval.json

@@ -1,8 +1,5 @@
 {
-  "name": "myname",
+  "name": "",
   "age": 20,
-  "isCool": true,
-  "info": {
-    "phone": 1234
-  }
+  "isCool": false
 }

dist/angular-json-editor.js

@@ -69,22 +69,14 @@ angular.module('angular-json-editor', []).provider('JSONEditor', function () {
             }
         }],
         link: function (scope, element, attrs, controller, transclude) {
-            var startValPromise = $q.when({}),
-                schemaPromise = $q.when(null);
+            var startValPromise = $q.when(scope.startval),
+                schemaPromise = $q.when(scope.schema);
 
             scope.isValid = false;
 
             if (!angular.isString(attrs.schema)) {
                 throw new Error('angular-json-editor: schema attribute has to be defined.');
             }
-            if (angular.isObject(scope.schema)) {
-                schemaPromise = $q.when(scope.schema);
-            }
-            if (angular.isObject(scope.startval)) {
-                // Support both $http (i.e. $q) and $resource promises, and also normal object.
-                startValPromise = $q.when(scope.startval);
-            }
-
             // Wait for the start value and schema to resolve before building the editor.
             $q.all([schemaPromise, startValPromise]).then(function (result) {
 
@@ -129,21 +121,36 @@ angular.module('angular-json-editor', []).provider('JSONEditor', function () {
                     });
                 }
 
-                restart(startVal, schema);
+                restart();
 
-                scope.$watch('schema', function (newVal, oldVal) {
+                // update schema if changed
+                scope.$watch('schema', function (newVal) {
                     //update newScheme
-                    if (newVal.success) {
-                        newVal.success(function (data) {
+                    if (newVal.then) {
+                        newVal.then(function (data) {
                             schema = data;
+                            restart();
                         });
                     } else {
                         schema = newVal;
+                        restart();
                     }
-
-                    restart();
                 }, true);
 
+                // update schema if promise
+                scope.$watchCollection('schema', function (newVal) {
+                    if (newVal instanceof $q) {
+                        newVal.then(function (data) {
+                            if (data.data) {
+                                schema = data.data;
+                            }else {
+                                schema = data;
+                            }
+                            restart();
+                        });
+                    }
+                });
+
                 // Transclude the buttons at the bottom.
                 var buttons = transclude(scope, function (clone) {
                     return clone;

dist/angular-json-editor.min.js

@@ -7,12 +7,12 @@
     },
     "main": "dist/angular-json-editor.js",
     "devDependencies": {
-        "grunt": "0.4.*",
-        "grunt-contrib-jshint": "0.10.*",
-        "grunt-jscs": "1.1.*",
-        "grunt-contrib-uglify": "0.7.*",
-        "grunt-contrib-concat": "0.5.*",
-        "grunt-contrib-clean": "0.6.*",
-        "grunt-contrib-connect": "0.9.*"
+        "grunt": "1.0.*",
+        "grunt-contrib-jshint": "1.1.*",
+        "grunt-jscs": "3.0.*",
+        "grunt-contrib-uglify": "2.2.*",
+        "grunt-contrib-concat": "1.0.*",
+        "grunt-contrib-clean": "1.0.*",
+        "grunt-contrib-connect": "1.0.*"
     }
 }