$(function() {
-	$(document).autoMask();
+	$( document ).autoMask();
 });
 
 //The mask will be 99/99/9999
 <input type="text" data-mask="99/99/9999" />
+
+//The mask will be +99 9999
+<input type="tel" data-mask="+99 9999" />
+
+//The mask will be 99 - 99
+<input type="number" data-mask="99 - 99" />
 

 $(function() {
-	$(document).autoMask({
+	$( document ).autoMask({
 		completed: function() {
 			alert("Alert executed after each mask has been completed");
 		}
diff --git a/spec/AutoMask.Spec.js b/spec/AutoMask.Spec.js
index 4c79311..18524fb 100644
--- a/spec/AutoMask.Spec.js
+++ b/spec/AutoMask.Spec.js
@@ -1,9 +1,10 @@
-(function() {
-	var container, container2;
+(function( $ ) {
+	var container, container2, oldJqueryOn;
 	feature("AutoMask", function() {
 		beforeEach(function() {
 			container1 = $("
").appendTo("body");
 			container2 = $("
").appendTo("body");
+			oldJqueryOn = $.fn.on;
 		});
 		
 		scenario("Valid container", function() {
@@ -95,17 +96,33 @@
 				$input.focus().mashKeys("12").blur();
 			});
 			
-			then("this should be correct", function() {
+			then("'this' should be correct", function() {
 				expect(input1[0]).toBe($input[0]);
 				expect(input2[0]).toBe($input[0]);
 			});
-		})
+		});
+		
+		scenario("Inputs to be handled", function() {
+			
+			$.fn.on = function( eventType, selector ) {
+				then("should handle the inputs type='text', type='tel' and type='number'", function() {
+					expect( selector ).toBe("input[type='text'][data-mask], input[type='tel'][data-mask], input[type='number'][data-mask]");
+				});
+			};
+			
+			when("calling an autoMask", function() {
+				$("#auto-mask-container").autoMask();
+			});
+			
+		});
 		
 		afterEach(function() {
 			container1.remove();
 			container2.remove();
 			container1 = undefined;
 			container2.remove();
+			
+			$.fn.on = oldJqueryOn;
 		});
 	});
-})();
\ No newline at end of file
+})( jQuery );
\ No newline at end of file
diff --git a/src/jquery.maskedinput.js b/src/jquery.maskedinput.js
index 6483bc6..62258a8 100644
--- a/src/jquery.maskedinput.js
+++ b/src/jquery.maskedinput.js
@@ -281,7 +281,12 @@
 		},
 		
 		autoMask: function( options ) {
-			return $(this).on("focus", "input:text[data-mask]", function(e) {
+			
+			function selector( type ) {
+				return "input[type='" + type + "'][data-mask]";
+			}
+			
+			return $(this).on("focus", [ selector("text"), selector("tel"), selector("number") ].join(", "), function(e) {
 				var $input = $(this),
 					dataMask = $input.data("mask");
 				

From 044a3d32e4ad5608b1b73c6a53dbbcf6d8088a88 Mon Sep 17 00:00:00 2001
From: Fagner Brack 
Date: Fri, 19 Oct 2012 11:51:51 -0300
Subject: [PATCH 34/38] Should set the mask for elements with value that
 already exists in the page

---
 README.md                 |  1 +
 spec/AutoMask.Spec.js     | 36 +++++++++++++++++++++++++++++++-----
 src/jquery.maskedinput.js | 12 +++++++++---
 3 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index eca8633..ee292f6 100644
--- a/README.md
+++ b/README.md
@@ -12,6 +12,7 @@ This is a masked input plugin for the jQuery javascript library. It allows a use
 autoMask (jQuery 1.7+)
 --------
 By calling $( selector ).autoMask() once it reads the data-mask attribute and automatically set the specified mask to any input[type='text'], input[type='tel'] or input[type='number'] element inside the selector.  
+By adding new elements with a data-mask attribute and without value autoMask will bind the mask behavior to that element.
 Example:
 
 $(function() {
diff --git a/spec/AutoMask.Spec.js b/spec/AutoMask.Spec.js
index 18524fb..a44f80b 100644
--- a/spec/AutoMask.Spec.js
+++ b/spec/AutoMask.Spec.js
@@ -1,10 +1,17 @@
 (function( $ ) {
-	var container, container2, oldJqueryOn;
+	
+	var container, //one with mask and one without
+		container2, //one with mask
+		container3, //one with mask and value
+		oldJqueryOn, oldMask;
+	
 	feature("AutoMask", function() {
 		beforeEach(function() {
-			container1 = $("
").appendTo("body");
-			container2 = $("
").appendTo("body");
+			container1 = $("
").appendTo( document.body );
+			container2 = $("
").appendTo( document.body );
+			container3 = $("
").appendTo( document.body );
 			oldJqueryOn = $.fn.on;
+			oldMask = $.fn.mask;
 		});
 		
 		scenario("Valid container", function() {
@@ -110,19 +117,38 @@
 				});
 			};
 			
+			$.fn.mask = function() {};
+			
 			when("calling an autoMask", function() {
 				$("#auto-mask-container").autoMask();
 			});
 			
 		});
 		
+		scenario("If an input exists", function() {
+			
+			var $cont = $("#auto-mask-container3");
+			var $input = $cont.find("input");
+			
+			when("calling an autoMask", function() {
+				$cont.autoMask();
+			});
+			
+			then("any input with value and data-mask should be masked", function() {
+				expect( $input.val() ).toBe("9/9");
+			});
+			
+		});
+		
 		afterEach(function() {
 			container1.remove();
 			container2.remove();
-			container1 = undefined;
-			container2.remove();
+			container3.remove();
+			
+			container1 = container2 = container3 = undefined;
 			
 			$.fn.on = oldJqueryOn;
+			$.fn.mask = oldMask;
 		});
 	});
 })( jQuery );
\ No newline at end of file
diff --git a/src/jquery.maskedinput.js b/src/jquery.maskedinput.js
index 62258a8..564ee90 100644
--- a/src/jquery.maskedinput.js
+++ b/src/jquery.maskedinput.js
@@ -282,18 +282,24 @@
 		
 		autoMask: function( options ) {
 			
-			function selector( type ) {
+			var selector = [ getSelector("text"), getSelector("tel"), getSelector("number") ].join(", ");
+			var $context = $( this );
+			
+			function getSelector( type ) {
 				return "input[type='" + type + "'][data-mask]";
 			}
 			
-			return $(this).on("focus", [ selector("text"), selector("tel"), selector("number") ].join(", "), function(e) {
+			function maskIt() {
 				var $input = $(this),
 					dataMask = $input.data("mask");
 				
 				if( dataMask !== undefined && $input.mask() === undefined ) {
 					$input.mask( String(dataMask), options );
 				}
-			});
+			}
+			
+			$context.find( selector ).each( maskIt );
+			return $context.on("focus", selector, maskIt);
 		}
 	});
 })(jQuery);

From 10697d448de438edeefafee7c662b8914f42f018 Mon Sep 17 00:00:00 2001
From: Fagner Brack 
Date: Fri, 19 Oct 2012 12:22:56 -0300
Subject: [PATCH 35/38] clear previous mask event upon execution

---
 spec/AutoMask.Spec.js     | 38 +++++++++++++++++++++++++++++++++++++-
 src/jquery.maskedinput.js |  3 ++-
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/spec/AutoMask.Spec.js b/spec/AutoMask.Spec.js
index a44f80b..054a7b7 100644
--- a/spec/AutoMask.Spec.js
+++ b/spec/AutoMask.Spec.js
@@ -3,7 +3,7 @@
 	var container, //one with mask and one without
 		container2, //one with mask
 		container3, //one with mask and value
-		oldJqueryOn, oldMask;
+		oldJqueryOn, oldJQueryOff, oldMask;
 	
 	feature("AutoMask", function() {
 		beforeEach(function() {
@@ -11,6 +11,7 @@
 			container2 = $("
").appendTo( document.body );
 			container3 = $("
").appendTo( document.body );
 			oldJqueryOn = $.fn.on;
+			oldJQueryOff = $.fn.off;
 			oldMask = $.fn.mask;
 		});
 		
@@ -140,6 +141,40 @@
 			
 		});
 		
+		scenario("autoMask being called twice", function() {
+			
+			var $cont = $("#auto-mask-container3");
+			var countOn = 0;
+			var countOff = 0;
+			
+			$.fn.on = function( eventType, selector ) {
+				if ( eventType === "focus.automask" ) {
+					countOn++;
+				}
+			};
+			
+			$.fn.off = function( eventType, selector ) {
+				if ( eventType === "focus.automask" ) {
+					countOff++;
+				}
+			};
+			
+			$.fn.mask = function() {};
+			
+			when("calling autoMask", function() {
+				$cont.autoMask();
+			});
+			
+			then("on should be called once", function() {
+				expect( countOn++ ).toBe( 1 );
+			});
+			
+			then("off should be called once", function() {
+				expect( countOff++ ).toBe( 1 );
+			});
+			
+		});
+		
 		afterEach(function() {
 			container1.remove();
 			container2.remove();
@@ -148,6 +183,7 @@
 			container1 = container2 = container3 = undefined;
 			
 			$.fn.on = oldJqueryOn;
+			$.fn.off = oldJQueryOff;
 			$.fn.mask = oldMask;
 		});
 	});
diff --git a/src/jquery.maskedinput.js b/src/jquery.maskedinput.js
index 564ee90..a97fac5 100644
--- a/src/jquery.maskedinput.js
+++ b/src/jquery.maskedinput.js
@@ -299,7 +299,8 @@
 			}
 			
 			$context.find( selector ).each( maskIt );
-			return $context.on("focus", selector, maskIt);
+			$context.off("focus.automask");
+			return $context.on("focus.automask", selector, maskIt);
 		}
 	});
 })(jQuery);

From fe1debce5a208e96ebe1021c734827991861434c Mon Sep 17 00:00:00 2001
From: Fagner Brack 
Date: Fri, 19 Oct 2012 12:24:13 -0300
Subject: [PATCH 36/38] line break

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ee292f6..e05d010 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ autoMask (jQuery 1.7+)
 --------
 By calling $( selector ).autoMask() once it reads the data-mask attribute and automatically set the specified mask to any input[type='text'], input[type='tel'] or input[type='number'] element inside the selector.  
 By adding new elements with a data-mask attribute and without value autoMask will bind the mask behavior to that element.
-Example:
+Example:  
 
 $(function() {
 	$( document ).autoMask();

From 047b95c9bee9410c5c02c0f6876be3ead29278d9 Mon Sep 17 00:00:00 2001
From: Fagner Brack 
Date: Fri, 19 Oct 2012 12:25:10 -0300
Subject: [PATCH 37/38] Wrong line...

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index e05d010..9c0919c 100644
--- a/README.md
+++ b/README.md
@@ -12,8 +12,8 @@ This is a masked input plugin for the jQuery javascript library. It allows a use
 autoMask (jQuery 1.7+)
 --------
 By calling $( selector ).autoMask() once it reads the data-mask attribute and automatically set the specified mask to any input[type='text'], input[type='tel'] or input[type='number'] element inside the selector.  
-By adding new elements with a data-mask attribute and without value autoMask will bind the mask behavior to that element.
-Example:  
+By adding new elements with a data-mask attribute and without value autoMask will bind the mask behavior to that element.  
+Example:
 
 $(function() {
 	$( document ).autoMask();

From 643de96a4a17c0c2ea3ef5ea939ae625acd5e704 Mon Sep 17 00:00:00 2001
From: Oleg Lobach 
Date: Wed, 5 Dec 2012 23:53:38 +0400
Subject: [PATCH 38/38] Fixed link to old version of jQuery lib on demo pages

---
 demo/datepicker.html | 2 +-
 demo/index.html      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/demo/datepicker.html b/demo/datepicker.html
index 0b7ce77..39d4817 100644
--- a/demo/datepicker.html
+++ b/demo/datepicker.html
@@ -1,7 +1,7 @@
 
 
 
-
+
 
 
 	
diff --git a/demo/index.html b/demo/index.html
index c371c75..8197061 100644
--- a/demo/index.html
+++ b/demo/index.html
@@ -1,7 +1,7 @@
 
 
 
-
+
 
 
     $(function() {