Santhosh has uploaded a new change for review. https://gerrit.wikimedia.org/r/64793
Change subject: Revert "Add a MediaWiki preference for enabling ULS IME" ...................................................................... Revert "Add a MediaWiki preference for enabling ULS IME" This reverts commit 6ae0fe3e449920d91a85486dc55ec3c6252a9d18. Conflicts: UniversalLanguageSelector.i18n.php resources/js/ext.uls.preferences.js Change-Id: I5c97838ed875364dc35b66a3d6c33d9975b5107e --- M UniversalLanguageSelector.hooks.php M UniversalLanguageSelector.i18n.php M UniversalLanguageSelector.php M resources/js/ext.uls.preferences.js 4 files changed, 13 insertions(+), 50 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector refs/changes/93/64793/1 diff --git a/UniversalLanguageSelector.hooks.php b/UniversalLanguageSelector.hooks.php index c8e2822..1aa0adc 100644 --- a/UniversalLanguageSelector.hooks.php +++ b/UniversalLanguageSelector.hooks.php @@ -295,18 +295,8 @@ } 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 1090745..ea28f0e 100644 --- a/UniversalLanguageSelector.i18n.php +++ b/UniversalLanguageSelector.i18n.php @@ -30,7 +30,6 @@ '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 @@ '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 b63222e..c68047b 100644 --- a/UniversalLanguageSelector.php +++ b/UniversalLanguageSelector.php @@ -137,7 +137,6 @@ $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 cfefb63..90dcbc7 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,13 @@ * @param callback */ save: function ( callback ) { +<<<<<<< HEAD var ulsPreferences = this, successFunction, failFunction; +======= + var ulsPreferences = this; +>>>>>>> parent of 6ae0fe3... Add a MediaWiki preference for enabling ULS IME callback = callback || $.noop; if ( this.isAnon ) { @@ -177,6 +163,7 @@ $.jStorage.set( this.preferenceName, this.preferences ); callback.call( this, true ); } else { +<<<<<<< HEAD successFunction = function () { callback.call( this, true ); @@ -185,29 +172,18 @@ callback.call( this, false ); }; +======= +>>>>>>> parent of 6ae0fe3... Add a MediaWiki preference for enabling ULS IME // 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 ); + } ); } } }; -- To view, visit https://gerrit.wikimedia.org/r/64793 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5c97838ed875364dc35b66a3d6c33d9975b5107e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector Gerrit-Branch: master Gerrit-Owner: Santhosh <santhosh.thottin...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits