浏览代码

some package updates

Robin Herbots 8 年之前
父节点
当前提交
6be7fea7ed
共有 5 个文件被更改,包括 26 次插入16 次删除
  1. 2 7
      app.js
  2. 13 0
      index.js
  3. 6 4
      js/inputmask.js
  4. 3 3
      package.json
  5. 2 2
      webpack.config.js

+ 2 - 7
app.js

@@ -1,10 +1,5 @@
-import "./js/inputmask.date.extensions"
-import "./js/inputmask.extensions"
-import "./js/inputmask.numeric.extensions"
-import "./js/inputmask.phone.extensions"
-import "./js/inputmask.regex.extensions"
-
-import im from "./js/inputmask.js"
+//webpack test
+import im from "./index";
 
 //just for testing
 window.Inputmask = im;

+ 13 - 0
index.js

@@ -0,0 +1,13 @@
+require("./js/inputmask.date.extensions");
+require("./js/inputmask.extensions");
+require("./js/inputmask.numeric.extensions");
+require("./js/inputmask.phone.extensions");
+require("./js/inputmask.regex.extensions");
+
+require("./js/phone-codes/phone-be");
+require("./js/phone-codes/phone-nl");
+require("./js/phone-codes/phone-ru");
+require("./js/phone-codes/phone-uk");
+require("./js/phone-codes/phone");
+
+module.exports = require("./js/inputmask.js");

+ 6 - 4
js/inputmask.js

@@ -403,9 +403,11 @@
 							var nextToken = maskToken.matches[ndx + 1];
 							if ((nextToken === undefined || (nextToken.matches === undefined || nextToken.isQuantifier === false)) && token && token.isGroup) { //this is not a group but a normal mask => convert
 								token.isGroup = false;
-								insertTestDefinition(token, opts.groupmarker.start, 0);
-								if (token.openGroup !== true) {
-									insertTestDefinition(token, opts.groupmarker.end);
+								if (!regexMask) {
+									insertTestDefinition(token, opts.groupmarker.start, 0);
+									if (token.openGroup !== true) {
+										insertTestDefinition(token, opts.groupmarker.end);
+									}
 								}
 							}
 							verifyGroupMarker(token);
@@ -1643,7 +1645,7 @@
 
 				else
 					getMaskSet().validPositions[pos] = $.extend(true, {}, validTest);
-				;
+
 
 				resetMaskSet(true);
 				return true;

+ 3 - 3
package.json

@@ -2,14 +2,14 @@
   "name": "jquery.inputmask",
   "version": "3.3.5-213",
   "description": "jquery.inputmask is a jquery plugin which create an input mask.",
-  "main": "dist/jquery.inputmask.bundle.js",
+  "main": "index.js",
   "files": [
     "dist/",
     "css/"
   ],
   "scripts": {
     "start": "webpack-dev-server --progress --colors ",
-    "build": "webpack --progress --colors --watch",
+    "build": "webpack --progress --colors",
     "test": "grunt validate"
   },
   "repository": {
@@ -62,7 +62,7 @@
     "karma-qunit": "^1.1.0",
     "karma-requirejs": "^1.0.0",
     "load-grunt-tasks": "^3.2.0",
-    "phantomjs": "^2.1.7",
+    "phantomjs-prebuilt": "^2.1.14",
     "postcss": "^5.0.21",
     "postcss-cssnext": "^2.6.0",
     "postcss-loader": "^0.9.1",

+ 2 - 2
webpack.config.js

@@ -18,7 +18,7 @@ module.exports = {
 		preLoaders: [
 			{
 				test: /\.js$/,
-				loader:'source-map',
+				loader: 'source-map',
 			},
 		],
 		loaders: [
@@ -43,7 +43,7 @@ module.exports = {
 	postcss: [postcss_cssnext],
 	resolve: {
 		alias: {
-		},
+		}
 	},
 	plugins: [
 		new webpack.SourceMapDevToolPlugin(