[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Prevent edit source from acting twice

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

Change subject: Prevent edit source from acting twice
..


Prevent edit source from acting twice

Bug: T148309
Change-Id: I5ef3f4b7cbc7298e89aa531c174657b1d1bccdf6
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js 
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
index 5ff7a63..6e12059 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
@@ -584,7 +584,7 @@
}
if ( active ) {
targetPromise.done( function ( target ) {
-   if ( target.mode === 'source' ) {
+   if ( mode === 'visual' && target.mode 
=== 'source' ) {
target.switchToVisualEditor();
}
} );
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 9e50509..c908104 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
@@ -1076,7 +1076,7 @@
return;
}
 
-   if ( target.getSurface() && !target.deactivating ) {
+   if ( target.getSurface() && !target.deactivating && target.mode 
!== 'source' ) {
target.editSource();
 
if ( target.getSurface().getModel().hasBeenModified() 
|| target.fromEditedState ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5ef3f4b7cbc7298e89aa531c174657b1d1bccdf6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Prevent edit source from acting twice

2016-10-16 Thread Esanders (Code Review) 
Esanders has uploaded a new change for review.

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

Change subject: Prevent edit source from acting twice
..

Prevent edit source from acting twice

Bug: T148309
Change-Id: I5ef3f4b7cbc7298e89aa531c174657b1d1bccdf6
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
2 files changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js 
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
index 5ff7a63..6e12059 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
@@ -584,7 +584,7 @@
}
if ( active ) {
targetPromise.done( function ( target ) {
-   if ( target.mode === 'source' ) {
+   if ( mode === 'visual' && target.mode 
=== 'source' ) {
target.switchToVisualEditor();
}
} );
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 9e50509..c908104 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
@@ -1076,7 +1076,7 @@
return;
}
 
-   if ( target.getSurface() && !target.deactivating ) {
+   if ( target.getSurface() && !target.deactivating && target.mode 
!== 'source' ) {
target.editSource();
 
if ( target.getSurface().getModel().hasBeenModified() 
|| target.fromEditedState ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5ef3f4b7cbc7298e89aa531c174657b1d1bccdf6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 

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