fix options handling

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "jquery.inputmask",
-  "version": "3.1.64-62",
+  "version": "3.1.64-63",
   "main": [
     "./dist/inputmask/jquery.inputmask.js",
     "./dist/inputmask/jquery.inputmask.extensions.js",

component.json

@@ -2,7 +2,7 @@
     "name": "jquery_inputmask",
     "repository": "robinherbots/jquery.inputmask",
     "description": "jquery.inputmask is a jquery plugin which create an input mask.",
-    "version": "3.1.64-62",
+    "version": "3.1.64-63",
     "keywords": [ "jquery", "plugins", "input", "form", "inputmask", "mask" ],
     "main": "./dist/jquery.inputmask.bundle.js",
     "scripts": [

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "robinherbots/jquery.inputmask",
     "description": "jquery.inputmask is a jquery plugin which create an input mask.",
-	"version": "3.1.64-62",
+	"version": "3.1.64-63",
     "type": "library",
     "keywords": ["jquery", "plugins", "input", "form", "inputmask", "mask"],
     "homepage": "http://robinherbots.github.io/jquery.inputmask",

dist/inputmask/inputmask.date.extensions.js

@@ -3,7 +3,7 @@
 * http://github.com/RobinHerbots/jquery.inputmask
 * Copyright (c) 2010 - 2015 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.1.64-62
+* Version: 3.1.64-63
 */
 !function(factory) {
     "function" == typeof define && define.amd ? define([ "jquery", "./inputmask" ], factory) : "object" == typeof exports ? module.exports = factory(require("jquery"), require("./inputmask")) : factory(jQuery);

dist/inputmask/inputmask.extensions.js

@@ -3,7 +3,7 @@
 * http://github.com/RobinHerbots/jquery.inputmask
 * Copyright (c) 2010 - 2015 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.1.64-62
+* Version: 3.1.64-63
 */
 !function(factory) {
     "function" == typeof define && define.amd ? define([ "jquery", "./inputmask" ], factory) : "object" == typeof exports ? module.exports = factory(require("jquery"), require("./inputmask")) : factory(jQuery);

dist/inputmask/inputmask.js

@@ -3,7 +3,7 @@
 * http://github.com/RobinHerbots/jquery.inputmask
 * Copyright (c) 2010 - 2015 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.1.64-62
+* Version: 3.1.64-63
 */
 !function(factory) {
     "function" == typeof define && define.amd ? define([ "jquery" ], factory) : "object" == typeof exports ? module.exports = factory(require("jquery")) : factory(jQuery);

dist/inputmask/inputmask.numeric.extensions.js

@@ -3,7 +3,7 @@
 * http://github.com/RobinHerbots/jquery.inputmask
 * Copyright (c) 2010 - 2015 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.1.64-62
+* Version: 3.1.64-63
 */
 !function(factory) {
     "function" == typeof define && define.amd ? define([ "jquery", "./inputmask" ], factory) : "object" == typeof exports ? module.exports = factory(require("jquery"), require("./inputmask")) : factory(jQuery);

dist/inputmask/inputmask.phone.extensions.js

@@ -3,7 +3,7 @@
 * http://github.com/RobinHerbots/jquery.inputmask
 * Copyright (c) 2010 - 2015 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.1.64-62
+* Version: 3.1.64-63
 */
 !function(factory) {
     "function" == typeof define && define.amd ? define([ "jquery", "./inputmask" ], factory) : "object" == typeof exports ? module.exports = factory(require("jquery"), require("./inputmask")) : factory(jQuery);

dist/inputmask/inputmask.regex.extensions.js

@@ -3,7 +3,7 @@
 * http://github.com/RobinHerbots/jquery.inputmask
 * Copyright (c) 2010 - 2015 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.1.64-62
+* Version: 3.1.64-63
 */
 !function(factory) {
     "function" == typeof define && define.amd ? define([ "jquery", "./inputmask" ], factory) : "object" == typeof exports ? module.exports = factory(require("jquery"), require("./inputmask")) : factory(jQuery);

dist/inputmask/jquery.inputmask.js

@@ -3,14 +3,14 @@
 * http://github.com/RobinHerbots/jquery.inputmask
 * Copyright (c) 2010 - 2015 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.1.64-62
+* Version: 3.1.64-63
 */
 !function(factory) {
     "function" == typeof define && define.amd ? define([ "jquery", "./inputmask" ], factory) : "object" == typeof exports ? module.exports = factory(require("jquery"), require("./inputmask")) : factory(jQuery);
 }(function($) {
     return void 0 === $.fn.inputmask && ($.fn.inputmask = function(fn, options) {
         var nptmask;
-        if ("string" == typeof fn) switch (fn) {
+        if (options = options || {}, "string" == typeof fn) switch (fn) {
           case "mask":
             return nptmask = new inputmask(options), this.each(function() {
                 nptmask.mask(this);
@@ -42,8 +42,7 @@
             return input.inputmask ? input.inputmask.getmetadata() : void 0;
 
           default:
-            return options = options || {}, options.alias = fn, nptmask = new inputmask(options), 
-            this.each(function() {
+            return options.alias = fn, nptmask = new inputmask(options), this.each(function() {
                 nptmask.mask(this);
             });
         } else {
@@ -51,7 +50,7 @@
                 nptmask.mask(this);
             });
             if (void 0 == fn) return this.each(function() {
-                nptmask = new inputmask(), nptmask.mask(this);
+                nptmask = new inputmask(options), nptmask.mask(this);
             });
         }
     }), $.fn.inputmask;

dist/jquery.inputmask.bundle.js

@@ -3,7 +3,7 @@
 * http://github.com/RobinHerbots/jquery.inputmask
 * Copyright (c) 2010 - 2015 Robin Herbots
 * Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 3.1.64-62
+* Version: 3.1.64-63
 */
 !function($) {
     function inputmask(options) {
@@ -1354,7 +1354,7 @@
 }(jQuery), function($) {
     return void 0 === $.fn.inputmask && ($.fn.inputmask = function(fn, options) {
         var nptmask;
-        if ("string" == typeof fn) switch (fn) {
+        if (options = options || {}, "string" == typeof fn) switch (fn) {
           case "mask":
             return nptmask = new inputmask(options), this.each(function() {
                 nptmask.mask(this);
@@ -1386,8 +1386,7 @@
             return input.inputmask ? input.inputmask.getmetadata() : void 0;
 
           default:
-            return options = options || {}, options.alias = fn, nptmask = new inputmask(options), 
-            this.each(function() {
+            return options.alias = fn, nptmask = new inputmask(options), this.each(function() {
                 nptmask.mask(this);
             });
         } else {
@@ -1395,7 +1394,7 @@
                 nptmask.mask(this);
             });
             if (void 0 == fn) return this.each(function() {
-                nptmask = new inputmask(), nptmask.mask(this);
+                nptmask = new inputmask(options), nptmask.mask(this);
             });
         }
     }), $.fn.inputmask;

js/jquery.inputmask.js

@@ -11,6 +11,7 @@
     //jquery plugin
     $.fn.inputmask = function(fn, options) {
       var nptmask;
+      options = options || {};
       if (typeof fn === "string") {
         switch (fn) {
           case "mask":
@@ -38,7 +39,6 @@
             var input = this.jquery && this.length > 0 ? this[0] : this;
             return input.inputmask ? input.inputmask.getmetadata() : undefined;
           default:
-            options = options || {};
             options.alias = fn;
             nptmask = new inputmask(options);
             return this.each(function() {
@@ -53,7 +53,7 @@
       } else if (fn == undefined) {
         //look for data-inputmask atributes
         return this.each(function() {
-          nptmask = new inputmask();
+          nptmask = new inputmask(options);
           nptmask.mask(this);
         });
       }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jquery.inputmask",
-  "version": "3.1.64-62",
+  "version": "3.1.64-63",
   "description": "jquery.inputmask is a jquery plugin which create an input mask.",
   "main": "./dist/inputmask/jquery.inputmask.js",
   "files": [