diff options
| author | James D. Forrester <jforrester@wikimedia.org> | 2014-09-05 17:15:09 -0700 |
|---|---|---|
| committer | James D. Forrester <jforrester@wikimedia.org> | 2014-09-05 17:15:14 -0700 |
| commit | 15c8a389aaca318efbadd4d9141f993ac9458db6 (patch) | |
| tree | c2de3562e7a0e2fd208bee967f2cb8ebb10ce6c9 /resources/lib/oojs-ui/oojs-ui.js | |
| parent | d4946749802651dac9f4f14ab053ba7d74d5edc4 (diff) | |
| download | mediawikicore-15c8a389aaca318efbadd4d9141f993ac9458db6.tar.gz mediawikicore-15c8a389aaca318efbadd4d9141f993ac9458db6.zip | |
Update OOjs UI to v0.1.0-pre (72f047e5d8)
New changes:
72f047e Followup 67f83f1: fall back to empty string to avoid 'undefined'
Change-Id: Ieb49700a48e2a2c7b00fec551e96ed7830dc3f01
Diffstat (limited to 'resources/lib/oojs-ui/oojs-ui.js')
| -rw-r--r-- | resources/lib/oojs-ui/oojs-ui.js | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/resources/lib/oojs-ui/oojs-ui.js b/resources/lib/oojs-ui/oojs-ui.js index 068c8facd7bf..41b6fabb14aa 100644 --- a/resources/lib/oojs-ui/oojs-ui.js +++ b/resources/lib/oojs-ui/oojs-ui.js @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (8ad150e4e7) + * OOjs UI v0.1.0-pre (72f047e5d8) * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2014 OOjs Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2014-09-05T21:30:32Z + * Date: 2014-09-06T00:15:06Z */ ( function ( OO ) { @@ -1384,8 +1384,9 @@ OO.ui.Window.static.transplantStyles = function ( parentDoc, frameDoc, timeout ) styleText = '@import url(' + styleNode.href + ');'; } else { // Internal stylesheet; just copy the text - // For IE10 we need to fall back to .cssText - styleText = styleNode.textContent || parentDoc.styleSheets[i].cssText; + // For IE10 we need to fall back to .cssText, BUT that's undefined in + // other browsers, so fall back to '' rather than 'undefined' + styleText = styleNode.textContent || parentDoc.styleSheets[i].cssText || ''; } // Create a node with a unique ID that we're going to monitor to see when the CSS |