r107924 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r107923‎ | r107924 | r107925 >
Date:19:21, 3 January 2012
Author:reedy
Status:ok
Tags:
Comment:
Merge r106992, manually merge r107119
Modified paths:
  • /branches/REL1_18/phase3 (modified) (history)
  • /branches/REL1_18/phase3/RELEASE-NOTES-1.18 (modified) (history)
  • /branches/REL1_18/phase3/resources/mediawiki/mediawiki.util.js (modified) (history)

Diff [purge]

Index: branches/REL1_18/phase3/RELEASE-NOTES-1.18
@@ -27,6 +27,8 @@
2828 for backward compatibility.
2929 * (bug 30172) The check for posix_isatty() in maintenance scripts did not detect
3030 when the function exists but is disabled. Introduced Maintenance::posix_isatty().
 31+* (bug 33305) Make mw.util.addCSS resistant to IE's @font-face bug by setting
 32+ cssText after DOM insertion.
3133
3234 == MediaWiki 1.18 ==
3335 2011-11-24
Index: branches/REL1_18/phase3/resources/mediawiki/mediawiki.util.js
@@ -164,12 +164,13 @@
165165 var s = document.createElement( 'style' );
166166 s.type = 'text/css';
167167 s.rel = 'stylesheet';
 168+ // Insert into document before setting cssText (bug 33305)
 169+ document.getElementsByTagName('head')[0].appendChild( s );
168170 if ( s.styleSheet ) {
169171 s.styleSheet.cssText = text; // IE
170172 } else {
171173 s.appendChild( document.createTextNode( text + '' ) ); // Safari sometimes borks on null
172174 }
173 - document.getElementsByTagName('head')[0].appendChild( s );
174175 return s.sheet || s;
175176 },
176177
Property changes on: branches/REL1_18/phase3/resources/mediawiki/mediawiki.util.js
___________________________________________________________________
Modified: svn:mergeinfo
177178 Merged /trunk/phase3/resources/mediawiki/mediawiki.util.js:r106992
Property changes on: branches/REL1_18/phase3
___________________________________________________________________
Modified: svn:mergeinfo
178179 Merged /trunk/phase3:r106992

Follow-up revisions

RevisionCommit summaryAuthorDate
r107957Merge r107913 (merges r105007 from trunk) and r107924 (merges r106992 from tr...reedy22:57, 3 January 2012

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r106992[Core JS] mw.util.addCSS: Insert style tag into dom before setting cssText...krinkle22:08, 21 December 2011
r107119rephrase r106992 release noteskrinkle22:30, 22 December 2011

Status & tagging log