Helder.wiki has uploaded a new change for review. https://gerrit.wikimedia.org/r/156010
Change subject: Do not load "ext.wikiEditor.toolbar" if the user disabled
WikiEditor
......................................................................
Do not load "ext.wikiEditor.toolbar" if the user disabled WikiEditor
Change-Id: Iaf19349ceb9a86e6d0fd117d1e3f3c70dbc632fb
---
M modules/page/ext.proofreadpage.page.edit.js
1 file changed, 32 insertions(+), 32 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage
refs/changes/10/156010/1
diff --git a/modules/page/ext.proofreadpage.page.edit.js
b/modules/page/ext.proofreadpage.page.edit.js
index b0b3f25..3addd0c 100644
--- a/modules/page/ext.proofreadpage.page.edit.js
+++ b/modules/page/ext.proofreadpage.page.edit.js
@@ -163,9 +163,7 @@
icon: iconPath +
'Button_multicol.png',
action: {
type: 'callback',
- execute: function() {
- toogleLayout();
- }
+ execute: toogleLayout
}
}
}
@@ -173,38 +171,40 @@
};
var $edit = $( '#wpTextbox1' );
- if( mw.user.options.get( 'usebetatoolbar' ) ) {
- mw.loader.using( 'ext.wikiEditor.toolbar', function() {
- $edit.wikiEditor( 'addToToolbar', {
- sections: {
- 'proofreadpage-tools': {
- type: 'toolbar',
- labelMsg:
'proofreadpage-section-tools',
- groups: tools
+ if( mw.user.options.get( 'showtoolbar' ) == 1 ) {
+ if( mw.user.options.get( 'usebetatoolbar' ) == 1 ) {
+ mw.loader.using( 'ext.wikiEditor.toolbar',
function() {
+ $edit.wikiEditor( 'addToToolbar', {
+ sections: {
+ 'proofreadpage-tools': {
+ type: 'toolbar',
+ labelMsg:
'proofreadpage-section-tools',
+ groups: tools
+ }
}
- }
- } );
- } );
- } else if( mw.user.options.get( 'showtoolbar' ) ) {
- mw.loader.using( 'mediawiki.action.edit', function() {
- var $toolbar = $( '#toolbar' );
-
- $.each( tools, function( group, list ) {
- $.each( list.tools, function( id, def )
{
- $( '<img>' )
- .attr( {
- width: 23,
- height: 22,
- src: def.icon,
- alt: mw.msg(
def.labelMsg ),
- title: mw.msg(
def.labelMsg ),
- 'class':
'mw-toolbar-editbutton' //quotes needed for IE
- } )
- .click(
def.action.execute )
- .appendTo( $toolbar );
} );
} );
- } );
+ } else {
+ mw.loader.using( 'mediawiki.action.edit',
function() {
+ var $toolbar = $( '#toolbar' );
+
+ $.each( tools, function( group, list ) {
+ $.each( list.tools, function(
id, def ) {
+ $( '<img>' )
+ .attr( {
+ width:
23,
+ height:
22,
+ src:
def.icon,
+ alt:
mw.msg( def.labelMsg ),
+ title:
mw.msg( def.labelMsg ),
+
'class': 'mw-toolbar-editbutton' //quotes needed for IE
+ } )
+ .click(
def.action.execute )
+ .appendTo(
$toolbar );
+ } );
+ } );
+ } );
+ }
}
}
--
To view, visit https://gerrit.wikimedia.org/r/156010
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaf19349ceb9a86e6d0fd117d1e3f3c70dbc632fb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Helder.wiki <helder.w...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
