Robin Herbots 10 年 前
コミット
6025bdaedc

+ 1 - 1
CHANGELOG.md

@@ -4,9 +4,9 @@ All notable changes to this project will be documented in this file.
 ## [UNRELEASED]
 
 ### Updates
+- fix jquery.inputmask.bundle.js
 - fix dependency paths for browserify
 - update files to be included for package.json, bower.json, component.json
-- remove jquery.inputmask.bundle.js
 
 ### Fixed
 - Browserify error: `Error: Cannot find module 'inputmask' from '/Users/.../node_modules/jquery.inputmask/dist/inputmask` #1030

+ 25 - 0
Gruntfile.js

@@ -10,6 +10,14 @@ 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);");
+			grunt.file.write(dst, srcFile);
+		}
 		var uglifyConfig = {};
 		var srcFiles = grunt.file.expand(path + "/*.js");
 		for (var srcNdx in srcFiles) {
@@ -35,7 +43,24 @@ module.exports = function(grunt) {
 					ASCIIOnly: true
 				}
 			};
+
+			stripModuleLoaders("dist/inputmask/" + 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");
+		uglifyConfig["bundle"] = {
+			dest: "dist/jquery.inputmask.bundle.js",
+			src: srcFiles,
+			options: {
+				banner: createBanner("jquery.inputmask.bundle.js"),
+				beautify: true,
+				mangle: false,
+				preserveComments: "some",
+				ASCIIOnly: true
+			}
+		};
+
 		return uglifyConfig;
 	}
 

+ 1 - 1
bower.json

@@ -1,6 +1,6 @@
 {
   "name": "jquery.inputmask",
-  "version": "3.2.1-13",
+  "version": "3.2.1-14",
   "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-13",
+  "version": "3.2.1-14",
   "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-13",
+  "version": "3.2.1-14",
   "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-13
+* Version: 3.2.1-14
 */
 !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-13
+* Version: 3.2.1-14
 */
 !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-13
+* Version: 3.2.1-14
 */
 !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-13
+* Version: 3.2.1-14
 */
 !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-13
+* Version: 3.2.1-14
 */
 !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-13
+* Version: 3.2.1-14
 */
 !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-13
+* Version: 3.2.1-14
 */
 !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-13
+* Version: 3.2.1-14
 */
 !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);

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


ファイルの差分が大きいため隠しています
+ 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-13",
+  "version": "3.2.1-14",
   "description": "jquery.inputmask is a jquery plugin which create an input mask.",
   "main": "./dist/inputmask/jquery.inputmask.js",
   "files": [

+ 2 - 28
qunit/qunit.html

@@ -8,33 +8,7 @@
 <body>
   <div id="qunit"></div>
   <div id="qunit-fixture"></div>
-  <script src="../node_modules/jquery/dist/jquery.js"></script>
-  <script src="../node_modules/qunitjs/qunit/qunit.js"></script>
-  <script src="../dist/inputmask/dependencyLib.js"></script>
-  <script src="../dist/inputmask/inputmask.js"></script>
-  <script src="../dist/inputmask/inputmask.extensions.js"></script>
-  <script src="../dist/inputmask/inputmask.date.extensions.js"></script>
-  <script src="../dist/inputmask/inputmask.numeric.extensions.js"></script>
-  <script src="../dist/inputmask/inputmask.phone.extensions.js"></script>
-  <script src="../dist/inputmask/inputmask.regex.extensions.js"></script>
-  <script src="../dist/inputmask/jquery.inputmask.js"></script>
-  <script src="./prototypeExtensions.js"></script>
-  <script src="./simulator.js"></script>
-  <script src="./tests_base.js"></script>
-  <script src="./tests_setvalue.js"></script>
-  <script src="./tests_paste.js"></script>
-  <script src="./tests_initialvalue.js"></script>
-  <script src="./tests_date.js"></script>
-  <script src="./tests_dynamic.js"></script>
-  <script src="./tests_formatvalidate.js"></script>
-  <script src="./tests_ip.js"></script>
-  <script src="./tests_keepStatic.js"></script>
-  <script src="./tests_multi.js"></script>
-  <script src="./tests_numeric.js"></script>
-  <script src="./tests_numericinput.js"></script>
-  <script src="./tests_optional.js"></script>
-  <script src="./tests_phone.js"></script>
-  <script src="./tests_regex.js"></script>
-  <script src="./tests_escape.js"></script>
+  <script data-main="main" src="../node_modules/requirejs/require.js"></script>
+  <script src="config.js"></script>
 </body>
 </html>

+ 0 - 14
qunit/qunit_require.html

@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8">
-  <title>jquery.inputmask - QUnit</title>
-  <link rel="stylesheet" href="../node_modules/qunitjs/qunit/qunit.css">
-</head>
-<body>
-  <div id="qunit"></div>
-  <div id="qunit-fixture"></div>
-  <script data-main="main" src="../node_modules/requirejs/require.js"></script>
-  <script src="config.js"></script>
-</body>
-</html>

+ 53 - 0
test2.html

@@ -0,0 +1,53 @@
+<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>