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

Merge "Use a sane recursion guard in ve.ui.Context.prototype.hide()"

Browse source
This commit is contained in:
jenkins-bot 2013-10-23 13:49:45 +00:00 committed by Gerrit Code Review
parent 7f7c29cde2 3f5486a43f
commit fad9ae6c50
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -24,6 +24,7 @@ ve.ui.Context = function VeUiContext( surface, config ) {
this.inspectors = {};
this.visible = false;
this.showing = false;
this.hiding = false;
this.selecting = false;
this.relocating = false;
this.embedded = false;
@ -382,16 +383,17 @@ ve.ui.Context.prototype.show = function ( transition, repositionOnly ) {
ve.ui.Context.prototype.hide = function () {
var inspector = this.inspectors.getCurrent();
if ( inspector ) {
// This will recurse, but inspector will be undefined next time
inspector.close( 'hide' );
return this;
// Guard against recursion: closing the inspector causes onInspectorClose to call us again
if ( !this.hiding ) {
this.hiding = true;
if ( inspector ) {
inspector.close( 'hide' );
}
this.popup.hide();
this.$.hide();
this.visible = false;
this.hiding = false;
}
this.popup.hide();
this.$.hide();
this.visible = false;
return this;
};