jenkins-bot has submitted this change and it was merged.
Change subject: Add new 'vehidebetadialog' GET parameter to not show the beta
dialog
......................................................................
Add new 'vehidebetadialog' GET parameter to not show the beta dialog
Mostly for the benefit of the browser tests. Also, clean up this code a bit.
Change-Id: I9c85171ee175dabc232740c5c48ec363db10e98c
---
M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
1 file changed, 7 insertions(+), 15 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
index e78faa3..97581a6 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
@@ -371,9 +371,6 @@
this.restoreEditSection();
this.setupBeforeUnloadHandler();
this.maybeShowDialogs();
- if ( mw.config.get( 'wgVisualEditorConfig' ).showBetaWelcome ) {
- this.showBetaWelcome();
- }
mw.hook( 've.activationComplete' ).fire();
};
@@ -1513,23 +1510,18 @@
*/
ve.init.mw.ViewPageTarget.prototype.maybeShowDialogs = function () {
if ( mw.config.get( 'wgVisualEditorConfig' ).showBetaWelcome ) {
- this.showBetaWelcome();
+ if (
+ !( 'vehidebetadialog' in this.currentUri.query
) &&
+ $.cookie( 've-beta-welcome-dialog' ) === null
+ ) {
+ this.surface.getDialogs().getWindow( 'betaWelcome'
).open();
+ }
+ $.cookie( 've-beta-welcome-dialog', 1, { 'path': '/',
'expires': 30 } );
}
- // FIXME: This doesn't actually return true even if there is a category.
if ( this.surface.getModel().metaList.getItemsInGroup( 'mwRedirect'
).length ) {
this.surface.getDialogs().getWindow( 'meta' ).open( { 'page':
'settings' } );
}
-};
-
-/**
- * Show beta welcome dialog if first load.
- */
-ve.init.mw.ViewPageTarget.prototype.showBetaWelcome = function () {
- if ( $.cookie( 've-beta-welcome-dialog' ) === null ) {
- this.surface.getDialogs().getWindow( 'betaWelcome' ).open();
- }
- $.cookie( 've-beta-welcome-dialog', 1, { 'path': '/', 'expires': 30 } );
};
/**
--
To view, visit https://gerrit.wikimedia.org/r/119217
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9c85171ee175dabc232740c5c48ec363db10e98c
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester <[email protected]>
Gerrit-Reviewer: Cmcmahon <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
