Updates for custom error handling

Author: Anthropic

bower.json

@@ -6,7 +6,8 @@
     "David Jensen <[email protected]>",
     "Cameron Edwards",
     "Mike Marcacci",
-    "Denis Dervisevic <[email protected]>"
+    "Denis Dervisevic <[email protected]>",
+    "Marcel J Bennett <[email protected]>"
   ],
   "moduleType": [
     "globals"
@@ -17,7 +18,9 @@
     "form",
     "json",
     "json-schema",
-    "schema"
+    "schema",
+    "json-schema-form",
+    "angular-schema-form"
   ],
   "license": "MIT",
   "ignore": [
@@ -36,7 +39,7 @@
     "karma.conf.js"
   ],
   "dependencies": {
-    "angular": ">= 1.2",
+    "angular": ">= 1.3",
     "tv4": "~1.0.15",
     "angular-sanitize": ">= 1.2"
   },
@@ -49,7 +52,8 @@
     "tx-tinymce": ">= 0.0.5",
     "angular-ui-sortable": ">=0.12.11",
     "bootstrap-vertical-tabs": "~1.2.0",
-    "angular-schema-form-bootstrap": "~0.1.1"
+    "angular-schema-form-bootstrap": "~0.1.1",
+    "angular-schema-form-tinymce": "^0.1.0"
   },
   "resolutions": {
     "jquery": "~2.1.1"

dist/angular-schema-form-bootstrap.js

@@ -1,7 +1,7 @@
 /*!
  * angular-schema-form
  * @version 1.0.0-alpha.1
- * @date Mon, 23 Jan 2017 13:42:17 GMT
+ * @date Tue, 31 Jan 2017 11:57:55 GMT
  * @link https://github.com/json-schema-form/angular-schema-form
  * @license MIT
  * Copyright (c) 2014-2017 JSON Schema Form
@@ -91,7 +91,7 @@ module.exports = __webpack_require__(2);
 /*!
  * angular-schema-form-bootstrap
  * @version 1.0.0-alpha.1
- * @date Sat, 14 Jan 2017 17:11:45 GMT
+ * @date Sun, 29 Jan 2017 00:45:28 GMT
  * @link https://github.com/json-schema-form/angular-schema-form-bootstrap
  * @license MIT
  * Copyright (c) 2014-2017 JSON Schema Form
@@ -414,7 +414,7 @@ module.exports = __webpack_require__(2);
   // ngtemplate-loader embeds the html on build
 
 
-  angular.module('schemaForm').config(bootstrapDecoratorConfig).filter('sfCamelKey', sfCamelKeyFilter);
+  angular.module('schemaForm').config(bootstrapDecoratorConfig);
 
   bootstrapDecoratorConfig.$inject = ['schemaFormProvider', 'schemaFormDecoratorsProvider', 'sfBuilderProvider', 'sfPathProvider', '$injector'];
 
@@ -504,27 +504,6 @@ module.exports = __webpack_require__(2);
     }, []);
   };
 
-  /**
-   * sfCamelKey Filter
-   */
-  function sfCamelKeyFilter() {
-    return function (formKey) {
-      if (!formKey) {
-        return '';
-      };
-      var part, i, key;
-      key = formKey.slice();
-      for (i = 0; i < key.length; i++) {
-        part = key[i].toLowerCase().split('');
-        if (i && part.length) {
-          part[0] = part[0].toUpperCase();
-        };
-        key[i] = part.join('');
-      };
-      return key.join('');
-    };
-  };
-
   /***/
 },,
 /* 18 */

dist/angular-schema-form-bootstrap.min.js

