Bartosz Dziewoński has uploaded a new change for review.
https://gerrit.wikimedia.org/r/175925
Change subject: fixup transitions
......................................................................
fixup transitions
Change-Id: Ia150732b608afd036c4adcc6ea8d9afaacd0718a
---
M src/Window.js
1 file changed, 11 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/25/175925/1
diff --git a/src/Window.js b/src/Window.js
index 3ef81f7..7a16e87 100644
--- a/src/Window.js
+++ b/src/Window.js
@@ -310,14 +310,18 @@
OO.ui.Window.prototype.getContentHeight = function () {
// Temporarily resize the frame so getBodyHeight() can use scrollHeight
measurements.
// Disable transitions first, otherwise we'll get values from when the
window was animating.
- var bodyHeight, oldHeight, oldTransition;
- oldTransition = this.$frame[0].style.transition;
- this.$frame[0].style.transition = 'none';
- oldHeight = this.$frame[0].style.height;
- this.$frame[0].style.height = '1px';
+ var bodyHeight, oldHeight, oldTransition,
+ styleObj = this.$frame[0].style;
+ oldTransition = styleObj.transition || styleObj.OTransition ||
styleObj.MsTransition ||
+ styleObj.MozTransition || styleObj.WebkitTransition;
+ styleObj.transition = styleObj.OTransition = styleObj.MsTransition =
+ styleObj.MozTransition = styleObj.WebkitTransition = 'none';
+ oldHeight = styleObj.height;
+ styleObj.height = '1px';
bodyHeight = this.getBodyHeight();
- this.$frame[0].style.height = oldHeight;
- this.$frame[0].style.transition = oldTransition;
+ styleObj.height = oldHeight;
+ styleObj.transition = styleObj.OTransition = styleObj.MsTransition =
+ styleObj.MozTransition = styleObj.WebkitTransition =
oldTransition;
return Math.round(
// Add buffer for border
--
To view, visit https://gerrit.wikimedia.org/r/175925
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia150732b608afd036c4adcc6ea8d9afaacd0718a
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
