Merge branch 'master' into development

Author: davidlgj

dist/schema-form.js

@@ -33,6 +33,11 @@ var schemaForm = angular.module('schemaForm', deps);
 
 angular.module('schemaForm').provider('sfPath',
 [function() {
+
+  // When building with browserify it's objectpath,
+  // otherwise it's just objectpath.
+  var ObjectPath = window.ObjectPath || objectpath;
+
   var sfPath = {parse: ObjectPath.parse};
 
   // if we're on Angular 1.2.x, we need to continue using dot notation
@@ -853,8 +858,8 @@ angular.module('schemaForm').provider('sfErrorMessage', function() {
     303: 'Additional properties not allowed',
     304: 'Dependency failed - key must exist',
     // Array errors
-    400: 'Array is too short ({{value.length}}), minimum {{schema.maxItems}}',
-    401: 'Array is too long ({{value.length}}), maximum {{schema.minItems}}',
+    400: 'Array is too short ({{value.length}}), minimum {{schema.minItems}}',
+    401: 'Array is too long ({{value.length}}), maximum {{schema.maxItems}}',
     402: 'Array items are not unique',
     403: 'Additional items not allowed',
     // Format errors