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

Merge "mw.ViewPageTarget: Don't handle edt tab clicks from special mouse buttons"

Browse source
This commit is contained in:
jenkins-bot 2013-06-26 21:09:36 +00:00 committed by Gerrit Code Review
parent 3b0d5734fb 39fdb135f8
commit 1a0fe26819
1 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
modules/ve/init/mw/targets/ve.init.mw.ViewPageTarget.js
View file

@ -555,6 +555,13 @@ ve.init.mw.ViewPageTarget.prototype.onNoChanges = function () {
* @param {jQuery.Event} e Mouse click event * @param {jQuery.Event} e Mouse click event
*/ */
ve.init.mw.ViewPageTarget.prototype.onEditTabClick = function ( e ) { ve.init.mw.ViewPageTarget.prototype.onEditTabClick = function ( e ) {
// Default mouse button is normalised by jQuery to key code 1.
// Only do our handling if no keys are pressed, mouse button is 1
// (e.g. not middle click or right click) and no modifier keys
// (e.g. cmd-click to open in new tab).
if ( ( e.which && e.which !== 1 ) || e.shiftKey || e.altKey || e.metaKey ) {
return;
}
this.logEvent( 'Edit', { action: 'edit-link-click' } ); this.logEvent( 'Edit', { action: 'edit-link-click' } );
this.activate(); this.activate();
// Prevent the edit tab's normal behavior // Prevent the edit tab's normal behavior
@ -568,6 +575,9 @@ ve.init.mw.ViewPageTarget.prototype.onEditTabClick = function ( e ) {
* @param {jQuery.Event} e Mouse click event * @param {jQuery.Event} e Mouse click event
*/ */
ve.init.mw.ViewPageTarget.prototype.onEditSectionLinkClick = function ( e ) { ve.init.mw.ViewPageTarget.prototype.onEditSectionLinkClick = function ( e ) {
if ( ( e.which && e.which !== 1 ) || e.shiftKey || e.altKey || e.metaKey ) {
return;
}
this.logEvent( 'Edit', { action: 'section-edit-link-click' } ); this.logEvent( 'Edit', { action: 'section-edit-link-click' } );
this.saveEditSection( $( e.target ).closest( 'h1, h2, h3, h4, h5, h6' ).get( 0 ) ); this.saveEditSection( $( e.target ).closest( 'h1, h2, h3, h4, h5, h6' ).get( 0 ) );
this.activate(); this.activate();
@ -582,6 +592,9 @@ ve.init.mw.ViewPageTarget.prototype.onEditSectionLinkClick = function ( e ) {
* @param {jQuery.Event} e Mouse click event * @param {jQuery.Event} e Mouse click event
*/ */
ve.init.mw.ViewPageTarget.prototype.onViewTabClick = function ( e ) { ve.init.mw.ViewPageTarget.prototype.onViewTabClick = function ( e ) {
if ( ( e.which && e.which !== 1 ) || e.shiftKey || e.altKey || e.metaKey ) {
return;
}
if ( this.active ) { if ( this.active ) {
this.deactivate(); this.deactivate();
// Prevent the edit tab's normal behavior // Prevent the edit tab's normal behavior