From 1a95664a430814767f4361dd312be26904f02a8e Mon Sep 17 00:00:00 2001
From: Krinkle <krinkle@users.mediawiki.org>
Date: Fri, 19 Nov 2010 00:12:43 +0000
Subject: [PATCH] jquery.placeholder.js rewritten * Instead of calling
 placeholder() and passing the placeholder-text to it (which meant having to
 manage text-messages in javascript as well and calling it for each different
 one), it is now expected that the placeholder-attribute already exists on the
 page generated by PHP. placeholder() is then called on all input-elements
 with that attribute to provide fallback for browsers that don't support it.

---
 resources/jquery/jquery.placeholder.js     | 96 ++++++++++++----------
 resources/mediawiki.util/mediawiki.util.js |  5 ++
 2 files changed, 56 insertions(+), 45 deletions(-)

diff --git a/resources/jquery/jquery.placeholder.js b/resources/jquery/jquery.placeholder.js
index 7390b9e796..825e7adfb0 100644
--- a/resources/jquery/jquery.placeholder.js
+++ b/resources/jquery/jquery.placeholder.js
@@ -4,52 +4,58 @@
  * This will automatically use the HTML5 placeholder attribute if supported, or emulate this behavior if not.
  * 
  * @author Trevor Parscal <tparscal@wikimedia.org>
- * @version 0.1.0
+ * @author Krinkle <krinklemail@gmail.com>
+ * @version 0.2.0
  * @license GPL v2
  */
 
-jQuery.fn.placeholder = function( text ) {
-	// If the HTML5 placeholder attribute is supported, use it
-	if ( 'placeholder' in document.createElement( 'input' ) ) {
-		jQuery(this).attr( 'placeholder', text );
-	}
-	// Otherwise, use a combination of blur and focus event handlers and a placeholder class
-	else {
-		jQuery(this).each( function() {
-			var $input = jQuery(this);
-			$input
-				// Show on blur if empty
-				.bind( 'blur', function() {
-					if ( $input.val().length == 0 ) {
-						$input
-							.val( text )
-							.addClass( 'placeholder' );
-						}
-					} )
-				// Hide on focus
-				.bind( 'focus', function() {
-					if ( $input.hasClass( 'placeholder' ) ) {
-						$input
-							.val( '' )
-							.removeClass( 'placeholder' );
-					}
-				} )
-				// Blank on submit -- prevents submitting with unintended value
-				.parents( 'form' )
-					.bind( 'submit', function() {
-						// $input.trigger( 'focus' ); is problematic
-						// because it actually focuses $input, leading
-						// to nasty behavior in mobile browsers
-						if ( $input.hasClass( 'placeholder' ) ) {
-							$input
-								.val( '' )
-								.removeClass( 'placeholder' );
-						}
-					} );
-			// Show initially, if empty
-			if ( $input.val() == '' ) {
-				$input.trigger( 'blur' );
+jQuery.fn.placeholder = function() {
+
+	return this.each( function() {
+
+		// If the HTML5 placeholder attribute is supported, use it
+		if ( this.placeholder && 'placeholder' in document.createElement( this.tagName ) ) {
+			return;
+		}
+
+		var placeholder = this.getAttribute('placeholder');
+		var $input = jQuery(this);
+
+		// Show initially, if empty
+		if ( this.value === '' || this.value == placeholder ) {
+			$input.addClass( 'placeholder' ).val( placeholder );
+		}
+
+		$input
+			// Show on blur if empty
+			.blur( function() {
+				if ( this.value === '' ) {
+					this.value = placeholder;
+					$input.addClass( 'placeholder' );
+				} else {
+					$input.removeClass( 'placeholder' );
+				}
+			} )
+
+			// Hide on focus
+			.focus( function() {
+				if ($input.hasClass('placeholder')) {
+					this.value = '';
+					$input.removeClass( 'placeholder' );
+				}
+			} );
+
+		// Blank on submit -- prevents submitting with unintended value
+		this.form && $( this.form ).submit( function() {
+			// $input.trigger( 'focus' ); would be problematic
+			// because it actually focuses $input, leading
+			// to nasty behavior in mobile browsers
+			if ( $input.hasClass('placeholder') ) {
+				$input
+					.val( '' )
+					.removeClass( 'placeholder' );
 			}
-		} );
-	}
-};
+		});
+
+	});
+};
\ No newline at end of file
diff --git a/resources/mediawiki.util/mediawiki.util.js b/resources/mediawiki.util/mediawiki.util.js
index 6b39967afe..1d78764b47 100644
--- a/resources/mediawiki.util/mediawiki.util.js
+++ b/resources/mediawiki.util/mediawiki.util.js
@@ -53,6 +53,11 @@
 					// Enable CheckboxShiftClick
 					$('input[type=checkbox]:not(.noshiftselect)').checkboxShiftClick();
 
+					// Emulate placeholder if not supported by browser
+					if ( !'placeholder' in document.createElement( 'input' ) ) {
+						$('input[placeholder]').placeholder();
+					}
+
 					// Fill $content var
 					if ( $('#bodyContent').length ) {
 						mw.util.$content = $('#bodyContent');
-- 
2.20.1