Don’t do anything on DOMContentLoaded if placeholder is natively supp…

…orted anyway.
Asterodeia · Jun 6, 2011 · 0db4369 · 0db4369
1 parent 0b01340
commit 0db4369
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 23 deletions.
diff --git a/demo.html b/demo.html
@@ -16,7 +16,7 @@
  </head>
  <body>
   <h1>HTML5 Placeholder jQuery Plugin</h1>
-  <p>Check out <a href="http://github.com/mathiasbynens/Placeholder-jQuery-Plugin">the HTML5 Placeholder jQuery Plugin project page on GitHub</a>.</p>
+  <p>Check out <a href="https://github.com/mathiasbynens/Placeholder-jQuery-Plugin">the HTML5 Placeholder jQuery Plugin project page on GitHub</a>.</p>
   <pre><code>$(function() {<br> $('input, textarea').placeholder();<br>});</code></pre>
   <form>
    <p><label><code>type=search</code> <input type="search" name="search" placeholder="Search this site…"></label></p>

diff --git a/jquery.placeholder.js b/jquery.placeholder.js
@@ -1,26 +1,49 @@
 /*!
- * HTML5 Placeholder jQuery Plugin v1.8.2
- * @link http://github.com/mathiasbynens/Placeholder-jQuery-Plugin
+ * HTML5 Placeholder jQuery Plugin v1.8.3
+ * @link http://mths.be/placeholder
  * @author Mathias Bynens <http://mathiasbynens.be/>
  */
 ;(function($) {
 
 	var isInputSupported = 'placeholder' in document.createElement('input'),
 	    isTextareaSupported = 'placeholder' in document.createElement('textarea');
+
 	if (isInputSupported && isTextareaSupported) {
+
 		$.fn.placeholder = function() {
 			return this;
 		};
+
 		$.fn.placeholder.input = $.fn.placeholder.textarea = true;
+
 	} else {
+
 		$.fn.placeholder = function() {
 			return this.filter((isInputSupported ? 'textarea' : ':input') + '[placeholder]')
 				.bind('focus.placeholder', clearPlaceholder)
 				.bind('blur.placeholder', setPlaceholder)
-			.trigger('blur.placeholder').end();
+				.trigger('blur.placeholder').end();
 		};
+
 		$.fn.placeholder.input = isInputSupported;
 		$.fn.placeholder.textarea = isTextareaSupported;
+
+		$(function() {
+			// Look for forms
+			$('form').bind('submit.placeholder', function() {
+				// Clear the placeholder values so they don’t get submitted
+				var $inputs = $('.placeholder', this).each(clearPlaceholder);
+				setTimeout(function() {
+					$inputs.each(setPlaceholder);
+				}, 10);
+			});
+		});
+
+		// Clear placeholder values upon page reload
+		$(window).bind('unload.placeholder', function() {
+			$('.placeholder').val('');
+		});
+
 	}
 
 	function args(elem) {
@@ -78,20 +101,4 @@
 		}
 	}
 
-	$(function() {
-		// Look for forms
-		$('form').bind('submit.placeholder', function() {
-			// Clear the placeholder values so they don’t get submitted
-			var $inputs = $('.placeholder', this).each(clearPlaceholder);
-			setTimeout(function() {
-				$inputs.each(setPlaceholder);
-			}, 10);
-		});
-	});
-
-	// Clear placeholder values upon page reload
-	$(window).bind('unload.placeholder', function() {
-		$('.placeholder').val('');
-	});
-
 }(jQuery));
diff --git a/jquery.placeholder.min.js b/jquery.placeholder.min.js