bryce/mediawiki-extensions-UniversalLanguageSelector
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Load jquery.ime only when user focus on editable fields"

Browse Source 
This reverts commit 63d547915f.

Bug: 52115
Change-Id: I1d6b65622e8a103a8a892beacf268e77b9e1b2d0
This commit is contained in:
Amir E. Aharoni
2013-07-27 00:55:17 +03:00
parent cdfb260148
commit 56dd512725
3 changed files with 26 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
resources/js/ext.uls.ime.js
View File

@@ -19,7 +19,7 @@
( function ( $, mw, document, undefined ) {
'use strict';
var mwImeRulesPath, inputSelector, inputPreferences, ulsIMEPreferences, customHelpLink;
var mwImeRulesPath, inputSelector, inputPreferences;
mwImeRulesPath = mw.config.get( 'wgExtensionAssetsPath' ) +
'/UniversalLanguageSelector/lib/jquery.ime/';
@@ -57,7 +57,8 @@
return unique.slice( 0, 6 );
};
ulsIMEPreferences = {
// Extend the ime preference system
$.extend( $.ime.preferences, {
save: function ( callback ) {
if ( !this.registry.isDirty ) {
@@ -101,10 +102,15 @@
getDefaultLanguage: function () {
return mw.config.get( 'wgContentLanguage' );
}
};
} );
// Add a 'more setttings' link that takes to input settings of ULS
customHelpLink = function () {
// MediaWiki specific overrides for jquery.ime
$.extend( $.ime.defaults, {
imePath: mwImeRulesPath
} );
// Add a 'more settings' link that takes to input settings of ULS
$.fn.imeselector.Constructor.prototype.helpLink = function () {
var $disableInputToolsLink, $moreSettingsLink,
imeselector = this;
@@ -167,40 +173,19 @@
$( inputSelector ).trigger( 'destroy.ime' );
};
mw.ime.init = function () {
// Extend the ime preference system
$.extend( $.ime.preferences, ulsIMEPreferences );
// MediaWiki specific overrides for jquery.ime
$.extend( $.ime.defaults, {
imePath: mwImeRulesPath
} );
// Load the ime preferences
$.ime.preferences.load();
$.fn.imeselector.Constructor.prototype.helpLink = customHelpLink;
};
mw.ime.setup = function () {
if ( $.ime ) {
mw.ime.init();
}
$( 'body' ).on( 'focus.ime', inputSelector, function () {
var imeselector, $input, noImeSelector;
$input = $( this );
if ( !$.ime ) {
mw.loader.using( 'jquery.ime', function () {
mw.ime.init();
$input.trigger( 'focus.ime' );
} );
return;
}
// It's possible to disable IME through the settings
// panels before it was initialized, so we need to check
// that it's supposed to be initialized
if ( !$.ime.preferences.isEnabled() ) {
return;
}
$input = $( this );
noImeSelector = mw.config.get( 'wgULSNoImeSelectors' ).join( ', ' );
if ( noImeSelector.length && $input.is( noImeSelector ) ) {
@@ -253,7 +238,12 @@
$( document ).ready( function () {
mw.uls.init( function () {
mw.ime.setup();
// Load the ime preferences
$.ime.preferences.load();
if ( $.ime.preferences.isEnabled() ) {
mw.ime.setup();
}
} );
} );