jenkins-bot has submitted this change and it was merged.
Change subject: Don't clobber existing styles when adding more in IE9
......................................................................
Don't clobber existing styles when adding more in IE9
Follow-up to c2e8f505c12ace6af42161bf9930d483b1721f2e. This was really
stupid and I feel stupid.
Bug: T114323
Change-Id: I80292083d8fd50c2e2727446e4468b6a13ad40e5
(cherry picked from commit b54ef9d1a05d683ca507067b8c23e5fe195b7b19)
---
M resources/src/mediawiki/mediawiki.js
1 file changed, 4 insertions(+), 2 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/src/mediawiki/mediawiki.js
b/resources/src/mediawiki/mediawiki.js
index 9ec70b5..9436dbf 100644
--- a/resources/src/mediawiki/mediawiki.js
+++ b/resources/src/mediawiki/mediawiki.js
@@ -863,7 +863,7 @@
* @param {Function} [callback]
*/
function addEmbeddedCSS( cssText, callback ) {
- var $style, styleEl;
+ var $style, styleEl, newCssText;
function fireCallbacks() {
var oldCallbacks = cssCallbacks;
@@ -936,7 +936,9 @@
// write,
dropping @media queries from the CSS text. If we read it and used its
// value, we
would accidentally apply @media-specific styles to all media. (T108727)
if (
document.documentMode === 9 ) {
-
styleEl.styleSheet.cssText = $style.data( 'ResourceLoaderDynamicStyleTag' ) +
cssText;
+
newCssText = $style.data( 'ResourceLoaderDynamicStyleTag' ) + cssText;
+
styleEl.styleSheet.cssText = newCssText;
+
$style.data( 'ResourceLoaderDynamicStyleTag', newCssText );
} else {
styleEl.styleSheet.cssText += cssText;
}
--
To view, visit https://gerrit.wikimedia.org/r/243192
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I80292083d8fd50c2e2727446e4468b6a13ad40e5
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_26
Gerrit-Owner: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Edokter <[email protected]>
Gerrit-Reviewer: Jack Phoenix <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
