Merge r83152 from 1.17wmf1 to trunk

diff --git a/resources/jquery/jquery.placeholder.js b/resources/jquery/jquery.placeholder.js
index d4c00e5..1445738 100644 (file)
--- a/resources/jquery/jquery.placeholder.js
+++ b/resources/jquery/jquery.placeholder.js
@@ -33,8 +33,6 @@ $.fn.placeholder = function() {
                                if ( this.value === '' ) {
                                        this.value = placeholder;
                                        $input.addClass( 'placeholder' );
-                               } else {
-                                       $input.removeClass( 'placeholder' );
                                }
                        } )
 
@@ -62,4 +60,4 @@ $.fn.placeholder = function() {
 
        });
 };
-} )( jQuery );
\ No newline at end of file
+} )( jQuery );