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

Merge changes I177877bf,I49a02b5d

Browse source 
* changes:
  Use visibility: hidden; for the ui.Context and its popup
  Followup eb95d7b0b2: don't hide the inspectors WindowSet at all
This commit is contained in:
jenkins-bot 2013-12-02 21:18:55 +00:00 committed by Gerrit Code Review
parent e223156d06 1df63b8a63
commit 5ca96e805f
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -396,15 +396,16 @@ ve.ui.Context.prototype.show = function ( transition, repositionOnly ) {
if ( !this.showing && !this.hiding ) { if ( !this.showing && !this.hiding ) {
this.showing = true; this.showing = true;
this.$element.show(); // HACK: make the context and popup visibility: hidden; instead of display: none; because
// they contain inspector iframes, and applying display: none; to those causes them to
// not load in Firefox
this.$element.css( 'visibility', '' );
this.popup.$element.css( 'visibility', '' );
this.popup.show(); this.popup.show();
// Show either inspector or menu // Show either inspector or menu
if ( inspector ) { if ( inspector ) {
this.$menu.hide(); this.$menu.hide();
// Use visibility instead of .show()/.hide() so Firefox won't refuse to load the iframe
// inside the inspector (bug 57568)
this.inspectors.$element.css( 'visibility', '' );
if ( !repositionOnly ) { if ( !repositionOnly ) {
inspector.$element.css( 'opacity', 0 ); inspector.$element.css( 'opacity', 0 );
} }
@ -415,9 +416,6 @@ ve.ui.Context.prototype.show = function ( transition, repositionOnly ) {
inspector.$element.css( 'opacity', 1 ); inspector.$element.css( 'opacity', 1 );
}, this ), 200 ); }, this ), 200 );
} else { } else {
// Use visibility instead of .show()/.hide() so Firefox won't refuse to load the iframe
// inside the inspector (bug 57568)
this.inspectors.$element.css( 'visibility', 'hidden' );
this.embedded = ( this.embedded = (
focusedNode && focusedNode &&
focusedNode.$focusable.outerHeight() > this.$menu.outerHeight() * 2 && focusedNode.$focusable.outerHeight() > this.$menu.outerHeight() * 2 &&
@ -450,8 +448,12 @@ ve.ui.Context.prototype.hide = function () {
if ( inspector ) { if ( inspector ) {
inspector.close( { 'action': 'hide' } ); inspector.close( { 'action': 'hide' } );
} }
// HACK: make the context and popup visibility: hidden; instead of display: none; because
// they contain inspector iframes, and applying display: none; to those causes them to
// not load in Firefox
this.popup.hide(); this.popup.hide();
this.$element.hide(); this.popup.$element.show().css( 'visibility', 'hidden' );
this.$element.css( 'visibility', 'hidden' );
this.visible = false; this.visible = false;
this.hiding = false; this.hiding = false;
} }