wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-11-24 06:24:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "DesktopArticleTarget: view click handler should only run for active target"

Browse source
This commit is contained in:
jenkins-bot 2018-06-19 18:54:47 +00:00 committed by Gerrit Code Review
parent ec4c28cc1a 814e26f1e9
commit aa882f752f
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
View file

@ -931,7 +931,7 @@ ve.init.mw.DesktopArticleTarget.prototype.onDocumentKeyDown = function ( e ) {
* @param {jQuery.Event} e Mouse click event
*/
ve.init.mw.DesktopArticleTarget.prototype.onViewTabClick = function ( e ) {
if ( !ve.isUnmodifiedLeftClick( e ) ) {
if ( ( !this.active && !this.activating ) || !ve.isUnmodifiedLeftClick( e ) ) {
return;
}
this.tryTeardown( false, 'navigate-read' );
@ -1104,11 +1104,11 @@ ve.init.mw.DesktopArticleTarget.prototype.setupSkinTabs = function () {
}
// Allow instant switching back to view mode, without refresh
$( '#ca-view a, #ca-nstab-' + namespaceKey + ' a' )
.on( 'click', this.onViewTabClick.bind( this ) );
.on( 'click.ve-target', this.onViewTabClick.bind( this ) );
}
if ( !mw.libs.ve.isSingleEditTab ) {
$( '#ca-viewsource, #ca-edit' ).on( 'click', function ( e ) {
$( '#ca-viewsource, #ca-edit' ).on( 'click.ve-target', function ( e ) {
if ( !target.active || !ve.isUnmodifiedLeftClick( e ) ) {
return;
}