built and bumped version

niklasnatter · Jul 5, 2016 · 2fd8858 · 2fd8858
1 parent c61a4b2
commit 2fd8858
Show file tree

Hide file tree

Showing 8 changed files with 64 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # CHANGELOG for husky
 
-* dev-master
+* 0.21.0 (2016-07-05)
     * BUGFIX      #670 Fixed Globalizing timing issue
 
 * 0.20.0 (2016-06-28)

diff --git a/bower.json b/bower.json
@@ -1,12 +1,12 @@
 {
   "name": "husky",
-  "version": "0.20.0",
+  "version": "0.21.0",
   "main": "js/husky.js",
   "dependencies": {
     "backbone": "1.1.*",
     "underscore": "~1.5.1",
     "aura": "https://github.com/massiveart/aura.git#master",
-    "husky-validation": "0.6.*",
+    "husky-validation": "0.7.*",
     "globalize": "0.1.*",
     "massiveart-uritemplate": "0.3.*",
     "typeahead.js": "^0.10.5",

diff --git a/bower_components/husky-validation/dist/validation.js b/bower_components/husky-validation/dist/validation.js
@@ -1937,7 +1937,8 @@ define('type/decimal',[
     return function($el, options) {
         var defaults = {
                 format: 'n', // n, d, c, p
-                regExp: /^-?(?:\d+|\d{1,3}(?:,\d{3})+)?(?:\.\d+)?$/
+                regExp: /^-?(?:\d+|\d{1,3}(?:,\d{3})+)?(?:\.\d+)?$/,
+                nullable: false
             },
 
             typeInterface = {
@@ -1947,7 +1948,7 @@ define('type/decimal',[
                 validate: function() {
                     var val = this.getValue();
 
-                    if (val === '') {
+                    if (val === '' || (this.options.nullable === true && val === null)) {
                         return true;
                     }
 
@@ -1956,6 +1957,10 @@ define('type/decimal',[
 
                 getModelData: function(val) {
                     if(val === '') {
+                        if (this.options.nullable === true) {
+                            return null;
+                        }
+
                         return '';
                     }
                     return Globalize.parseFloat(val);

diff --git a/bower_components/husky-validation/dist/validation.min.js b/bower_components/husky-validation/dist/validation.min.js
diff --git a/bower_components/requirejs-text/text.js b/bower_components/requirejs-text/text.js
@@ -1,7 +1,6 @@
 /**
- * @license RequireJS text 2.0.14 Copyright (c) 2010-2014, The Dojo Foundation All Rights Reserved.
- * Available via the MIT or new BSD license.
- * see: http://github.com/requirejs/text for details
+ * @license text 2.0.15 Copyright jQuery Foundation and other contributors.
+ * Released under MIT license, http://github.com/requirejs/text/LICENSE
  */
 /*jslint regexp: true */
 /*global require, XMLHttpRequest, ActiveXObject,
@@ -22,8 +21,26 @@ define(['module'], function (module) {
         buildMap = {},
         masterConfig = (module.config && module.config()) || {};
 
+    function useDefault(value, defaultValue) {
+        return value === undefined || value === '' ? defaultValue : value;
+    }
+
+    //Allow for default ports for http and https.
+    function isSamePort(protocol1, port1, protocol2, port2) {
+        if (port1 === port2) {
+            return true;
+        } else if (protocol1 === protocol2) {
+            if (protocol1 === 'http') {
+                return useDefault(port1, '80') === useDefault(port2, '80');
+            } else if (protocol1 === 'https') {
+                return useDefault(port1, '443') === useDefault(port2, '443');
+            }
+        }
+        return false;
+    }
+
     text = {
-        version: '2.0.14',
+        version: '2.0.15',
 
         strip: function (content) {
             //Strips <?xml ...?> declarations so that external SVG and XML
@@ -141,7 +158,7 @@ define(['module'], function (module) {
 
             return (!uProtocol || uProtocol === protocol) &&
                    (!uHostName || uHostName.toLowerCase() === hostname.toLowerCase()) &&
-                   ((!uPort && !uHostName) || uPort === port);
+                   ((!uPort && !uHostName) || isSamePort(uProtocol, uPort, protocol, port));
         },
 
         finishLoad: function (name, strip, content, onLoad) {

diff --git a/dist/husky.js b/dist/husky.js
@@ -14739,9 +14739,8 @@ define("underscore", (function (global) {
 }));
 
 /**
- * @license RequireJS text 2.0.14 Copyright (c) 2010-2014, The Dojo Foundation All Rights Reserved.
- * Available via the MIT or new BSD license.
- * see: http://github.com/requirejs/text for details
+ * @license text 2.0.15 Copyright jQuery Foundation and other contributors.
+ * Released under MIT license, http://github.com/requirejs/text/LICENSE
  */
 /*jslint regexp: true */
 /*global require, XMLHttpRequest, ActiveXObject,
@@ -14762,8 +14761,26 @@ define('text',['module'], function (module) {
         buildMap = {},
         masterConfig = (module.config && module.config()) || {};
 
+    function useDefault(value, defaultValue) {
+        return value === undefined || value === '' ? defaultValue : value;
+    }
+
+    //Allow for default ports for http and https.
+    function isSamePort(protocol1, port1, protocol2, port2) {
+        if (port1 === port2) {
+            return true;
+        } else if (protocol1 === protocol2) {
+            if (protocol1 === 'http') {
+                return useDefault(port1, '80') === useDefault(port2, '80');
+            } else if (protocol1 === 'https') {
+                return useDefault(port1, '443') === useDefault(port2, '443');
+            }
+        }
+        return false;
+    }
+
     text = {
-        version: '2.0.14',
+        version: '2.0.15',
 
         strip: function (content) {
             //Strips <?xml ...?> declarations so that external SVG and XML
@@ -14881,7 +14898,7 @@ define('text',['module'], function (module) {
 
             return (!uProtocol || uProtocol === protocol) &&
                    (!uHostName || uHostName.toLowerCase() === hostname.toLowerCase()) &&
-                   ((!uPort && !uHostName) || uPort === port);
+                   ((!uPort && !uHostName) || isSamePort(uProtocol, uPort, protocol, port));
         },
 
         finishLoad: function (name, strip, content, onLoad) {
@@ -18314,7 +18331,8 @@ define('type/decimal',[
     return function($el, options) {
         var defaults = {
                 format: 'n', // n, d, c, p
-                regExp: /^-?(?:\d+|\d{1,3}(?:,\d{3})+)?(?:\.\d+)?$/
+                regExp: /^-?(?:\d+|\d{1,3}(?:,\d{3})+)?(?:\.\d+)?$/,
+                nullable: false
             },
 
             typeInterface = {
@@ -18324,7 +18342,7 @@ define('type/decimal',[
                 validate: function() {
                     var val = this.getValue();
 
-                    if (val === '') {
+                    if (val === '' || (this.options.nullable === true && val === null)) {
                         return true;
                     }
 
@@ -18333,6 +18351,10 @@ define('type/decimal',[
 
                 getModelData: function(val) {
                     if(val === '') {
+                        if (this.options.nullable === true) {
+                            return null;
+                        }
+
                         return '';
                     }
                     return Globalize.parseFloat(val);

diff --git a/dist/husky.min.js b/dist/husky.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "husky",
-  "version": "0.20.0",
+  "version": "0.21.0",
   "description": "awesome sh*t",
   "keywords": [
     "frontend-framework"