jenkins-bot has submitted this change and it was merged.
Change subject: Better solution to page curation / page patrolling conflict
......................................................................
Better solution to page curation / page patrolling conflict
Change-Id: I3caa7a5bba01a1e10a9db1514961b92996c3dc01
---
M modules/ext.pageTriage.toolbarStartup/ext.pageTriage.toolbarStartup.js
M modules/ext.pageTriage.views.toolbar/ext.pageTriage.toolbarView.js
2 files changed, 5 insertions(+), 3 deletions(-)
Approvals:
Hoo man: Looks good to me, but someone else must approve
Bsitu: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/modules/ext.pageTriage.toolbarStartup/ext.pageTriage.toolbarStartup.js
b/modules/ext.pageTriage.toolbarStartup/ext.pageTriage.toolbarStartup.js
index 9cb7be1..1bf76d4 100644
--- a/modules/ext.pageTriage.toolbarStartup/ext.pageTriage.toolbarStartup.js
+++ b/modules/ext.pageTriage.toolbarStartup/ext.pageTriage.toolbarStartup.js
@@ -6,9 +6,6 @@
return true;
}
- // Remove patrol link
- $( '#mw-content-text .patrollink' ).remove();
-
// Load the curation toolbar
mw.loader.load( 'ext.pageTriage.views.toolbar' );
diff --git a/modules/ext.pageTriage.views.toolbar/ext.pageTriage.toolbarView.js
b/modules/ext.pageTriage.views.toolbar/ext.pageTriage.toolbarView.js
index 59c8d92..1e4fdec 100644
--- a/modules/ext.pageTriage.views.toolbar/ext.pageTriage.toolbarView.js
+++ b/modules/ext.pageTriage.views.toolbar/ext.pageTriage.toolbarView.js
@@ -132,10 +132,12 @@
break;
case
'minimized':
this.minimize();
+ $(
'#mw-content-text .patrollink' ).hide();
break;
case
'maximized':
default:
this.maximize();
+ $(
'#mw-content-text .patrollink' ).hide();
break;
}
}
@@ -155,6 +157,8 @@
if ( $( '#t-curationtoolbar'
).length === 0 ) {
this.insertLink();
}
+ // Show hidden patrol link in
case they want to use that instead
+ $( '#mw-content-text
.patrollink' ).show();
},
minimize: function ( savePref ) {
@@ -256,6 +260,7 @@
var
mwFormat = now.toString( 'yyyyMMddHHmmss' );
$(
'#mwe-pt-toolbar' ).show();
+ $(
'#mw-content-text .patrollink' ).hide();
_this.setToolbarPreference( 'maximized', mwFormat );
}
this.blur();
--
To view, visit https://gerrit.wikimedia.org/r/67872
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3caa7a5bba01a1e10a9db1514961b92996c3dc01
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageTriage
Gerrit-Branch: master
Gerrit-Owner: Kaldari <[email protected]>
Gerrit-Reviewer: Brian Wolff <[email protected]>
Gerrit-Reviewer: Bsitu <[email protected]>
Gerrit-Reviewer: Hoo man <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
