merge in changes from other fork

evanubiera · Mar 18, 2010 · 65679e2 · 65679e2
2 parents 3403b1d + 6160ca6
commit 65679e2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/jquery.html5-placeholder-shim.js b/jquery.html5-placeholder-shim.js
@@ -30,8 +30,11 @@
 				};
 			}
 			return this.each(function() {
-				if( $(this).data('placeholder') )
+				if( $(this).data('placeholder') ) {
+					var $ol = $(this).data('placeholder');
+					$ol.css(calcPositionCss($(this)));
 					return true;
+				}
 
 				var ol = $('<label />')
 					.text($(this).attr('placeholder'))
@@ -49,11 +52,12 @@
 						lineHeight: $(this).css('height')
 					})
 					.css(calcPositionCss(this))
+					.attr('for', this.id)
 					.data('target',$(this))
 					.click(function(){
 						$(this).data('target').focus()
 					})
-					.insertAfter(this);
+					.insertBefore(this);
 				$(this)
 					.data('placeholder',ol)
 					.focus(function(){

diff --git a/test.html b/test.html
@@ -51,7 +51,7 @@
 	zoom:1;
 }
 </style>
-<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.js"></script>
+<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4/jquery.js"></script>
 <script src="jquery.html5-placeholder-shim.js"></script>
 <!-- <script type='text/javascript' src='http://getfirebug.com/releases/lite/1.2/firebug-lite-compressed.js'></script> -->
 
@@ -66,13 +66,14 @@
 
 		<h2>Basic Examples</h2>
 		<a href="#" onclick="$('#cont').toggle();return false;">hide form</a>
+		<a href="#" onclick="$('#medium').toggle();$.placeholder.shim();return false;">hide medium row</a>
 		<div id="cont" >
 			<div>
 				<label>small</label>
 				<input type="text" placeholder="placeholder" class="small" />
 				<input type="text" placeholder="placeholder" value="value" class="small" />
 			</div>	
-			<div>	
+			<div id="medium">
 				<label>medium</label>
 				<input type="text" placeholder="placeholder" class="medium" />
 				<input type="text" placeholder="placeholder" value="value" class="medium" />