ソースを参照

fix fix bundle ;-)

Robin Herbots 10 年 前
コミット
9708b53d49

+ 9 - 9
Gruntfile.js

@@ -12,10 +12,10 @@ module.exports = function(grunt) {
 	function createUglifyConfig(path) {
 		function stripModuleLoaders(src, dst) {
 			var srcFile = grunt.file.read(src);
-			srcFile = srcFile.replace(new RegExp("!function[\\s\\S]*\\}\\(function\\("), "(function(");
-			if (src.indexOf("extensions") === -1) {
-				srcFile = srcFile.replace(new RegExp(";$"), "(jQuery);");
-			} else srcFile = srcFile.replace(new RegExp(";$"), "(jQuery, Inputmask);");
+			srcFile = srcFile.replace(new RegExp("\\(function\\(factory\\)[\\s\\S]*\\(function\\(\\$"), "(function($");
+			if (src.indexOf("extensions") === -1 && src.indexOf("jquery.inputmask") === -1) {
+				srcFile = srcFile.replace(new RegExp("\\}\\)\\);[\\s\\S]*$"), "})(jQuery);");
+			} else srcFile = srcFile.replace(new RegExp("\\}\\)\\);[\\s\\S]*$"), "})(jQuery, Inputmask);");
 			grunt.file.write(dst, srcFile);
 		}
 		var uglifyConfig = {};
@@ -44,11 +44,11 @@ module.exports = function(grunt) {
 				}
 			};
 
-			stripModuleLoaders("dist/inputmask/" + dstFile, "build/" + dstFile);
+			stripModuleLoaders("js/" + dstFile, "build/" + dstFile);
 		}
