Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/80337
Change subject: Use mw.hook for notifying cancel of settings window to modules
......................................................................
Use mw.hook for notifying cancel of settings window to modules
This avoids mandate of having 'cancel' method defined in settings module.
Also avoids looping of all modules while cancel is happening.
Change-Id: I87d0975f2ef1bdee61f71d66eabe3040b81876b8
---
M resources/js/ext.uls.displaysettings.js
M resources/js/ext.uls.inputsettings.js
M resources/js/ext.uls.languagesettings.js
3 files changed, 7 insertions(+), 9 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector
refs/changes/37/80337/1
diff --git a/resources/js/ext.uls.displaysettings.js
b/resources/js/ext.uls.displaysettings.js
index 2be98e2..8023b58 100644
--- a/resources/js/ext.uls.displaysettings.js
+++ b/resources/js/ext.uls.displaysettings.js
@@ -549,6 +549,8 @@
$button.addClass( 'down' );
} );
+
+ mw.hook( 'mw.uls.settings.cancel' ).add( $.proxy(
this.cancel, this ) );
},
/**
diff --git a/resources/js/ext.uls.inputsettings.js
b/resources/js/ext.uls.inputsettings.js
index 58eff10..5afedae 100644
--- a/resources/js/ext.uls.inputsettings.js
+++ b/resources/js/ext.uls.inputsettings.js
@@ -474,6 +474,8 @@
inputSettings.enableInputTools();
}
} );
+
+ mw.hook( 'mw.uls.settings.cancel' ).add( $.proxy(
this.cancel, this ) );
},
/**
diff --git a/resources/js/ext.uls.languagesettings.js
b/resources/js/ext.uls.languagesettings.js
index dbc26b4..b921fe2 100644
--- a/resources/js/ext.uls.languagesettings.js
+++ b/resources/js/ext.uls.languagesettings.js
@@ -17,7 +17,7 @@
* @licence MIT License
*/
-( function ( $ ) {
+( function ( $, mw ) {
'use strict';
var closeRow, settingsMenu, settingsPanel, windowTemplate, panelsRow;
@@ -217,13 +217,7 @@
this.options.onClose();
}
- // We are closing language settings. That also means we
are cancelling
- // any changes the user did, but not saved, in all
registered modules.
- $.each( this.modules, function( id, module ) {
- // Modules should make sure to return early if
no changes were made
- // They can use some kind of 'dirty bits' to
implement this.
- module.cancel();
- } );
+ mw.hook( 'mw.uls.settings.cancel' ).fire();
},
click: function ( e ) {
@@ -265,4 +259,4 @@
};
$.fn.languagesettings.Constructor = LanguageSettings;
-}( jQuery ) );
+}( jQuery, mediaWiki ) );
--
To view, visit https://gerrit.wikimedia.org/r/80337
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I87d0975f2ef1bdee61f71d66eabe3040b81876b8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Santhosh <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
