Tpt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/295881
Change subject: Simplifies the retrieval of user options in JavaScript
......................................................................
Simplifies the retrieval of user options in JavaScript
Change-Id: I80c92cc3f680cd4c04d8ec500fcd2329561b65b1
---
M modules/page/ext.proofreadpage.page.edit.js
1 file changed, 16 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage
refs/changes/81/295881/1
diff --git a/modules/page/ext.proofreadpage.page.edit.js
b/modules/page/ext.proofreadpage.page.edit.js
index 7ed555c..874f9e7 100644
--- a/modules/page/ext.proofreadpage.page.edit.js
+++ b/modules/page/ext.proofreadpage.page.edit.js
@@ -20,6 +20,16 @@
$editForm;
/**
+ * Returns the value of a user option as boolean
+ *
+ * @param {string} optionId
+ * @return {boolean}
+ */
+ function getBooleanUserOption( optionId ) {
+ return Number( mw.user.options.get( optionId ) ) === 1;
+ }
+
+ /**
* Show or hide header and footer areas
*
* @param {string} speed string speed of the toggle. May be 'fast',
'slow' or undefined
@@ -80,10 +90,10 @@
* Apply user preferences
*/
function setupPreferences() {
- if ( !mw.user.options.get( 'proofreadpage-showheaders' ) ) {
+ if ( !getBooleanUserOption( 'proofreadpage-showheaders' ) ) {
toggleHeaders();
}
- if ( mw.user.options.get( 'proofreadpage-horizontal-layout' ) )
{
+ if ( getBooleanUserOption( 'proofreadpage-horizontal-layout' )
) {
toggleLayout();
}
}
@@ -177,7 +187,7 @@
},
$edit = $( '#wpTextbox1' );
- if ( mw.user.options.get( 'usebetatoolbar' ) ) {
+ if ( getBooleanUserOption( 'usebetatoolbar' ) ) {
mw.loader.using( 'ext.wikiEditor.toolbar', function () {
$edit.wikiEditor( 'addToToolbar', {
sections: {
@@ -189,7 +199,7 @@
}
} );
} );
- } else if ( mw.user.options.get( 'showtoolbar' ) ) {
+ } else if ( getBooleanUserOption( 'showtoolbar' ) ) {
mw.loader.using( 'mediawiki.toolbar', function () {
$.each( tools, function ( group, list ) {
$.each( list.tools, function ( id, def
) {
@@ -209,7 +219,7 @@
*/
function setupWikiEditor() {
// Ignore "showtoolbar", for consistency with the default
behavior (bug 30795)
- if ( !mw.user.options.get( 'usebetatoolbar' ) ) {
+ if ( !getBooleanUserOption( 'usebetatoolbar' ) ) {
return;
}
mw.loader.using( 'ext.wikiEditor', function () {
@@ -219,7 +229,7 @@
} );
// load the "dialogs" module of WikiEditor if enabled , bug:
72960
- if ( mw.user.options.get( 'usebetatoolbar-cgd' ) ) {
+ if ( getBooleanUserOption( 'usebetatoolbar-cgd' ) ) {
mw.loader.load( 'ext.wikiEditor.dialogs' );
}
// TODO: other modules of WikiEditor may miss, see bug 72960.
--
To view, visit https://gerrit.wikimedia.org/r/295881
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I80c92cc3f680cd4c04d8ec500fcd2329561b65b1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt <thoma...@hotmail.fr>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