@@ -1,7 +1,7 @@
 /*!
  * angular-schema-form
  * @version 1.0.0-alpha.1
- * @date Mon, 23 Jan 2017 13:42:17 GMT
+ * @date Tue, 31 Jan 2017 11:57:55 GMT
  * @link https://github.com/json-schema-form/angular-schema-form
  * @license MIT
  * Copyright (c) 2014-2017 JSON Schema Form

dist/angular-schema-form.js

@@ -0,0 +1,26 @@
+{
+  "schema": {
+    "type": "object",
+    "title": "Person",
+    "properties": {
+      "email": {
+        "type": "string",
+        "maxLength": 255,
+        "email": true
+      }
+    }
+  },
+  "form": [
+    {
+      "key": "email",
+      "placeholder": "Enter contact email",
+      "feedback": false
+    },
+    {
+      "type": "submit",
+      "style": "btn-info",
+      "title": "OK"
+    }
+  ],
+  "model": { "email": "NULL" }
+}

dist/angular-schema-form.min.js

@@ -173,6 +173,15 @@
                 {
                   "key": "shoesizeRight"
                 },
+                {
+                  "key": "invitation",
+                  "tinymceOptions": {
+                    "toolbar": [
+                      "undo redo| styleselect | bold italic | link image",
+                      "alignleft aligncenter alignright"
+                    ]
+                  }
+                },
                 "things",
                 "dislike"
               ]

examples/data/custom-error.json

@@ -194,45 +194,54 @@ <h3>Schema</h3>
 
 <script type="text/javascript" src="//code.jquery.com/jquery-2.1.1.min.js"></script>
 <script type="text/javascript" src="//cdn.jsdelivr.net/g/[email protected]"></script>
+
 <script type="text/javascript" src="../bower_components/tv4/tv4.js"></script>
 <script type="text/javascript" src="../bower_components/ace-builds/src-min-noconflict/ace.js"></script>
 <script type="text/javascript" src="../bower_components/angular/angular.min.js"></script>
 <script type="text/javascript" src="../bower_components/angular-sanitize/angular-sanitize.min.js"></script>
+
 <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.10.2/moment.min.js"></script>
 <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/zeroclipboard/2.2.0/ZeroClipboard.min.js"></script>
 <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/ng-clip/0.2.6/ng-clip.min.js"></script>
 <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/swfobject/2.2/swfobject.js"></script>
 <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/0.12.1/ui-bootstrap.min.js"></script>
-<!-- <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.21/angular.min.js"></script> -->
-<!-- <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.21/angular-sanitize.min.js"></script> -->
-
 
 <script type="text/javascript" src="../bower_components/angular-ui-sortable/sortable.js"></script>
 <script type="text/javascript" src="../bower_components/angular-ui-ace/ui-ace.js"></script>
-<!-- <script type="text/javascript" src="../bower_components/pickadate/lib/picker.js"></script>
-<script type="text/javascript" src="../bower_components/pickadate/lib/picker.date.js"></script>
-<script type="text/javascript" src="../bower_components/pickadate/lib/translations/nl_NL.js"></script> -->
 
-<!-- <script type="text/javascript" src="//tinymce.cachefly.net/4.0/tinymce.min.js"></script>
-<script type="text/javascript" src="../bower_components/tx-tinymce/tx-tinymce.js"></script> -->
+<script type="text/javascript" src="//cdn.tinymce.com/4/tinymce.min.js"></script>
+<script type="text/javascript" src="../bower_components/tx-tinymce/tx-tinymce.js"></script>
 
-<!-- <script type="text/javascript" src="../bower_components/spectrum/spectrum.js"></script>
+<script type="text/javascript" src="../bower_components/spectrum/spectrum.js"></script>
 <script type="text/javascript" src="../bower_components/spectrum/i18n/jquery.spectrum-sv.js"></script>
-<script type="text/javascript" src="../bower_components/angular-spectrum-colorpicker/dist/angular-spectrum-colorpicker.min.js"></script> -->
+<script type="text/javascript" src="../bower_components/angular-spectrum-colorpicker/dist/angular-spectrum-colorpicker.js"></script>
 
 <script type="text/javascript" src="../dist/angular-schema-form.js"></script>
 <script type="text/javascript" src="../dist/angular-schema-form-bootstrap.js"></script>
 <script type="text/javascript" src="add-on/calculate.js"></script>
-<!-- <script type="text/javascript" src="../bower_components/angular-schema-form-datepicker/bootstrap-datepicker.min.js"></script> -->
-<!-- <script type="text/javascript" src="../bower_components/angular-schema-form-colorpicker/bootstrap-colorpicker.min.js"></script> -->
+<script type="text/javascript" src="../bower_components/angular-schema-form-datepicker/bootstrap-datepicker.min.js"></script>
+<script type="text/javascript" src="../bower_components/angular-schema-form-colorpicker/bootstrap-colorpicker.min.js"></script>
+<script type="text/javascript" src="../bower_components/angular-schema-form-tinymce/bootstrap-tinymce.js"></script>
 
 <script type="text/javascript">
 // @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&dn=expat.txt Expat
 //
 // To test the tinymce addon, uncomment the files above and inject 'tx-tinymce' below.
 /*global alert*/
