merged

ginader · Aug 8, 2012 · c6b2aa0 · c6b2aa0
1 parent 99923ef
commit c6b2aa0
Showing 1 changed file with 2 additions and 10 deletions.
diff --git a/placeholder_polyfill.jquery.js b/placeholder_polyfill.jquery.js
@@ -104,18 +104,10 @@
             var input = $(this),
                 text = input.attr('placeholder'),
                 id = input.attr('id'),
-<<<<<<< HEAD
-                label,placeholder,titleNeeded;
-            label = input.closest('label');
-            input.attr('placeholder','');
-            if(!label.length && !id){
-=======
                 label,placeholder,titleNeeded,polyfilled;
-            label = input.closest('label')[0];
-            //input.attr('placeholder','');
+            label = input.closest('label');
             input.removeAttr('placeholder');
-            if(!label && !id){
->>>>>>> 2.0.2 allow rerun of the placeholder() to cover generated elements - existing polyfilled placeholder will be repositioned. Close #15
+            if(!label.length && !id){
                 log('the input element with the placeholder needs an id!');
                 return;
             }