merge 3.x branch into 4.x

CHANGELOG.md

@@ -3,6 +3,13 @@ All notable changes to this project will be documented in this file.
 
 ## [UNRELEASED]
 ### added
+
+### Updates
+
+### Fixed
+
+## [3.3.7 - 2017-06-09]
+### added
 - allow custom operation in casing option by callback #1565
 
 ### Updates

Gruntfile.js

@@ -100,7 +100,16 @@ module.exports = function (grunt) {
                 src: function () {
                     return 'nuspecs/Inputmask.nuspec';
                 }(),
-                dest: 'dist/',
+                dest: 'build/',
+                options: {
+                    version: '<%= pkg.version %>'
+                }
+            },
+            dist2: {
+                src: function () {
+                    return 'nuspecs/jquery.inputmask.nuspec';
+                }(),
+                dest: 'build/',
                 options: {
                     version: '<%= pkg.version %>'
                 }
@@ -108,7 +117,13 @@ module.exports = function (grunt) {
         },
         nugetpush: {
             dist: {
-                src: 'dist/InputMask.<%= pkg.version %>.nupkg',
+                src: 'build/InputMask.<%= pkg.version %>.nupkg',
+                options: {
+                    source: "https://www.nuget.org"
+                }
+            },
+            dist2: {
+                src: 'build/jquery.inputMask.<%= pkg.version %>.nupkg',
                 options: {
                     source: "https://www.nuget.org"
                 }

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "inputmask",
-  "version": "3.3.7-43",
+  "version": "4.0.1-0",
   "main": [
 	  "./dist/inputmask/inputmask.js",
 	  "./dist/inputmask/inputmask.extensions.js",

component.json

@@ -2,7 +2,7 @@
 	"name": "inputmask",
 	"repository": "robinherbots/Inputmask",
 	"description": "Inputmask is a javascript library which creates an input mask.  Inputmask can run against vanilla javascript, jQuery and jqlite.",
-	"version": "3.3.7-43",
+	"version": "4.0.1-0",
 	"keywords": [
 		"jquery",
 		"plugins",

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "robinherbots/inputmask",
   "description": "Inputmask is a javascript library which creates an input mask.  Inputmask can run against vanilla javascript, jQuery and jqlite.",
-  "version": "3.3.7-43",
+  "version": "4.0.1-0",
   "type": "library",
   "keywords": ["jquery", "plugins", "input", "form", "inputmask", "mask"],
   "homepage": "http://robinherbots.github.io/Inputmask",

dist/inputmask/bindings/inputmask.binding.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.7-43
+* Version: 4.0.1-0
 */
 
 !function(factory) {

dist/inputmask/dependencyLibs/inputmask.dependencyLib.jqlite.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.7-43
+* Version: 4.0.1-0
 */
 
 !function(factory) {

dist/inputmask/dependencyLibs/inputmask.dependencyLib.jquery.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.7-43
+* Version: 4.0.1-0
 */
 
 !function(factory) {

dist/inputmask/dependencyLibs/inputmask.dependencyLib.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.7-43
+* Version: 4.0.1-0
 */
 
 !function(factory) {

dist/inputmask/global/document.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.7-43
+* Version: 4.0.1-0
 */
 
 "function" == typeof define && define.amd ? define(function() {

dist/inputmask/global/window.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.7-43
+* Version: 4.0.1-0
 */
 
 "function" == typeof define && define.amd ? define(function() {

dist/inputmask/inputmask.date.extensions.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.7-43
+* Version: 4.0.1-0
 */
 
 !function(factory) {

dist/inputmask/inputmask.extensions.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.7-43
+* Version: 4.0.1-0
 */
 
 !function(factory) {

dist/inputmask/inputmask.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.7-43
+* Version: 4.0.1-0
 */
 
 !function(factory) {
@@ -283,7 +283,7 @@
                 locator: [],
                 cd: cacheDependency
             }), ndxIntlzr !== undefined && getMaskSet().tests[pos] ? filterTests($.extend(!0, [], matches)) : (getMaskSet().tests[pos] = $.extend(!0, [], matches), 
-            console.log(pos + " - " + JSON.stringify(matches)), filterTests(getMaskSet().tests[pos]));
+            filterTests(getMaskSet().tests[pos]));
         }
         function getBufferTemplate() {
             return getMaskSet()._buffer === undefined && (getMaskSet()._buffer = getMaskTemplate(!1, 1), 

dist/inputmask/inputmask.numeric.extensions.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.7-43
+* Version: 4.0.1-0
 */
 
 !function(factory) {

dist/inputmask/inputmask.phone.extensions.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.7-43
+* Version: 4.0.1-0
 */
 
 !function(factory) {

dist/inputmask/jquery.inputmask.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.7-43
+* Version: 4.0.1-0
 */
 
 !function(factory) {

dist/inputmask/phone-codes/phone-be.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.7-43
+* Version: 4.0.1-0
 */
 
 !function(factory) {

dist/inputmask/phone-codes/phone-nl.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.7-43
+* Version: 4.0.1-0
 */
 
 !function(factory) {

dist/inputmask/phone-codes/phone-ru.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.7-43
+* Version: 4.0.1-0
 */
 
 !function(factory) {

dist/inputmask/phone-codes/phone-uk.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.7-43
+* Version: 4.0.1-0
 */
 
 !function(factory) {

dist/inputmask/phone-codes/phone.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.7-43
+* Version: 4.0.1-0
 */
 
 !function(factory) {

dist/jquery.inputmask.bundle.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.7-43
+* Version: 4.0.1-0
 */
 
 !function(modules) {
@@ -331,7 +331,7 @@
                     locator: [],
                     cd: cacheDependency
                 }), ndxIntlzr !== undefined && getMaskSet().tests[pos] ? filterTests($.extend(!0, [], matches)) : (getMaskSet().tests[pos] = $.extend(!0, [], matches), 
-                console.log(pos + " - " + JSON.stringify(matches)), filterTests(getMaskSet().tests[pos]));
+                filterTests(getMaskSet().tests[pos]));
             }
             function getBufferTemplate() {
                 return getMaskSet()._buffer === undefined && (getMaskSet()._buffer = getMaskTemplate(!1, 1), 

dist/min/inputmask/dependencyLibs/inputmask.dependencyLib.jquery.min.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.7-43
+* Version: 4.0.1-0
 */
 
 !function(a){"function"==typeof define&&define.amd?define(["jquery"],a):"object"==typeof exports?module.exports=a(require("jquery")):window.dependencyLib=a(jQuery)}(function(a){return a});

dist/min/inputmask/global/document.min.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.7-43
+* Version: 4.0.1-0
 */
 
 "function"==typeof define&&define.amd?define(function(){return document}):"object"==typeof exports&&(module.exports=document);

dist/min/inputmask/global/window.min.js

@@ -3,7 +3,7 @@
 * https://github.com/RobinHerbots/Inputmask
 * Copyright (c) 2010 - 2017 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.3.7-43
+* Version: 4.0.1-0
 */
 
 "function"==typeof define&&define.amd?define(function(){return window}):"object"==typeof exports&&(module.exports=window);

js/inputmask.js

@@ -1330,7 +1330,7 @@
                     return filterTests($.extend(true, [], matches));
                 }
                 getMaskSet().tests[pos] = $.extend(true, [], matches); //set a clone to prevent overwriting some props
-                console.log(pos + " - " + JSON.stringify(matches));
+                // console.log(pos + " - " + JSON.stringify(matches));
                 return filterTests(getMaskSet().tests[pos]);
             }
 

nuspecs/jquery.inputmask.nuspec

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+    <metadata>
+        <id>jQuery.InputMask</id>
+        <version>0.0.0</version>
+        <title>jQuery Input Mask</title>
+        <authors>Robin Herbots</authors>
+        <owners>Robin Herbots</owners>
+        <licenseUrl>http://opensource.org/licenses/mit-license.php</licenseUrl>
+        <projectUrl>https://github.com/RobinHerbots/Inputmask</projectUrl>
+        <requireLicenseAcceptance>true</requireLicenseAcceptance>
+        <description>Inputmask is a javascript library which creates an input mask.  Inputmask can run against vanilla javascript, jQuery and jqlite.</description>
+        <summary>Inputmask is a javascript library which creates an input mask.  Inputmask can run against vanilla javascript, jQuery and jqlite.</summary>
+        <tags>jQuery, plugins, input, form, inputmask, mask</tags>
+    </metadata>
+    <files>
+        <file src="..\dist\inputmask\bindings\inputmask.binding.js" target="content\Scripts\inputmask\bindings\inputmask.binding.js" />
+        <file src="..\dist\min\inputmask\bindings\inputmask.binding.min.js" target="content\Scripts\inputmask\bindings\inputmask.binding.min.js" />
+        <file src="..\dist\inputmask\dependencyLibs\inputmask.dependencyLib.jqlite.js" target="content\Scripts\inputmask\dependencyLibs\inputmask.dependencyLib.jqlite.js" />
+        <file src="..\dist\min\inputmask\dependencyLibs\inputmask.dependencyLib.jqlite.min.js" target="content\Scripts\inputmask\dependencyLibs\inputmask.dependencyLib.jqlite.min.js" />
+        <file src="..\dist\inputmask\dependencyLibs\inputmask.dependencyLib.jquery.js" target="content\Scripts\inputmask\dependencyLibs\inputmask.dependencyLib.jquery.js" />
+        <file src="..\dist\min\inputmask\dependencyLibs\inputmask.dependencyLib.jquery.min.js" target="content\Scripts\inputmask\dependencyLibs\inputmask.dependencyLib.jquery.min.js" />
+        <file src="..\dist\inputmask\dependencyLibs\inputmask.dependencyLib.js" target="content\Scripts\inputmask\dependencyLibs\inputmask.dependencyLib.js" />
+        <file src="..\dist\min\inputmask\dependencyLibs\inputmask.dependencyLib.min.js" target="content\Scripts\inputmask\dependencyLibs\inputmask.dependencyLib.min.js" />
+        <file src="..\dist\inputmask\global\document.js" target="content\Scripts\inputmask\global\document.js" />
+        <file src="..\dist\min\inputmask\global\document.min.js" target="content\Scripts\inputmask\global\document.min.js" />
+        <file src="..\dist\inputmask\global\window.js" target="content\Scripts\inputmask\global\window.js" />
+        <file src="..\dist\min\inputmask\global\window.min.js" target="content\Scripts\inputmask\global\window.min.js" />
+        <file src="..\dist\inputmask\phone-codes\phone-be.js" target="content\Scripts\inputmask\phone-codes\phone-be.js" />
+        <file src="..\dist\min\inputmask\phone-codes\phone-be.min.js" target="content\Scripts\inputmask\phone-codes\phone-be.min.js" />
+        <file src="..\dist\inputmask\phone-codes\phone-nl.js" target="content\Scripts\inputmask\phone-codes\phone-nl.js" />
+        <file src="..\dist\min\inputmask\phone-codes\phone-nl.min.js" target="content\Scripts\inputmask\phone-codes\phone-nl.min.js" />
+        <file src="..\dist\inputmask\phone-codes\phone-ru.js" target="content\Scripts\inputmask\phone-codes\phone-ru.js" />
+        <file src="..\dist\min\inputmask\phone-codes\phone-ru.min.js" target="content\Scripts\inputmask\phone-codes\phone-ru.min.js" />
+        <file src="..\dist\inputmask\phone-codes\phone-uk.js" target="content\Scripts\inputmask\phone-codes\phone-uk.js" />
+        <file src="..\dist\min\inputmask\phone-codes\phone-uk.min.js" target="content\Scripts\inputmask\phone-codes\phone-uk.min.js" />
+        <file src="..\dist\inputmask\phone-codes\phone.js" target="content\Scripts\inputmask\phone-codes\phone.js" />
+        <file src="..\dist\min\inputmask\phone-codes\phone.min.js" target="content\Scripts\inputmask\phone-codes\phone.min.js" />
+        <file src="..\dist\inputmask\inputmask.date.extensions.js" target="content\Scripts\inputmask\inputmask.date.extensions.js" />
+        <file src="..\dist\min\inputmask\inputmask.date.extensions.min.js" target="content\Scripts\inputmask\inputmask.date.extensions.min.js" />
+        <file src="..\dist\inputmask\inputmask.extensions.js" target="content\Scripts\inputmask\inputmask.extensions.js" />
+        <file src="..\dist\min\inputmask\inputmask.extensions.min.js" target="content\Scripts\inputmask\inputmask.extensions.min.js" />
+        <file src="..\dist\inputmask\inputmask.js" target="content\Scripts\inputmask\inputmask.js" />
+        <file src="..\dist\min\inputmask\inputmask.min.js" target="content\Scripts\inputmask\inputmask.min.js" />
+        <file src="..\dist\inputmask\inputmask.numeric.extensions.js" target="content\Scripts\inputmask\inputmask.numeric.extensions.js" />
+        <file src="..\dist\min\inputmask\inputmask.numeric.extensions.min.js" target="content\Scripts\inputmask\inputmask.numeric.extensions.min.js" />
+        <file src="..\dist\inputmask\inputmask.phone.extensions.js" target="content\Scripts\inputmask\inputmask.phone.extensions.js" />
+        <file src="..\dist\min\inputmask\inputmask.phone.extensions.min.js" target="content\Scripts\inputmask\inputmask.phone.extensions.min.js" />
+        <file src="..\dist\inputmask\jquery.inputmask.js" target="content\Scripts\inputmask\jquery.inputmask.js" />
+        <file src="..\dist\min\inputmask\jquery.inputmask.min.js" target="content\Scripts\inputmask\jquery.inputmask.min.js" />
+        <file src="..\dist\jquery.inputmask.bundle.js" target="content\Scripts\jquery.inputmask.bundle.js" />
+        <file src="..\dist\min\jquery.inputmask.bundle.min.js" target="content\Scripts\jquery.inputmask.bundle.min.js" />
+        <file src="Readme.txt" target="Readme.txt" />
+    </files>
+</package>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "inputmask",
-  "version": "3.3.7-43",
+  "version": "4.0.1-0",
   "description": "Inputmask is a javascript library which creates an input mask.  Inputmask can run against vanilla javascript, jQuery and jqlite.",
   "main": "index.js",
   "files": [