Removed JsonEditorConfig

rodikh · rodikh · commit a09bbc269929 · 2014-11-25T20:07:50.000+02:00
Added deep merge to JSONEditorProvider.configure #8
diff --git a/README.md b/README.md
@@ -55,6 +55,12 @@ The object you pass to configure will be merged with the JSONEditor object.
                 sceditor: {
                     style: 'sce/development/jquery.sceditor.default.css'
                 }
+            },
+            defaults: {
+                options: {
+                    iconlib: 'bootstrap3',
+                    theme: 'bootstrap3'
+                }
             }
         }); 
     });
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
     "name": "angular-json-editor",
-    "version": "0.1.4",
+    "version": "0.1.5",
     "authors": [
         "Rodik Hanukaev <rodik@rodik.me>",
         "Topaz Bar <topaz1008@gmail.com>"
diff --git a/demo/app.js b/demo/app.js
@@ -1,10 +1,15 @@
 'use strict';
 
-angular.module('demoApp', ['angular-json-editor']).config(function (JsonEditorConfig) {
-
-    // angular-json-editor configuration
-    JsonEditorConfig.iconlib = 'bootstrap3';
-    JsonEditorConfig.theme = 'bootstrap3';
+angular.module('demoApp', ['angular-json-editor']).config(function (JSONEditorProvider) {
+    // these are set by default, but we set this for demonstration purposes
+    JSONEditorProvider.configure({
+        defaults: {
+            options: {
+                iconlib: 'bootstrap3',
+                theme: 'bootstrap3'
+            }
+        }
+    });
 
 }).controller('SyncAppController', function ($scope) {
 
diff --git a/demo/index.html b/demo/index.html
@@ -6,6 +6,7 @@
     <meta name="author" content="Rodik">
     <title>angular-json-editor Demo</title>
 
+    <!-- Include the relevant css for the configured theme -->
     <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css">
 </head>
 <body ng-app="demoApp">
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "angular-json-editor",
-    "version": "0.1.4",
+    "version": "0.1.5",
     "repository": {
         "type": "git",
         "url": "git://github.com/rodikh/angular-json-editor.git"
diff --git a/src/angular-json-editor.js b/src/angular-json-editor.js
@@ -1,23 +1,42 @@
 'use strict';
 
-angular.module('angular-json-editor', []).constant('JsonEditorConfig', {
-    iconlib: 'bootstrap3',
-    theme: 'bootstrap3'
-
-}).provider('JSONEditor', function () {
-    var configuration = {};
+angular.module('angular-json-editor', []).provider('JSONEditor', function () {
+    var configuration = {
+        defaults: {
+            options: {
+                iconlib: 'bootstrap3',
+                theme: 'bootstrap3'
+            }
+        }
+    };
 
     this.configure = function (options) {
-        angular.extend(configuration, options);
+        extendDeep(configuration, options);
     };
 
     this.$get = function ($window) {
         var JSONEditor = $window.JSONEditor;
-        angular.extend(JSONEditor, configuration);
+        extendDeep(JSONEditor, configuration);
         return $window.JSONEditor;
     };
 
-}).directive('jsonEditor', ['$q', 'JsonEditorConfig', 'JSONEditor', function ($q, JsonEditorConfig, JSONEditor) {
+    function extendDeep(dst) {
+        angular.forEach(arguments, function (obj) {
+            if (obj !== dst) {
+                angular.forEach(obj, function (value, key) {
+                    if (dst[key] && dst[key].constructor && dst[key].constructor === Object) {
+                        extendDeep(dst[key], value);
+                    } else {
+                        dst[key] = value;
+                    }
+                });
+            }
+        });
+        return dst;
+    }
+
+
+}).directive('jsonEditor', ['$q', 'JSONEditor', function ($q, JSONEditor) {
 
     return {
         restrict: 'E',
@@ -81,13 +100,11 @@ angular.module('angular-json-editor', []).constant('JsonEditorConfig', {
                     throw new Error('json-editor: could not resolve schema data.');
                 }
 
-                angular.extend(JsonEditorConfig, {
+                scope.editor = new JSONEditor(element[0], {
                     startval: startVal,
                     schema: schema
                 });
 
-                scope.editor = new JSONEditor(element[0], JsonEditorConfig);
-
                 var editor = scope.editor;
 
                 editor.on('ready', function () {

Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,12 @@ The object you pass to configure will be merged with the JSONEditor object.`
`55`	`55`	`sceditor: {`
`56`	`56`	`style: 'sce/development/jquery.sceditor.default.css'`
`57`	`57`	`}`
	`58`	`+ },`
	`59`	`+ defaults: {`
	`60`	`+ options: {`
	`61`	`+ iconlib: 'bootstrap3',`
	`62`	`+ theme: 'bootstrap3'`
	`63`	`+ }`
`58`	`64`	`}`
`59`	`65`	`});`
`60`	`66`	`});`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "angular-json-editor",`
`3`		`- "version": "0.1.4",`
	`3`	`+ "version": "0.1.5",`
`4`	`4`	`"authors": [`
`5`	`5`	`"Rodik Hanukaev <[email protected]>",`
`6`	`6`	`"Topaz Bar <[email protected]>"`