jenkins-bot has submitted this change and it was merged.

Change subject: Followup 3dd1a996: don't try to switch to source mode when 
surface is torn down
......................................................................


Followup 3dd1a996: don't try to switch to source mode when surface is torn down

If you saved a change, then clicked Edit source, you'd get a JS error.

Change-Id: I589f9edb354afcd47d5c42ef9a6c73d49218b044
---
M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
1 file changed, 5 insertions(+), 3 deletions(-)

Approvals:
  Alex Monk: 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 387121e..fe692e2 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
@@ -1112,10 +1112,12 @@
                        .click( this.onViewTabClick.bind( this ) );
 
                $( '#ca-viewsource, #ca-edit' ).click( function ( e ) {
-                       viewPageTarget.editSource();
+                       if ( viewPageTarget.surface && 
!viewPageTarget.deactivating ) {
+                               viewPageTarget.editSource();
 
-                       if ( 
viewPageTarget.surface.getModel().hasBeenModified() ) {
-                               e.preventDefault();
+                               if ( 
viewPageTarget.surface.getModel().hasBeenModified() ) {
+                                       e.preventDefault();
+                               }
                        }
                } );
        }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I589f9edb354afcd47d5c42ef9a6c73d49218b044
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Catrope <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to