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

Merge "Toolbars: Replace $.height with clientHeight/offsetHeight"

Browse source
This commit is contained in:
jenkins-bot 2018-01-23 23:01:37 +00:00 committed by Gerrit Code Review
parent 53cd2346dc 154f49e964
commit f52ee56a02
1 changed files with 4 additions and 2 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

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