[MediaWiki-commits] [Gerrit] Suppress meta dialog on refresh pages if we want to show SET... - change (mediawiki...VisualEditor)

2016-03-15 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Suppress meta dialog on refresh pages if we want to show SET 
dialog
..


Suppress meta dialog on refresh pages if we want to show SET dialog

Bug: T129819
Change-Id: I1176d06e5a5f56f01528acd7d099c8be9d317e51
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
1 file changed, 4 insertions(+), 4 deletions(-)

Approvals:
  Jforrester: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js 
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
index fa05593..d1c754e 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
@@ -44,7 +44,7 @@
this.checkboxFields = null;
this.checkboxesByName = null;
this.$otherFields = null;
-   this.suppressWelcomeDialog = false;
+   this.suppressNormalStartupDialogs = false;
 
// If this is true then #transformPage / #restorePage will not call 
pushState
// This is to avoid adding a new history entry for the url we just got 
from onpopstate
@@ -285,7 +285,7 @@
} else {
new mw.Api().saveOption( 
'visualeditor-hidebetawelcome', '1' );
}
-   this.suppressWelcomeDialog = true;
+   this.suppressNormalStartupDialogs = true;
}
 
data = response ? response.visualeditor : {};
@@ -651,10 +651,10 @@
ve.init.mw.DesktopArticleTarget.super.prototype.surfaceReady.apply( 
this, arguments );
 
this.setupUnloadHandlers();
-   if ( !this.suppressWelcomeDialog ) {
+   if ( !this.suppressNormalStartupDialogs ) {
this.maybeShowWelcomeDialog();
+   this.maybeShowMetaDialog();
}
-   this.maybeShowMetaDialog();
 
this.activatingDeferred.resolve();
this.events.trackActivationComplete();

-- 
To view, visit https://gerrit.wikimedia.org/r/277438
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I1176d06e5a5f56f01528acd7d099c8be9d317e51
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Suppress meta dialog on refresh pages if we want to show SET... - change (mediawiki...VisualEditor)

2016-03-14 Thread Alex Monk (Code Review) 
Alex Monk has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/277438

Change subject: Suppress meta dialog on refresh pages if we want to show SET 
dialog
..

Suppress meta dialog on refresh pages if we want to show SET dialog

Bug: T129819
Change-Id: I1176d06e5a5f56f01528acd7d099c8be9d317e51
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
1 file changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/38/277438/1

diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js 
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
index a96c852..16109d0 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
@@ -44,7 +44,7 @@
this.checkboxFields = null;
this.checkboxesByName = null;
this.$otherFields = null;
-   this.suppressWelcomeDialog = false;
+   this.suppressNormalStartupDialogs = false;
 
// If this is true then #transformPage / #restorePage will not call 
pushState
// This is to avoid adding a new history entry for the url we just got 
from onpopstate
@@ -285,7 +285,7 @@
} else {
new mw.Api().saveOption( 
'visualeditor-hidebetawelcome', '1' );
}
-   this.suppressWelcomeDialog = true;
+   this.suppressNormalStartupDialogs = true;
}
 
data = response ? response.visualeditor : {};
@@ -656,10 +656,10 @@
ve.init.mw.DesktopArticleTarget.super.prototype.surfaceReady.apply( 
this, arguments );
 
this.setupUnloadHandlers();
-   if ( !this.suppressWelcomeDialog ) {
+   if ( !this.suppressNormalStartupDialogs ) {
this.maybeShowWelcomeDialog();
+   this.maybeShowMetaDialog();
}
-   this.maybeShowMetaDialog();
 
this.activatingDeferred.resolve();
this.events.trackActivationComplete();

-- 
To view, visit https://gerrit.wikimedia.org/r/277438
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1176d06e5a5f56f01528acd7d099c8be9d317e51
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits