made button controller optional. #9

rodikh · Nov 30, 2014 · 2281a9a · 2281a9a
1 parent 5acb005
commit 2281a9a
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
     "name": "angular-json-editor",
-    "version": "0.1.5",
+    "version": "0.1.6",
     "authors": [
         "Rodik Hanukaev <[email protected]>",
         "Topaz Bar <[email protected]>"

diff --git a/demo/index.html b/demo/index.html
@@ -13,7 +13,12 @@
 
 <h2>Synchronous values</h2>
 <div class="container" ng-controller="SyncAppController">
-    <json-editor schema="mySchema" startval="myStartVal" buttons-controller="SyncButtonsController" on-change="onChange($editorValue)">
+    <json-editor schema="mySchema" startval="myStartVal" on-change="onChange($editorValue)"></json-editor>
+</div>
+
+<h2>Buttons Controller</h2>
+<div class="container" ng-controller="SyncAppController">
+    <json-editor schema="mySchema" startval="myStartVal" buttons-controller="SyncButtonsController">
 
         <button type="submit" class="btn btn-success" ng-click="onSubmit($event)" ng-disabled="!isValid">
             <span class="glyphicon glyphicon-check"></span>

diff --git a/dist/angular-json-editor.min.js b/dist/angular-json-editor.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "angular-json-editor",
-    "version": "0.1.5",
+    "version": "0.1.6",
     "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
@@ -35,7 +35,6 @@ angular.module('angular-json-editor', []).provider('JSONEditor', function () {
         return dst;
     }
 
-
 }).directive('jsonEditor', ['$q', 'JSONEditor', function ($q, JSONEditor) {
 
     return {
@@ -61,8 +60,6 @@ angular.module('angular-json-editor', []).provider('JSONEditor', function () {
                     // Any exceptions thrown will probably be because the controller specified does not exist
                     throw new Error('json-editor: buttons-controller attribute must be a valid controller.');
                 }
-            } else {
-                throw new Error('json-editor: buttons-controller attribute must be specified.');
             }
 
         }],