Merge "registration: Only allow one extension to set a specific config setting"

[lhc/web/wiklou.git] / resources / src / mediawiki.special / mediawiki.special.preferences.timezone.js

diff --git a/resources/src/mediawiki.special/mediawiki.special.preferences.timezone.js b/resources/src/mediawiki.special/mediawiki.special.preferences.timezone.js
index 58a5f84..03656ee 100644 (file)
--- a/resources/src/mediawiki.special/mediawiki.special.preferences.timezone.js
+++ b/resources/src/mediawiki.special/mediawiki.special.preferences.timezone.js
@@ -61,16 +61,10 @@
                                        minuteDiff = -( new Date().getTimezoneOffset() );
                                        $tzTextbox.val( minutesToHours( minuteDiff ) );
                                        $tzSelect.val( 'other' );
-                                       $tzTextbox.prop( 'disabled', false );
                                } else {
                                        // Grab data from the $tzSelect value
                                        minuteDiff = parseInt( type.split( '|' )[ 1 ], 10 ) || 0;
-                                       $tzTextbox.val( minutesToHours( minuteDiff ) );
                                }
-
-                               // Set defaultValue prop on the generated box so we don't trigger the
-                               // unsaved preferences check
-                               $tzTextbox.prop( 'defaultValue', $tzTextbox.val() );
                        }
 
                        // Determine local time from server time and minutes difference, for display.