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

Merge "Remove IE9 workaround"

Browse source
This commit is contained in:
jenkins-bot 2018-02-13 17:37:28 +00:00 committed by Gerrit Code Review
parent e0b7fbe6f8 119e9ef0f6
commit 0c05b46bff
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
View file

@ -254,8 +254,7 @@ ve.init.mw.DesktopArticleTarget.prototype.setupToolbar = function ( surface ) {
} else {
setTimeout( function () {
toolbar.$element
// Avoid $bar[ 0 ].offsetHeight as this returns null in IE9 when $bar is position:fixed
.css( 'height', toolbar.$bar[ 0 ].clientHeight )
.css( 'height', toolbar.$bar[ 0 ].offsetHeight )
.addClass( 've-init-mw-desktopArticleTarget-toolbar-open' );
setTimeout( function () {
// Clear to allow growth during use and when resizing window
@ -1157,8 +1156,7 @@ ve.init.mw.DesktopArticleTarget.prototype.teardownToolbar = function () {
return deferred.resolve().promise();
}
// Avoid $bar[ 0 ].offsetHeight as this returns null in IE9 when $bar is position:fixed
this.toolbar.$element.css( 'height', this.toolbar.$bar[ 0 ].clientHeight );
this.toolbar.$element.css( 'height', this.toolbar.$bar[ 0 ].offsetHeight );
setTimeout( function () {
target.toolbar.$element
.css( 'height', '0' )