Browse Source

include mask in metadata -always

Robin Herbots 11 years ago
parent
commit
8d64accc26
3 changed files with 3 additions and 116 deletions
  1. 0 5
      README.md
  2. 3 5
      js/jquery.inputmask.js
  3. 0 106
      npm-debug.log

+ 0 - 5
README.md

@@ -730,11 +730,6 @@ Validate a given value against the mask.
 var isValid = $.inputmask.isValid("23/03/1973", { alias: "dd/mm/yyyy"});
 var isValid = $.inputmask.isValid("23/03/1973", { alias: "dd/mm/yyyy"});
 ```
 ```
 
 
-## Compiling with Google Closure Compiler
-
-First grab the sources from GitHub.  In the root you type ant.
-A new folder dist is created with the minified and optimized js-files
-
 ## .NET Nuget Package Install
 ## .NET Nuget Package Install
 ```html
 ```html
 PM> Install-Package jQuery.InputMask
 PM> Install-Package jQuery.InputMask

+ 3 - 5
js/jquery.inputmask.js

@@ -270,25 +270,23 @@
                         if (msk["mask"] != undefined && !$.isFunction(msk["mask"])) {
                         if (msk["mask"] != undefined && !$.isFunction(msk["mask"])) {
                             ms.push(generateMask(msk["mask"].toString(), msk));
                             ms.push(generateMask(msk["mask"].toString(), msk));
                         } else {
                         } else {
-                            ms.push(generateMask(msk.toString()));
+                            ms.push(generateMask(msk.toString(), msk));
                         }
                         }
                     });
                     });
                 } else {
                 } else {
                     opts.keepStatic = opts.keepStatic == undefined ? true : opts.keepStatic; //enable by default when passing multiple masks when the option is not explicitly specified
                     opts.keepStatic = opts.keepStatic == undefined ? true : opts.keepStatic; //enable by default when passing multiple masks when the option is not explicitly specified
-                    var hasMetaData = false;
                     var altMask = "(";
                     var altMask = "(";
                     $.each(opts.mask, function (ndx, msk) {
                     $.each(opts.mask, function (ndx, msk) {
                         if (altMask.length > 1)
                         if (altMask.length > 1)
                             altMask += ")|(";
                             altMask += ")|(";
                         if (msk["mask"] != undefined && !$.isFunction(msk["mask"])) {
                         if (msk["mask"] != undefined && !$.isFunction(msk["mask"])) {
-                            hasMetaData = true;
                             altMask += msk["mask"].toString();
                             altMask += msk["mask"].toString();
                         } else {
                         } else {
                             altMask += msk.toString();
                             altMask += msk.toString();
                         }
                         }
                     });
                     });
                     altMask += ")";
                     altMask += ")";
-                    ms = generateMask(altMask, hasMetaData ? opts.mask : undefined);
+                    ms = generateMask(altMask, opts.mask);
                 }
                 }
             } else {
             } else {
                 if (opts.mask.length == 1 && opts.greedy == false && opts.repeat != 0) {
                 if (opts.mask.length == 1 && opts.greedy == false && opts.repeat != 0) {
@@ -297,7 +295,7 @@
                 if (opts.mask["mask"] != undefined && !$.isFunction(opts.mask["mask"])) {
                 if (opts.mask["mask"] != undefined && !$.isFunction(opts.mask["mask"])) {
                     ms = generateMask(opts.mask["mask"].toString(), opts.mask);
                     ms = generateMask(opts.mask["mask"].toString(), opts.mask);
                 } else {
                 } else {
-                    ms = generateMask(opts.mask.toString());
+                    ms = generateMask(opts.mask.toString(), opts.mask);
                 }
                 }
             }
             }
             return ms;
             return ms;

+ 0 - 106
npm-debug.log

@@ -1,106 +0,0 @@
-0 info it worked if it ends with ok
-1 verbose cli [ 'c:\\Program Files\\nodejs\\node.exe',
-1 verbose cli   'c:\\Program Files\\nodejs\\node_modules\\npm\\bin\\npm-cli.js',
-1 verbose cli   'adduser' ]
-2 info using npm@1.4.21
-3 info using node@v0.10.30
-4 verbose adduser before first PUT { name: 'robin',
-4 verbose adduser   password: 'XXXXX',
-4 verbose adduser   email: 'robin.herbots@gmail.com',
-4 verbose adduser   _id: 'org.couchdb.user:robin',
-4 verbose adduser   type: 'user',
-4 verbose adduser   roles: [],
-4 verbose adduser   date: '2014-09-08T11:08:54.200Z' }
-5 verbose request where is /-/user/org.couchdb.user:robin
-6 verbose request registry https://registry.npmjs.org/
-7 verbose request id 374a028a6ae848f0
-8 verbose url raw /-/user/org.couchdb.user:robin
-9 verbose url resolving [ 'https://registry.npmjs.org/',
-9 verbose url resolving   './-/user/org.couchdb.user:robin' ]
-10 verbose url resolved https://registry.npmjs.org/-/user/org.couchdb.user:robin
-11 verbose request where is https://registry.npmjs.org/-/user/org.couchdb.user:robin
-12 info trying registry request attempt 1 at 13:08:54
-13 http PUT https://registry.npmjs.org/-/user/org.couchdb.user:robin
-14 http 409 https://registry.npmjs.org/-/user/org.couchdb.user:robin
-15 verbose headers { date: 'Mon, 08 Sep 2014 11:08:54 GMT',
-15 verbose headers   server: 'CouchDB/1.5.0 (Erlang OTP/R14B04)',
-15 verbose headers   'content-type': 'application/json',
-15 verbose headers   'cache-control': 'max-age=60',
-15 verbose headers   'content-length': '58',
-15 verbose headers   'accept-ranges': 'bytes',
-15 verbose headers   via: '1.1 varnish',
-15 verbose headers   'x-served-by': 'cache-lcy1130-LCY',
-15 verbose headers   'x-cache': 'MISS',
-15 verbose headers   'x-cache-hits': '0',
-15 verbose headers   'x-timer': 'S1410174534.365936,VS0,VE156',
-15 verbose headers   'keep-alive': 'timeout=10, max=50',
-15 verbose headers   connection: 'Keep-Alive' }
-16 verbose adduser update existing user
-17 verbose request where is /-/user/org.couchdb.user:robin?write=true
-18 verbose request registry https://registry.npmjs.org/
-19 verbose url raw /-/user/org.couchdb.user:robin?write=true
-20 verbose url resolving [ 'https://registry.npmjs.org/',
-20 verbose url resolving   './-/user/org.couchdb.user:robin?write=true' ]
-21 verbose url resolved https://registry.npmjs.org/-/user/org.couchdb.user:robin?write=true
-22 verbose request where is https://registry.npmjs.org/-/user/org.couchdb.user:robin?write=true
-23 info trying registry request attempt 1 at 13:08:54
-24 http GET https://registry.npmjs.org/-/user/org.couchdb.user:robin?write=true
-25 http 200 https://registry.npmjs.org/-/user/org.couchdb.user:robin?write=true
-26 verbose adduser userobj { name: 'robin',
-26 verbose adduser   password: 'XXXXX',
-26 verbose adduser   email: 'robin.herbots@gmail.com',
-26 verbose adduser   _id: 'org.couchdb.user:robin',
-26 verbose adduser   type: 'user',
-26 verbose adduser   roles: [],
-26 verbose adduser   date: '2014-09-08T11:08:54.200Z' }
-27 verbose request where is /-/user/org.couchdb.user:robin/-rev/6-48987aa7121714e2238543451240efc3
-28 verbose request registry https://registry.npmjs.org/
-29 verbose url raw /-/user/org.couchdb.user:robin/-rev/6-48987aa7121714e2238543451240efc3
-30 verbose url resolving [ 'https://registry.npmjs.org/',
-30 verbose url resolving   './-/user/org.couchdb.user:robin/-rev/6-48987aa7121714e2238543451240efc3' ]
-31 verbose url resolved https://registry.npmjs.org/-/user/org.couchdb.user:robin/-rev/6-48987aa7121714e2238543451240efc3
-32 verbose request where is https://registry.npmjs.org/-/user/org.couchdb.user:robin/-rev/6-48987aa7121714e2238543451240efc3
-33 info trying registry request attempt 1 at 13:08:55
-34 http PUT https://registry.npmjs.org/-/user/org.couchdb.user:robin/-rev/6-48987aa7121714e2238543451240efc3
-35 http 401 https://registry.npmjs.org/-/user/org.couchdb.user:robin/-rev/6-48987aa7121714e2238543451240efc3
-36 verbose headers { date: 'Mon, 08 Sep 2014 11:08:56 GMT',
-36 verbose headers   server: 'CouchDB/1.5.0 (Erlang OTP/R14B04)',
-36 verbose headers   'content-type': 'application/json',
-36 verbose headers   'cache-control': 'max-age=60',
-36 verbose headers   'content-length': '67',
-36 verbose headers   'accept-ranges': 'bytes',
-36 verbose headers   via: '1.1 varnish',
-36 verbose headers   'x-served-by': 'cache-lcy1129-LCY',
-36 verbose headers   'x-cache': 'MISS',
-36 verbose headers   'x-cache-hits': '0',
-36 verbose headers   'x-timer': 'S1410174535.376976,VS0,VE628',
-36 verbose headers   'keep-alive': 'timeout=10, max=50',
-36 verbose headers   connection: 'Keep-Alive' }
-37 verbose adduser back [ [Error: unauthorized Name or password is incorrect.: -/user/org.couchdb.user:robin/-rev/6-48987aa7121714e2238543451240efc3],
-37 verbose adduser   { error: 'unauthorized',
-37 verbose adduser     reason: 'Name or password is incorrect.' },
-37 verbose adduser   '{"error":"unauthorized","reason":"Name or password is incorrect."}' ]
-38 warn adduser Incorrect username or password
-38 warn adduser You can reset your account by visiting:
-38 warn adduser
-38 warn adduser     https://npmjs.org/forgot
-39 error Error: unauthorized Name or password is incorrect.: -/user/org.couchdb.user:robin/-rev/6-48987aa7121714e2238543451240efc3
-39 error     at RegClient.<anonymous> (c:\Program Files\nodejs\node_modules\npm\node_modules\npm-registry-client\lib\request.js:300:14)
-39 error     at Request._callback (c:\Program Files\nodejs\node_modules\npm\node_modules\npm-registry-client\lib\request.js:238:65)
-39 error     at Request.self.callback (c:\Program Files\nodejs\node_modules\npm\node_modules\request\request.js:123:22)
-39 error     at Request.emit (events.js:98:17)
-39 error     at Request.<anonymous> (c:\Program Files\nodejs\node_modules\npm\node_modules\request\request.js:893:14)
-39 error     at Request.emit (events.js:117:20)
-39 error     at IncomingMessage.<anonymous> (c:\Program Files\nodejs\node_modules\npm\node_modules\request\request.js:844:12)
-39 error     at IncomingMessage.emit (events.js:117:20)
-39 error     at _stream_readable.js:938:16
-39 error     at process._tickCallback (node.js:419:13)
-40 error If you need help, you may report this *entire* log,
-40 error including the npm and node versions, at:
-40 error     <http://github.com/npm/npm/issues>
-41 error System Windows_NT 6.2.9200
-42 error command "c:\\Program Files\\nodejs\\node.exe" "c:\\Program Files\\nodejs\\node_modules\\npm\\bin\\npm-cli.js" "adduser"
-43 error cwd C:\Users\roh\Dropbox\Projects\jquery.inputmask
-44 error node -v v0.10.30
-45 error npm -v 1.4.21
-46 verbose exit [ 1, true ]