jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/405940 )
Change subject: Toolbars: Replace $.height with clientHeight/offsetHeight
......................................................................
Toolbars: Replace $.height with clientHeight/offsetHeight
Bug: T185599
Change-Id: I43fbce8f221553e9ae03f8385f39a19de01e8eb7
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
1 file changed, 4 insertions(+), 2 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
index 2b16d96..3f4fddf 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
@@ -256,7 +256,8 @@
} 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 @@
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' )
--
To view, visit https://gerrit.wikimedia.org/r/405940
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I43fbce8f221553e9ae03f8385f39a19de01e8eb7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <esand...@wikimedia.org>
Gerrit-Reviewer: Bartosz Dziewoński <matma....@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
