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

Merge "Close inspectors when surface is focused but selection doesn't change"

Browse source
This commit is contained in:
jenkins-bot 2013-12-03 21:39:23 +00:00 committed by Gerrit Code Review
parent b0b1513ac1 da4995888b
commit bbba628f3c
1 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
modules/ve/ui/ve.ui.Context.js
View file

@ -54,7 +54,8 @@ ve.ui.Context = function VeUiContext( surface, config ) {
'selectionStart': 'onSelectionStart',
'selectionEnd': 'onSelectionEnd',
'relocationStart': 'onRelocationStart',
'relocationEnd': 'onRelocationEnd'
'relocationEnd': 'onRelocationEnd',
'focus': 'onSurfaceFocus'
} );
this.inspectors.connect( this, {
'opening': 'onInspectorOpening',
@ -119,6 +120,27 @@ ve.ui.Context.prototype.afterModelSelect = function () {
this.update();
};
/**
* Respond to focus events on the surfaceView by hiding the context.
*
* If there's an inspector open and the user manages to drop the cursor in the surface such that
* the selection doesn't change (i.e. the resulting model selection is equal to the previous model
* selection), then #onModelSelect won't cause the inspector to be closed, so we do that here.
*
* Hiding the context immediately on focus also avoids flickering phenomena where the inspector
* remains open or the context remains visible in the wrong place while the selection is visually
* already moving somewhere else. We deliberately don't call #update to avoid drawing the context
* in a place that the selection is about to move away from.
*
* We don't have to defer the response to this event because there is no danger that inspectors'
* close handlers will end up invoking this handler again.
*/
ve.ui.Context.prototype.onSurfaceFocus = function () {
if ( this.popup.isVisible() ) {
this.hide();
}
};
/**
* Handle selection start events on the view.
*