added ajax support for startVal #14

Author: rodikh

bower.json

@@ -1,6 +1,6 @@
 {
     "name": "angular-json-editor",
-    "version": "0.1.8",
+    "version": "0.2.0",
     "authors": [
         "Rodik Hanukaev <rodik@rodik.me>",
         "Topaz Bar <topaz1008@gmail.com>"

demo/app.js

@@ -46,12 +46,7 @@ angular.module('demoApp', ['angular-json-editor']).config(function (JSONEditorPr
     $scope.mySchema = $http.get('schema.json');
 
     // Values can be a promise from anywhere
-    $scope.myStartVal = $timeout(function () {
-        return {
-            age: 20
-        };
-
-    }, 1500);
+    $scope.myStartVal = $http.get('startval.json');
 
 }).controller('SyncButtonsController', function ($scope) {
 

demo/schema.json

@@ -20,6 +20,16 @@
             "type": "boolean",
             "title": "Is cool?",
             "required": true
+        },
+        "info": {
+            "type": "object",
+            "name": "Information",
+            "properties": {
+                "phone": {
+                    "type": "integer",
+                    "name": "phone"
+                }
+            }
         }
     }
 }

demo/startval.json

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

dist/angular-json-editor.js

@@ -69,8 +69,7 @@ angular.module('angular-json-editor', []).provider('JSONEditor', function () {
             }
         }],
         link: function (scope, element, attrs, controller, transclude) {
-            var valueToResolve,
-                startValPromise = $q.when({}),
+            var startValPromise = $q.when({}),
                 schemaPromise = $q.when(null);
 
             scope.isValid = false;
@@ -83,21 +82,15 @@ angular.module('angular-json-editor', []).provider('JSONEditor', function () {
             }
             if (angular.isObject(scope.startval)) {
                 // Support both $http (i.e. $q) and $resource promises, and also normal object.
-                valueToResolve = scope.startval;
-                if (angular.isDefined(valueToResolve.$promise)) {
-                    startValPromise = $q.when(valueToResolve.$promise);
-
-                } else {
-                    startValPromise = $q.when(valueToResolve);
-                }
+                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) {
 
                 // Support $http promise response with the 'data' property.
                 var schema = result[0].data || result[0],
-                    startVal = result[1];
+                    startVal = result[1].data || result[1];
                 if (schema === null) {
                     throw new Error('angular-json-editor: could not resolve schema data.');
                 }

dist/angular-json-editor.min.js

@@ -1,6 +1,6 @@
 {
     "name": "angular-json-editor",
-    "version": "0.1.8",
+    "version": "0.2.0",
     "repository": {
         "type": "git",
         "url": "git://github.com/rodikh/angular-json-editor.git"

package.json

@@ -66,8 +66,7 @@ angular.module('angular-json-editor', []).provider('JSONEditor', function () {
             }
         }],
         link: function (scope, element, attrs, controller, transclude) {
-            var valueToResolve,
-                startValPromise = $q.when({}),
+            var startValPromise = $q.when({}),
                 schemaPromise = $q.when(null);
 
             scope.isValid = false;
@@ -80,21 +79,15 @@ angular.module('angular-json-editor', []).provider('JSONEditor', function () {
             }
             if (angular.isObject(scope.startval)) {
                 // Support both $http (i.e. $q) and $resource promises, and also normal object.
-                valueToResolve = scope.startval;
-                if (angular.isDefined(valueToResolve.$promise)) {
-                    startValPromise = $q.when(valueToResolve.$promise);
-
-                } else {
-                    startValPromise = $q.when(valueToResolve);
-                }
+                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) {
 
                 // Support $http promise response with the 'data' property.
                 var schema = result[0].data || result[0],
-                    startVal = result[1];
+                    startVal = result[1].data || result[1];
                 if (schema === null) {
                     throw new Error('angular-json-editor: could not resolve schema data.');
                 }