mirror of
https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor
synced 2024-11-29 08:34:54 +00:00
Merge "Prevent scrolling in top-level window while dialog is open"
This commit is contained in:
commit
991f61a451
|
@ -22,6 +22,8 @@ ve.ui.Dialog = function VeUiDialog( surface, config ) {
|
||||||
|
|
||||||
// Properties
|
// Properties
|
||||||
this.visible = false;
|
this.visible = false;
|
||||||
|
this.onWindowMouseWheelHandler = ve.bind( this.onWindowMouseWheel, this );
|
||||||
|
this.onDocumentKeyDownHandler = ve.bind( this.onDocumentKeyDown, this );
|
||||||
|
|
||||||
// Initialization
|
// Initialization
|
||||||
this.$.addClass( 've-ui-dialog' );
|
this.$.addClass( 've-ui-dialog' );
|
||||||
|
@ -52,11 +54,58 @@ ve.ui.Dialog.prototype.onApplyButtonClick = function () {
|
||||||
this.close( 'apply' );
|
this.close( 'apply' );
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handle window mouse wheel events.
|
||||||
|
*
|
||||||
|
* @method
|
||||||
|
* @param {jQuery.Event} e Mouse wheel event
|
||||||
|
*/
|
||||||
|
ve.ui.Dialog.prototype.onWindowMouseWheel = function () {
|
||||||
|
return false;
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handle document key down events.
|
||||||
|
*
|
||||||
|
* @method
|
||||||
|
* @param {jQuery.Event} e Key down event
|
||||||
|
*/
|
||||||
|
ve.ui.Dialog.prototype.onDocumentKeyDown = function ( e ) {
|
||||||
|
switch ( e.which ) {
|
||||||
|
case ve.Keys.PAGEUP:
|
||||||
|
case ve.Keys.PAGEDOWN:
|
||||||
|
case ve.Keys.END:
|
||||||
|
case ve.Keys.HOME:
|
||||||
|
case ve.Keys.LEFT:
|
||||||
|
case ve.Keys.UP:
|
||||||
|
case ve.Keys.RIGHT:
|
||||||
|
case ve.Keys.DOWN:
|
||||||
|
// Prevent any key events that might cause scrolling
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Open window.
|
||||||
|
*
|
||||||
|
* Wraps the parent open method. Disables native top-level window scrolling behavior.
|
||||||
|
*
|
||||||
|
* @method
|
||||||
|
* @emits setup
|
||||||
|
* @emits open
|
||||||
|
*/
|
||||||
|
ve.ui.Dialog.prototype.open = function () {
|
||||||
|
ve.ui.Window.prototype.open.call( this );
|
||||||
|
// Prevent scrolling in top-level window
|
||||||
|
$( window ).on( 'mousewheel', this.onWindowMouseWheelHandler );
|
||||||
|
$( document ).on( 'keydown', this.onDocumentKeyDownHandler );
|
||||||
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Close dialog.
|
* Close dialog.
|
||||||
*
|
*
|
||||||
* This method overrides the parent close method to allow animation, but still provides the same
|
* Wraps the parent close method. Allows animation by delaying parent close call, while still
|
||||||
* recursion blocking and eventually calls the parent method.
|
* providing the same recursion blocking. Restores native top-level window scrolling behavior.
|
||||||
*
|
*
|
||||||
* @method
|
* @method
|
||||||
* @param {boolean} action Action that caused the window to be closed
|
* @param {boolean} action Action that caused the window to be closed
|
||||||
|
@ -69,6 +118,9 @@ ve.ui.Dialog.prototype.close = function ( action ) {
|
||||||
ve.ui.Window.prototype.close.call( this, action );
|
ve.ui.Window.prototype.close.call( this, action );
|
||||||
this.$.removeClass( 've-ui-dialog-closing' );
|
this.$.removeClass( 've-ui-dialog-closing' );
|
||||||
}, this ), 250 );
|
}, this ), 250 );
|
||||||
|
// Allow scrolling in top-level window
|
||||||
|
$( window ).off( 'mousewheel', this.onWindowMouseWheelHandler );
|
||||||
|
$( document ).off( 'keydown', this.onDocumentKeyDownHandler );
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue