浏览代码

fix dep in eventRuler

Robin Herbots 5 年之前
父节点
当前提交
65744b8fb7
共有 9 个文件被更改,包括 23 次插入22 次删除
  1. 1 1
      bower.json
  2. 1 1
      composer.json
  3. 6 6
      dist/inputmask.js
  4. 2 2
      dist/inputmask.min.js
  5. 6 6
      dist/jquery.inputmask.js
  6. 2 2
      dist/jquery.inputmask.min.js
  7. 1 1
      lib/escapeRegex.js
  8. 3 2
      lib/eventruler.js
  9. 1 1
      package.json

+ 1 - 1
bower.json

@@ -1,6 +1,6 @@
 {
   "name": "inputmask",
-  "version": "5.0.4-beta.41",
+  "version": "5.0.4-beta.43",
   "main": [
 	  "./index.js",
     "./css/inputmask.css"

+ 1 - 1
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": "5.0.4-beta.41",
+  "version": "5.0.4-beta.43",
   "type": "library",
   "keywords": ["jquery", "plugins", "input", "form", "inputmask", "mask"],
   "homepage": "http://robinherbots.github.io/Inputmask",

+ 6 - 6
dist/inputmask.js

@@ -3,7 +3,7 @@
  * https://github.com/RobinHerbots/Inputmask
  * Copyright (c) 2010 - 2020 Robin Herbots
  * Licensed under the MIT license
- * Version: 5.0.4-beta.41
+ * Version: 5.0.4-beta.43
  */
 !function webpackUniversalModuleDefinition(root, factory) {
     if ("object" == typeof exports && "object" == typeof module) module.exports = factory(); else if ("function" == typeof define && define.amd) define([], factory); else {
@@ -1386,9 +1386,9 @@
         }
         var EventRuler = {
             on: function on(input, eventName, eventHandler) {
-                var ev = function ev(e) {
+                var $ = input.inputmask.dependencyLib, ev = function ev(e) {
                     e.originalEvent && (e = e.originalEvent || e, arguments[0] = e);
-                    var that = this, args, inputmask = that.inputmask, opts = inputmask ? inputmask.opts : void 0;
+                    var that = this, args, inputmask = that.inputmask, opts = inputmask ? inputmask.opts : void 0, $ = inputmask.dependencyLib;
                     if (void 0 === inputmask && "FORM" !== this.nodeName) {
                         var imOpts = $.data(that, "_inputmask_opts");
                         $(that).off(), imOpts && new _inputmask.default(imOpts).mask(that);
@@ -1435,11 +1435,11 @@
             },
             off: function off(input, event) {
                 if (input.inputmask && input.inputmask.events) {
-                    var _$ = input.inputmask.dependencyLib, events = input.inputmask.events;
-                    event && (events = [], events[event] = input.inputmask.events[event]), _$.each(events, function(eventName, evArr) {
+                    var $ = input.inputmask.dependencyLib, events = input.inputmask.events;
+                    event && (events = [], events[event] = input.inputmask.events[event]), $.each(events, function(eventName, evArr) {
                         for (;0 < evArr.length; ) {
                             var ev = evArr.pop();
-                            -1 !== _$.inArray(eventName, [ "submit", "reset" ]) ? null !== input.form && _$(input.form).off(eventName, ev) : _$(input).off(eventName, ev);
+                            -1 !== $.inArray(eventName, [ "submit", "reset" ]) ? null !== input.form && $(input.form).off(eventName, ev) : $(input).off(eventName, ev);
                         }
                         delete input.inputmask.events[eventName];
                     });

文件差异内容过多而无法显示
+ 2 - 2
dist/inputmask.min.js


+ 6 - 6
dist/jquery.inputmask.js

@@ -3,7 +3,7 @@
  * https://github.com/RobinHerbots/Inputmask
  * Copyright (c) 2010 - 2020 Robin Herbots
  * Licensed under the MIT license
- * Version: 5.0.4-beta.41
+ * Version: 5.0.4-beta.43
  */
 !function webpackUniversalModuleDefinition(root, factory) {
     if ("object" == typeof exports && "object" == typeof module) module.exports = factory(require("jquery")); else if ("function" == typeof define && define.amd) define([ "jquery" ], factory); else {
@@ -1375,9 +1375,9 @@
         }
         var EventRuler = {
             on: function on(input, eventName, eventHandler) {
-                var ev = function ev(e) {
+                var $ = input.inputmask.dependencyLib, ev = function ev(e) {
                     e.originalEvent && (e = e.originalEvent || e, arguments[0] = e);
-                    var that = this, args, inputmask = that.inputmask, opts = inputmask ? inputmask.opts : void 0;
+                    var that = this, args, inputmask = that.inputmask, opts = inputmask ? inputmask.opts : void 0, $ = inputmask.dependencyLib;
                     if (void 0 === inputmask && "FORM" !== this.nodeName) {
                         var imOpts = $.data(that, "_inputmask_opts");
                         $(that).off(), imOpts && new _inputmask.default(imOpts).mask(that);
@@ -1424,11 +1424,11 @@
             },
             off: function off(input, event) {
                 if (input.inputmask && input.inputmask.events) {
-                    var _$ = input.inputmask.dependencyLib, events = input.inputmask.events;
-                    event && (events = [], events[event] = input.inputmask.events[event]), _$.each(events, function(eventName, evArr) {
+                    var $ = input.inputmask.dependencyLib, events = input.inputmask.events;
+                    event && (events = [], events[event] = input.inputmask.events[event]), $.each(events, function(eventName, evArr) {
                         for (;0 < evArr.length; ) {
                             var ev = evArr.pop();
-                            -1 !== _$.inArray(eventName, [ "submit", "reset" ]) ? null !== input.form && _$(input.form).off(eventName, ev) : _$(input).off(eventName, ev);
+                            -1 !== $.inArray(eventName, [ "submit", "reset" ]) ? null !== input.form && $(input.form).off(eventName, ev) : $(input).off(eventName, ev);
                         }
                         delete input.inputmask.events[eventName];
                     });

文件差异内容过多而无法显示
+ 2 - 2
dist/jquery.inputmask.min.js


+ 1 - 1
lib/escapeRegex.js

@@ -1,4 +1,4 @@
 const  escapeRegexRegex = new RegExp("(\\" + ["/", ".", "*", "+", "?", "|", "(", ")", "[", "]", "{", "}", "\\", "$", "^"].join("|\\") + ")", "gim");
 export default function (str) {
 	return str.replace(escapeRegexRegex, "\\$1");
-};
+}

+ 3 - 2
lib/eventruler.js

@@ -7,7 +7,7 @@ export {EventRuler};
 
 var EventRuler = {
 	on: function (input, eventName, eventHandler) {
-
+		const $ = input.inputmask.dependencyLib;
 
 		var ev = function (e) {
 			if (e.originalEvent) {
@@ -15,7 +15,8 @@ var EventRuler = {
 				arguments[0] = e;
 			}
 			// console.log(e.type);
-			var that = this, args, inputmask = that.inputmask, opts = inputmask ? inputmask.opts : undefined;
+			var that = this, args, inputmask = that.inputmask, opts = inputmask ? inputmask.opts : undefined,
+				$ = inputmask.dependencyLib;
 			if (inputmask === undefined && this.nodeName !== "FORM") { //happens when cloning an object with jquery.clone
 				var imOpts = $.data(that, "_inputmask_opts");
 				$(that).off(); //unbind all events

+ 1 - 1
package.json

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