Adding test case, fixing .trigger

bubbapizza · Aug 5, 2011 · c2a15dd · c2a15dd
1 parent 46f4262
commit c2a15dd
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 19 deletions.
diff --git a/Readme.md b/Readme.md
@@ -23,10 +23,7 @@ $('#input').iMask({
 - Numeric Masking
     - Control currency symbol, decimal & thousands seperator, # of digits
 - Events
-    - onFocus
-    - onBlur
     - onValid
     - onInvalid
-    - onKeyDown
 
 The core code for the iMask plugin was originally created for MooTools by Fabio Zendhi Nagao (http://zendold.lojcomm.com.br/imask/)
diff --git a/lib/jquery.imask.js b/lib/jquery.imask.js
@@ -43,12 +43,6 @@
 			validAlphas    : "abcdefghijklmnopqrstuvwxyz",
 			validAlphaNums : "abcdefghijklmnopqrstuvwxyz1234567890",
 
-			onFocus        : function(){},
-			onBlur         : function(){},
-			onValid        : function(){},
-			onInvalid      : function(){},
-			onKeyDown      : function(){},
-
 			groupDigits    : 3,
 			decDigits      : 2,
 			currencySymbol : '',
@@ -138,16 +132,16 @@
 									{this.updSelection(p, chr.toUpperCase());}
 								else
 									{this.updSelection(p, chr);}
-								this.trigger("onValid", [ev, obj], 20);
+								this.node.trigger("valid", ev, this.node);
 								this.selectNext();
 							} else {
-								this.trigger("onInvalid", [ev, obj], 20);
+								this.node.trigger("invalid", ev, this.node);
 							}
 							break;
 					}
 				} else if(this.options.type == "number") {
 					switch(ev.which) {
-						case 8: // backspace
+						case 8:  // backspace
 						case 46: // delete
 							this.popNumber();
 							break;
@@ -158,9 +152,9 @@
 								if(val !== false){
 									this.pushNumber(chr);
 								}
-								this.trigger("onValid", [ev, obj], 20);
+								this.node.trigger("valid", ev, this.node);
 							} else {
-								this.trigger("onInvalid", [ev, obj], 20);
+								this.node.trigger("invalid", ev, this.node);
 							}
 							break;
 					}
@@ -188,11 +182,11 @@
 			this.options.showMask && (this.domNode.value = this.wearMask(this.domNode.value));
 			this.sanityTest(this.domNode.value);
 
-			if(this.options.type == "fixed"){
-				this.selectFirst.bind(this).defer(1);
-			} else {
-				this.setEnd.bind(this).defer(1);
-			}
+			var self = this;
+
+			setTimeout( function(){
+				self[ self.options.type === "fixed" ? 'selectFirst' : 'setEnd' ]();
+			}, 1 );
 		},
 
 		onBlur: function(ev) {

diff --git a/test/test.html b/test/test.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<script type="text/javascript" src="http://code.jquery.com/jquery-1.6.2.min.js"></script>
+	<script type="text/javascript" src="../lib/jquery.imask.js"></script>
+	<script type="text/javascript">
+	$(function(){
+		$('#inp1').iMask({
+			type : 'number'
+		});
+
+		$('#inp2').iMask({
+			  type : 'fixed'
+			, mask : '99/99/99'
+		})
+	});
+	</script>
+
+	<style>
+	label {
+		min-width : 100px;
+		display   : inline-block;
+	}
+	</style>
+
+</head>
+<body>
+	<label>Number: </label><input id="inp1">
+	<br />
+	<label>Date: </label><input id="inp2">
+</body>
+</html>