diff --git a/UniversalLanguageSelector.hooks.php b/UniversalLanguageSelector.hooks.php index c8e2822a..1aa0adcf 100644 --- a/UniversalLanguageSelector.hooks.php +++ b/UniversalLanguageSelector.hooks.php @@ -295,20 +295,10 @@ class UniversalLanguageSelectorHooks { } public static function onGetPreferences( $user, &$preferences ) { - // The detailed preferences for different layouts. - // Saved as JSON and modifiable through the ULS screens. $preferences['uls-preferences'] = array( 'type' => 'api', ); - // A checkbox in the general MediaWiki preferences screen - // to enable or disable IME in ULS - $preferences['uls-ime-enable'] = array( - 'type' => 'toggle', - 'label-message' => 'uls-ime-enable-preferences-label', - 'section' => 'editing/advancedediting', // under 'Advanced options' section of 'Editing' tab - ); - return true; } diff --git a/UniversalLanguageSelector.i18n.php b/UniversalLanguageSelector.i18n.php index 10907457..ea28f0e8 100644 --- a/UniversalLanguageSelector.i18n.php +++ b/UniversalLanguageSelector.i18n.php @@ -30,7 +30,6 @@ $messages['en'] = array( 'uls-desc' => 'Gives the user several ways to select a language and to adjust language settings', 'uls-plang-title-languages' => 'Languages', - 'uls-ime-enable-preferences-label' => 'Enable input methods', ); /** Message documentation (Message documentation) @@ -43,7 +42,6 @@ $messages['qqq'] = array( 'uls-plang-title-languages' => 'A title for the are in the sidebar in which the interlanguage links are supposed to appear. This title is shown when there are no interlanguage links there, but an icon that enables the ULS is shown. {{Identical|Language}}', - 'uls-ime-enable-preferences-label' => 'Used as a label for the checkbox in {{msg-mw|Preferences}} page.', ); /** Arabic (العربية) diff --git a/UniversalLanguageSelector.php b/UniversalLanguageSelector.php index b63222e5..c68047b5 100644 --- a/UniversalLanguageSelector.php +++ b/UniversalLanguageSelector.php @@ -137,7 +137,6 @@ $wgHooks['UserGetLanguageObject'][] = 'UniversalLanguageSelectorHooks::getLangua $wgHooks['SkinTemplateOutputPageBeforeExec'][] = 'UniversalLanguageSelectorHooks::onSkinTemplateOutputPageBeforeExec'; $wgDefaultUserOptions['uls-preferences'] = ''; -$wgDefaultUserOptions['uls-ime-enable'] = 1; $wgHooks['GetPreferences'][] = 'UniversalLanguageSelectorHooks::onGetPreferences'; $wgExtensionFunctions[] = function() { diff --git a/resources/js/ext.uls.preferences.js b/resources/js/ext.uls.preferences.js index cfefb634..f0cbb5fa 100644 --- a/resources/js/ext.uls.preferences.js +++ b/resources/js/ext.uls.preferences.js @@ -104,7 +104,6 @@ ULSPreferences = function () { this.preferenceName = 'uls-preferences'; - this.imeEnablePreferenceName = 'uls-ime-enable', this.username = mw.user.getName(); this.isAnon = mw.user.isAnon(); this.preferences = null; @@ -116,30 +115,13 @@ * Initialize */ init: function () { - var options, - ulsImeEnable = mw.user.options.get( this.imeEnablePreferenceName ); - if ( this.isAnon ) { this.preferences = $.jStorage.get( this.preferenceName ); } else { - options = mw.user.options.get( this.preferenceName ); + var options = mw.user.options.get( this.preferenceName ); this.preferences = $.parseJSON( options ); - } - this.preferences = this.preferences || {}; - - if ( this.preferences.ime === undefined ) { - this.preferences.ime = {}; - } - - if ( ulsImeEnable === undefined ) { - this.preferences.ime.enable = mw.config.get( 'wgULSIMEEnabled' ); - } else if ( ulsImeEnable === 1 || ulsImeEnable === '1' ) { - this.preferences.ime.enable = true; - } else { - this.preferences.ime.enable = false; - } }, /** @@ -167,9 +149,7 @@ * @param callback */ save: function ( callback ) { - var ulsPreferences = this, - successFunction, - failFunction; + var ulsPreferences = this; callback = callback || $.noop; if ( this.isAnon ) { @@ -178,36 +158,16 @@ callback.call( this, true ); } else { - successFunction = function () { - callback.call( this, true ); - }; - failFunction = function () { - callback.call( this, false ); - }; - // Logged in user. Use MW APIs to change preferences saveOptionsWithToken( { action: 'options', optionname: ulsPreferences.preferenceName, optionvalue: $.toJSON( ulsPreferences.preferences ) - }, - successFunction, - failFunction - ); - - if ( ulsPreferences.preferences.ime !== undefined && - ulsPreferences.preferences.ime.enable !== undefined - ) { - // Logged in user. Use MW APIs to change preferences - saveOptionsWithToken( { - action: 'options', - optionname: ulsPreferences.imeEnablePreferenceName, - optionvalue: ulsPreferences.preferences.ime.enable ? '1' : '' - }, - successFunction, - failFunction - ); - } + }, function () { + callback.call( this, true ); + }, function () { + callback.call( this, false ); + } ); } } };