Browse Source

Merge branch '2.x' into 2.6

Robin Herbots 11 years ago
parent
commit
d0cb103785
3 changed files with 8 additions and 5 deletions
  1. 1 1
      build.properties
  2. 1 1
      jquery.inputmask.jquery.json
  3. 6 3
      js/jquery.inputmask.js

+ 1 - 1
build.properties

@@ -7,7 +7,7 @@ distdir = dist
 
 build.major = 2
 build.minor = 5
-build.revision = 7
+build.revision = 8
 
 target = jquery.inputmask.bundle.js
 target.min = jquery.inputmask.bundle.min.js

+ 1 - 1
jquery.inputmask.jquery.json

@@ -8,7 +8,7 @@
 		"inputmask",
 		"mask"
     ],
-    "version": "2.5.7",
+    "version": "2.5.8",
     "author": {
         "name": "Robin Herbots",
         "url": "http://github.com/RobinHerbots/jquery.inputmask"

+ 6 - 3
js/jquery.inputmask.js

@@ -1416,9 +1416,12 @@
                     case "hasMaskedValue": //check wheter the returned value is masked or not; currently only works reliable when using jquery.val fn to retrieve the value 
                         return this.data('_inputmask') ? !this.data('_inputmask')['opts'].autoUnmask : false;
                     case "isComplete":
-                        maskset = this.data('_inputmask')['maskset'];
-                        opts = this.data('_inputmask')['opts'];
-                        return maskScope(maskset, opts, { "action": "isComplete", "buffer": this[0]._valueGet().split('') });
+                        if (this.data('_inputmask')) {
+                            maskset = this.data('_inputmask')['maskset'];
+                            opts = this.data('_inputmask')['opts'];
+                            return maskScope(maskset, opts, { "action": "isComplete", "buffer": this[0]._valueGet().split('') });
+			}
+			else return true;
                     case "getmetadata": //return mask metadata if exists
                         if (this.data('_inputmask')) {
                             maskset = this.data('_inputmask')['maskset'];