-		srcFiles = grunt.file.expand(path + "/*.extensions.js");
-		srcFiles.splice(0, 0, "js/jquery.inputmask.js");
-		srcFiles.splice(0, 0, "js/inputmask.js");
+		srcFiles = grunt.file.expand("build/*.extensions.js");
+		srcFiles.splice(0, 0, "build/jquery.inputmask.js");
+		srcFiles.splice(0, 0, "build/inputmask.js");
 		uglifyConfig["bundle"] = {
 			dest: "dist/jquery.inputmask.bundle.js",
 			src: srcFiles,
@@ -68,7 +68,7 @@ module.exports = function(grunt) {
 	grunt.initConfig({
 		pkg: grunt.file.readJSON("package.json"),
 		uglify: createUglifyConfig("js"),
-		clean: ["dist", "build"],
+		clean: ["dist"],
 		karma: {
 			options: {
 				configFile: 'karma.conf.js'

+ 1 - 1
bower.json

@@ -1,6 +1,6 @@
 {
   "name": "jquery.inputmask",
-  "version": "3.2.1-14",
+  "version": "3.2.1-29",
   "main": [
     "./dist/inputmask/dependencyLib.js"
     "./dist/inputmask/inputmask.js",

+ 1 - 1
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.2.1-14",
+  "version": "3.2.1-29",
   "keywords": ["jquery", "plugins", "input", "form", "inputmask", "mask"],
   "main": "./dist/jquery.inputmask.bundle.js",
   "scripts": [

+ 1 - 1
composer.json

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

+ 1 - 1
dist/inputmask/dependencyLib.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.2.1-14
+* Version: 3.2.1-29
 */
 !function(factory) {
     "function" == typeof define && define.amd ? define([ "jquery" ], factory) : "object" == typeof exports ? module.exports = factory(require("jquery")) : factory(jQuery);

+ 1 - 1
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.2.1-14
+* Version: 3.2.1-29
 */
 !function(factory) {
     "function" == typeof define && define.amd ? define([ "jquery", "inputmask" ], factory) : "object" == typeof exports ? module.exports = factory(require("jquery"), require("./inputmask")) : factory(jQuery, window.Inputmask);

+ 1 - 1
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.2.1-14
+* Version: 3.2.1-29
 */
 !function(factory) {
     "function" == typeof define && define.amd ? define([ "jquery", "inputmask" ], factory) : "object" == typeof exports ? module.exports = factory(require("jquery"), require("./inputmask")) : factory(jQuery, window.Inputmask);

+ 1 - 1
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.2.1-14
+* Version: 3.2.1-29
 */
 !function(factory) {
     "function" == typeof define && define.amd ? define([ "dependencyLib" ], factory) : "object" == typeof exports ? module.exports = factory(require("./dependencyLib")) : factory(window.dependencyLib || jQuery);

+ 1 - 1
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.2.1-14
+* Version: 3.2.1-29
 */
 !function(factory) {
     "function" == typeof define && define.amd ? define([ "jquery", "inputmask" ], factory) : "object" == typeof exports ? module.exports = factory(require("jquery"), require("./inputmask")) : factory(jQuery, window.Inputmask);

+ 1 - 1
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.2.1-14
+* Version: 3.2.1-29
 */
 !function(factory) {
     "function" == typeof define && define.amd ? define([ "jquery", "inputmask" ], factory) : "object" == typeof exports ? module.exports = factory(require("jquery"), require("./inputmask")) : factory(jQuery, window.Inputmask);

+ 1 - 1
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.2.1-14
+* Version: 3.2.1-29
 */
 !function(factory) {
     "function" == typeof define && define.amd ? define([ "jquery", "inputmask" ], factory) : "object" == typeof exports ? module.exports = factory(require("jquery"), require("./inputmask")) : factory(jQuery, window.Inputmask);

+ 1 - 1
dist/inputmask/jquery.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.2.1-14
+* Version: 3.2.1-29
 */
 !function(factory) {
     "function" == typeof define && define.amd ? define([ "jquery", "inputmask" ], factory) : "object" == typeof exports ? module.exports = factory(require("jquery"), require("./inputmask")) : factory(jQuery, window.Inputmask);

+ 9 - 23
dist/jquery.inputmask.bundle.js

@@ -3,11 +3,9 @@
 * 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.2.1-14
+* Version: 3.2.1-29
 */
-!function(factory) {
-    "function" == typeof define && define.amd ? define([ "dependencyLib" ], factory) : "object" == typeof exports ? module.exports = factory(require("./dependencyLib")) : factory(window.dependencyLib || jQuery);
-}(function($) {
+!function($) {
     function Inputmask(options) {
         this.el = void 0, this.opts = $.extend(!0, {}, this.defaults, options), this.noMasksCache = options && void 0 !== options.definitions, 
         this.userOptions = options || {}, resolveAlias(this.opts.alias, options, this.opts);
@@ -1378,9 +1376,7 @@
     };
     var ua = navigator.userAgent, iphone = null !== ua.match(new RegExp("iphone", "i")), androidchrome = null !== ua.match(new RegExp("android.*chrome.*", "i")), androidfirefox = null !== ua.match(new RegExp("android.*firefox.*", "i")), PasteEventType = isInputEventSupported("paste") ? "paste" : isInputEventSupported("input") ? "input" : "propertychange";
     return window.Inputmask = Inputmask, Inputmask;
-}), function(factory) {
-    "function" == typeof define && define.amd ? define([ "jquery", "inputmask" ], factory) : "object" == typeof exports ? module.exports = factory(require("jquery"), require("./inputmask")) : factory(jQuery, window.Inputmask);
-}(function($, Inputmask) {
+}(jQuery), function($, Inputmask) {
     return void 0 === $.fn.inputmask && ($.fn.inputmask = function(fn, options) {
         var nptmask, input;
         if (options = options || {}, "string" == typeof fn) switch (fn) {
@@ -1436,9 +1432,7 @@
             });
         }
     }), $.fn.inputmask;
-}), function(factory) {
-    "function" == typeof define && define.amd ? define([ "jquery", "inputmask" ], factory) : "object" == typeof exports ? module.exports = factory(require("jquery"), require("./inputmask")) : factory(jQuery, window.Inputmask);
-}(function($, Inputmask) {
+}(jQuery, Inputmask), function($, Inputmask) {
     return Inputmask.extendDefinitions({
         h: {
             validator: "[01][0-9]|2[0-3]",
@@ -1938,9 +1932,7 @@
             clearIncomplete: !0
         }
     }), Inputmask;
-}), function(factory) {
-    "function" == typeof define && define.amd ? define([ "jquery", "inputmask" ], factory) : "object" == typeof exports ? module.exports = factory(require("jquery"), require("./inputmask")) : factory(jQuery, window.Inputmask);
-}(function($, Inputmask) {
+}(jQuery, Inputmask), function($, Inputmask) {
     return Inputmask.extendDefinitions({
         A: {
             validator: "[A-Za-z\u0410-\u044f\u0401\u0451\xc0-\xff\xb5]",
@@ -2045,9 +2037,7 @@
             mask: "##:##:##:##:##:##"
         }
     }), Inputmask;
-}), function(factory) {
-    "function" == typeof define && define.amd ? define([ "jquery", "inputmask" ], factory) : "object" == typeof exports ? module.exports = factory(require("jquery"), require("./inputmask")) : factory(jQuery, window.Inputmask);
-}(function($, Inputmask) {
+}(jQuery, Inputmask), function($, Inputmask) {
     return Inputmask.extendAliases({
         numeric: {
             mask: function(opts) {
@@ -2472,9 +2462,7 @@
             allowMinus: !1
         }
     }), Inputmask;
-}), function(factory) {
-    "function" == typeof define && define.amd ? define([ "jquery", "inputmask" ], factory) : "object" == typeof exports ? module.exports = factory(require("jquery"), require("./inputmask")) : factory(jQuery, window.Inputmask);
-}(function($, Inputmask) {
+}(jQuery, Inputmask), function($, Inputmask) {
     return Inputmask.extendAliases({
         phone: {
             url: "phone-codes/phone-codes.js",
@@ -2512,9 +2500,7 @@
             nojumpsThreshold: 4
         }
     }), Inputmask;
-}), function(factory) {
-    "function" == typeof define && define.amd ? define([ "jquery", "inputmask" ], factory) : "object" == typeof exports ? module.exports = factory(require("jquery"), require("./inputmask")) : factory(jQuery, window.Inputmask);
-}(function($, Inputmask) {
+}(jQuery, Inputmask), function($, Inputmask) {
     return Inputmask.extendAliases({
         Regex: {
             mask: "r",
@@ -2619,4 +2605,4 @@
             }
         }
     }), Inputmask;
-});
+}(jQuery, Inputmask);

ファイルの差分が大きいため隠しています
+ 1 - 1
dist/min/inputmask/dependencyLib.min.js


ファイルの差分が大きいため隠しています
+ 1 - 1
dist/min/inputmask/inputmask.date.extensions.min.js


ファイルの差分が大きいため隠しています
+ 1 - 1
dist/min/inputmask/inputmask.extensions.min.js


ファイルの差分が大きいため隠しています
+ 1 - 1
dist/min/inputmask/inputmask.min.js


ファイルの差分が大きいため隠しています
+ 1 - 1
dist/min/inputmask/inputmask.numeric.extensions.min.js


ファイルの差分が大きいため隠しています
+ 1 - 1
dist/min/inputmask/inputmask.phone.extensions.min.js


ファイルの差分が大きいため隠しています
+ 1 - 1
dist/min/inputmask/inputmask.regex.extensions.min.js


ファイルの差分が大きいため隠しています
+ 1 - 1
dist/min/inputmask/jquery.inputmask.min.js


+ 1 - 1
package.json

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

+ 0 - 53
test2.html

@@ -1,53 +0,0 @@
-<html>
-<head>
-	<meta charset="UTF-8" />
-	  <script src="http://code.jquery.com/jquery-1.11.3.js"></script>
-    <script src="js/inputmask.js"></script>
-  <script src="js/inputmask.numeric.extensions.js"></script>
-  <script src="js/jquery.inputmask.js"></script>
-	<script>
-	var LocaleConfigurations = {};
-	LocaleConfigurations.SeparadorDecimal = ',';
-	LocaleConfigurations.SeparadorMilhar = '.';
-	function NumberDecimalMask(selector, length, decimalDigits, allowNegative, denySeparadorMilhar) {
-		var integerDigits = length - decimalDigits;
-		var config = {
-			allowMinus: !!allowNegative,
-			allowPlus: false,
-			rightAlign: false,
-			autoGroup: true,
-			integerDigits: integerDigits,
-			digits: decimalDigits,
-			radixPoint: LocaleConfigurations.SeparadorDecimal
-		};
-		if(integerDigits > 0) {
-			config.integerDigits = integerDigits;
-		}
-		if(!denySeparadorMilhar) {
-			config.groupSeparator = LocaleConfigurations.SeparadorMilhar;
-			config.groupSize = 3;
-		}
-		$(selector).inputmask("decimal", config);
-	}
-	function createMask(){
-		var residuoFichas = ['1','2'];
-		for(var i=0; i<residuoFichas.length;i++){
-			NumberDecimalMask("#input_"+ residuoFichas[i], 16, 8, false, false);
-		}
-	}
-	function setValue() {
-		var residuoFichas = ['1','2'];
-		var valoresFichas = ['45','253'];
-		for(var i=0; i<residuoFichas.length;i++){
-			$("#input_"+ residuoFichas[i]).val(valoresFichas[i]);
-		}
-	}
-	</script>
-</head>
-<body>
-	<div><input id="input_1" value="" /></div>
-	<div><input id="input_2" value="" /></div>
-	<div><button onclick="createMask()" >Criar máscara</button></div>
-	<div><button onclick="setValue()" >Setar valor</button></div>
-</body>
-</html>