-var app = angular.module('test', ['schemaForm', 'ui.ace', 'ngClipboard', 'ui.bootstrap.tooltip']);
+var app = angular.module('test', ['schemaForm', 'ui.ace', 'ngClipboard', 'ui.bootstrap.tooltip', 'schemaForm-tinymce']);
 app.controller('TestCtrl', function($scope, $http, $location) {
+  tv4.defineError('EMAIL', 10001, 'Invalid email address');
+  tv4.defineKeyword('email', function(data, value, schema) {
+    if (schema.email) {
+      if (/^\S+@\S+$/.test(data)) {
+        return null;
+      }
+      return {
+        code: 10001
+      };
+    }
+    return null;
+  });
 
   $scope.tests = [
     { name: "Simple", data: 'data/simple.json' },
@@ -246,6 +255,7 @@ <h3>Schema</h3>
     { name: "TitleMap Examples", data: 'data/titlemaps.json' },
     { name: "Kitchen Sink", data: 'data/sink.json' },
     { name: "Calculate", data: 'data/calculate.json' },
+    { name: "Custom Error", data: 'data/custom-error.json' },
     { name: "Hack: Conditional required", data: 'data/conditional-required.json' }
   ];
 

examples/data/sink.json

@@ -8,19 +8,33 @@ describe('directive', function() {
     })
   );
 
-  var exampleSchema = {
+  exampleSchema = {
     "type": "object",
     "title": "Person",
     "properties": {
       "name": {
         "title": "Name",
         "type": "string",
         "minLength": 10
+      },
+      "email": {
+        "type": "string",
+        "maxLength": 255,
+        "format": "email",
+        "email": true
       }
     }
   };
 
-  it('should handle buttons', function() {
+  it('should validate the form on event [ノಠ益ಠ]ノ彡┻━┻', function() {
+
+    tmpl = angular.element(
+      '<div>' +
+        '<form name="testform" sf-schema="schema" sf-form="form" sf-model="obj"></form>' +
+        '<input class="validate" type="button" ng-click="validate_all()" />' +
+      '</div>'
+    );
+
     inject(function($compile,$rootScope) {
       var scope = $rootScope.$new();
       scope.obj = { "name": "Json" };
@@ -33,13 +47,6 @@ describe('directive', function() {
         scope.$broadcast('schemaFormValidate');
       };
 
-      var tmpl = angular.element(
-        '<div>' +
-          '<form name="testform" sf-schema="schema" sf-form="form" sf-model="obj"></form>' +
-          '<input class="validate" type="button" ng-click="validate_all()" />' +
-        '</div>'
-      );
-
       $compile(tmpl)(scope);
       $rootScope.$apply();
 
@@ -53,4 +60,55 @@ describe('directive', function() {
 
     });
   });
+
+  it('should process custom tv4 errors', function() {
+
+    tmpl = angular.element(
+      '<div>' +
+        '<form name="testform" sf-schema="schema" sf-form="form" sf-model="obj"></form>' +
+        '<input class="validate" type="button" ng-click="validate_all()" />{{obj}}' +
+      '</div>'
+    );
+
+    inject(function($compile,$rootScope) {
+      tv4.defineError('EMAIL', 10001, 'Invalid email address');
+      tv4.defineKeyword('email', function(data, value, schema) {
+        if (schema.email) {
+          if (/^\S+@\S+$/.test(data)) {
+            return null;
+          }
+          return {
+            code: 10001
+          };
+        }
+        return null;
+      });
+
+      var scope = $rootScope.$new();
+      scope.obj = { "email": "NULL" };
+
+      scope.schema = exampleSchema;
+
+      scope.form = [{
+        "key": "email",
+        "placeholder": "Enter contact email",
+        "feedback": false
+      }];
+
+      scope.validate_all = function() {
+        scope.$broadcast('schemaFormValidate');
+      };
+
+      $compile(tmpl)(scope);
+      $rootScope.$apply();
+
+      var form = tmpl.find('form').eq(0).controller('form');
+
+      form.$valid.should.be.true;
+      scope.validate_all.should.not.have.beenCalled;
+      tmpl.find('input.validate').click();
+      scope.validate_all.should.have.beenCalledOnce;
+      form.$valid.should.be.false;
+    });
+  });
 });