From 449e8f84813150b16c0389efe4299b6ab60e8c12 Mon Sep 17 00:00:00 2001
From: Mal Curtis <mal@sitepoint.com>
Date: Wed, 2 Feb 2011 14:50:25 +1100
Subject: [PATCH 1/4] Updated script tag to point to newly named placeholder js
 file

---
 tests/test.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test.html b/tests/test.html
index 4c54310..ac913c4 100644
--- a/tests/test.html
+++ b/tests/test.html
@@ -6,7 +6,7 @@
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
   <title>Placeholder testing page</title>
   <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.4.3/jquery.min.js"></script>
-  <script src="../src/jquery-placeholder-plugin.js" type="text/javascript"></script>
+  <script src="../src/jquery.placeholder.js" type="text/javascript"></script>
   <script type="text/javascript">
 	  jQuery(document).ready(function($) {
 		$('#test').placeholder();

From 440eab22b24a3502015a26feebc6f2996d391094 Mon Sep 17 00:00:00 2001
From: Mal Curtis <mal@sitepoint.com>
Date: Fri, 15 Mar 2013 10:35:52 +1300
Subject: [PATCH 2/4] Add password field support

---
 src/jquery.placeholder.js | 218 +++++++++++++++++++-------------------
 1 file changed, 108 insertions(+), 110 deletions(-)

diff --git a/src/jquery.placeholder.js b/src/jquery.placeholder.js
index 41f718b..2cbd010 100644
--- a/src/jquery.placeholder.js
+++ b/src/jquery.placeholder.js
@@ -1,116 +1,114 @@
 (function($) {
-	$.extend({
-		placeholder : {
-			settings : {
-				focusClass: 'placeholderFocus',
-				activeClass: 'placeholder',
-				overrideSupport: false,
-				preventRefreshIssues: true
-			},
-			debug : false,
-			log : function(msg){
-				if(!$.placeholder.debug) return;
-				msg = "[Placeholder] " + msg;
-				$.placeholder.hasFirebug ?
-				console.log(msg) :
-				$.placeholder.hasConsoleLog ?
-					window.console.log(msg) :
-					alert(msg);
-			},
-			hasFirebug : "console" in window && "firebug" in window.console,
-			hasConsoleLog: "console" in window && "log" in window.console
-		}
+  $.extend({
+    placeholder: {
+      settings: {
+        focusClass: 'placeholder-focus',
+        activeClass: 'placeholder',
+  		passwordClass: 'placeholder-password',
+        overrideSupport: false,
+        preventRefreshIssues: true
+      },
+      debug: false,
+      log: function(msg) {
+        if (!$.placeholder.debug) return;
+        msg = "[Placeholder] " + msg;
+        $.placeholder.hasFirebug ? console.log(msg) : $.placeholder.hasConsoleLog ? window.console.log(msg) : alert(msg);
+      },
+      hasFirebug: "console" in window && "firebug" in window.console,
+      hasConsoleLog: "console" in window && "log" in window.console
+    }
 
-	});
-
-    // check browser support for placeholder
-    $.support.placeholder = 'placeholder' in document.createElement('input');
-
-	// Replace the val function to never return placeholders
-	$.fn.plVal = $.fn.val;
-	$.fn.val = function(value) {
-		$.placeholder.log('in val');
-		if(this[0]) {
-			$.placeholder.log('have found an element');
-			var el = $(this[0]);
-			if(value != undefined)
-			{
-				$.placeholder.log('in setter');
-				var currentValue = el.plVal();
-				var returnValue = $(this).plVal(value);
-				if(el.hasClass($.placeholder.settings.activeClass) && currentValue == el.attr('placeholder')){
-					el.removeClass($.placeholder.settings.activeClass);
-				}
-				return returnValue;
-			}
+  });
+
+  // check browser support for placeholder
+  $.support.placeholder = 'placeholder' in document.createElement('input');
+
+  // Replace the val function to never return placeholders
+  $.fn.plVal = $.fn.val;
+  $.fn.val = function(value) {
+    $.placeholder.log('in val');
+    if (this[0]) {
+      $.placeholder.log('have found an element');
+      var el = $(this[0]);
+      if (value != undefined) {
+        $.placeholder.log('in setter');
+        var currentValue = el.plVal();
+        var returnValue = $(this).plVal(value);
+		$.placeholder.log("Current: " + currentValue);
+		console.log(returnValue);
+        if (el.hasClass($.placeholder.settings.activeClass) && currentValue == el.attr('placeholder')) {
+          el.removeClass($.placeholder.settings.activeClass);
+        }
+        return returnValue;
+      }
+
+      if (el.hasClass($.placeholder.settings.activeClass) && el.plVal() == el.attr('placeholder')) {
+        $.placeholder.log('returning empty because it\'s a placeholder');
+        return '';
+      } else {
+        $.placeholder.log('returning original val');
+        return el.plVal();
+      }
+    }
+    $.placeholder.log('returning undefined');
+    return undefined;
+  };
+
+  // Clear placeholder values upon page reload
+  $(window).bind('beforeunload.placeholder', function() {
+    var els = $('input.' + $.placeholder.settings.activeClass);
+    if (els.length > 0) els.val('').attr('autocomplete', 'off');
+  });
+
+
+  // plugin code
+  $.fn.placeholder = function(opts) {
+    opts = $.extend({}, $.placeholder.settings, opts);
+
+    // we don't have to do anything if the browser supports placeholder
+    if (!opts.overrideSupport && $.support.placeholder) return this;
 
-			if(el.hasClass($.placeholder.settings.activeClass) && el.plVal() == el.attr('placeholder')) {
-				$.placeholder.log('returning empty because it\'s a placeholder');
-				return '';
-			} else {
-				$.placeholder.log('returning original val');
-				return el.plVal();
+    return this.each(function() {
+      var $el = $(this);
+
+      // skip if we do not have the placeholder attribute
+      if (!$el.is('[placeholder]')) return;
+
+      // Prevent values from being reapplied on refresh
+      if (opts.preventRefreshIssues) $el.attr('autocomplete', 'off');
+
+      $el.bind('focus.placeholder', function() {
+        var $el = $(this);
+        if (this.value == $el.attr('placeholder') && $el.hasClass(opts.activeClass)) $el.val('').removeClass(opts.activeClass).addClass(opts.focusClass);
+		  if ($el.hasClass(opts.passwordClass)){
+			$el.removeClass(opts.passwordClass);
+			$el.attr('type', 'password');
+		  }
+      });
+      $el.bind('blur.placeholder', function() {
+        var $el = $(this);
+		$.placeholder.log("In blur")
+		$.placeholder.log('"' + this.value + '"')
+
+        $el.removeClass(opts.focusClass);
+
+        if (this.value == ''){
+			$.placeholder.log($el.attr('placeholder'))
+			$el.val($el.attr('placeholder')).addClass(opts.activeClass);
+			if ($el.is(':password')){
+				$el.addClass(opts.passwordClass);
+				$el.attr('type', 'text');
 			}
 		}
-		$.placeholder.log('returning undefined');
-		return undefined;
-	};
-
-	// Clear placeholder values upon page reload
-	$(window).bind('beforeunload.placeholder', function() {
-		var els = $('input.' + $.placeholder.settings.activeClass);
-		if(els.length > 0)
-			els.val('').attr('autocomplete','off');
-	});
-
-
-    // plugin code
-	$.fn.placeholder = function(opts) {
-		opts = $.extend({},$.placeholder.settings, opts);
-
-		// we don't have to do anything if the browser supports placeholder
-		if(!opts.overrideSupport && $.support.placeholder)
-		    return this;
-			
-        return this.each(function() {
-            var $el = $(this);
-
-            // skip if we do not have the placeholder attribute
-            if(!$el.is('[placeholder]'))
-                return;
-
-            // we cannot do password fields, but supported browsers can
-            if($el.is(':password'))
-                return;
-			
-			// Prevent values from being reapplied on refresh
-			if(opts.preventRefreshIssues)
-				$el.attr('autocomplete','off');
-
-            $el.bind('focus.placeholder', function(){
-                var $el = $(this);
-                if(this.value == $el.attr('placeholder') && $el.hasClass(opts.activeClass))
-                    $el.val('')
-                       .removeClass(opts.activeClass)
-                       .addClass(opts.focusClass);
-            });
-            $el.bind('blur.placeholder', function(){
-                var $el = $(this);
-				
-				$el.removeClass(opts.focusClass);
-
-                if(this.value == '')
-                  $el.val($el.attr('placeholder'))
-                     .addClass(opts.activeClass);
-            });
-
-            $el.triggerHandler('blur');
-			
-			// Prevent incorrect form values being posted
-			$el.parents('form').submit(function(){
-				$el.triggerHandler('focus.placeholder');
-			});
-
-        });
-    };
+      });
+
+	  setTimeout(function(){ $el.triggerHandler('blur'); }, 100)
+
+      // Prevent incorrect form values being posted
+      $el.parents('form').submit(function() {
+        $el.triggerHandler('focus.placeholder');
+      });
+
+    });
+  };
 })(jQuery);

From c27895e7a87775618e72991ff8393ed4d7206563 Mon Sep 17 00:00:00 2001
From: Mal Curtis <mal@sitepoint.com>
Date: Fri, 15 Mar 2013 10:37:11 +1300
Subject: [PATCH 3/4] Update README.md

---
 README.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/README.md b/README.md
index 3145845..0534d06 100644
--- a/README.md
+++ b/README.md
@@ -10,5 +10,18 @@ Extra attention has been paid to make sure that elements behave correctly when u
 * Programmatically changing a placeholder element with .val('string') will remove the placeholder class
 * With .placeholder({preventRefreshIssues:true}) a placeholder will be assigned autocomplete="off" to prevent browsers from filling an element with the placeholder text on refresh
 
+
+## Usage
+
+```javascript
+$(function(){
+  $('input[placeholder], textarea[placeholder]').placeholder();
+});
+```
+
+Easy.
+
+## Note
+
 Initially forked from https://github.com/andrewrjones/jquery-placeholder-plugin/downloads
 

From b3f60e4257262e165b59dd9072bbbb7601e53a8a Mon Sep 17 00:00:00 2001
From: Mal Curtis <mal@sitepoint.com>
Date: Fri, 15 Mar 2013 11:10:17 +1300
Subject: [PATCH 4/4] IE8 Doesn't like changing input type with jQuery

---
 src/jquery.placeholder.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/jquery.placeholder.js b/src/jquery.placeholder.js
index 2cbd010..59ae413 100644
--- a/src/jquery.placeholder.js
+++ b/src/jquery.placeholder.js
@@ -82,7 +82,8 @@
         if (this.value == $el.attr('placeholder') && $el.hasClass(opts.activeClass)) $el.val('').removeClass(opts.activeClass).addClass(opts.focusClass);
 		  if ($el.hasClass(opts.passwordClass)){
 			$el.removeClass(opts.passwordClass);
-			$el.attr('type', 'password');
+			$el.get().type = 'password';
+
 		  }
       });
       $el.bind('blur.placeholder', function() {
@@ -97,7 +98,8 @@
 			$el.val($el.attr('placeholder')).addClass(opts.activeClass);
 			if ($el.is(':password')){
 				$el.addClass(opts.passwordClass);
-				$el.attr('type', 'text');
+				$el.get().type = 'text';
+
 			}
 		}
       });