From 15c8a389aaca318efbadd4d9141f993ac9458db6 Mon Sep 17 00:00:00 2001 From: "James D. Forrester" Date: Fri, 5 Sep 2014 17:15:09 -0700 Subject: [PATCH] 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 --- resources/lib/oojs-ui/oojs-ui-apex.css | 4 ++-- resources/lib/oojs-ui/oojs-ui-minerva.css | 4 ++-- resources/lib/oojs-ui/oojs-ui.js | 9 +++++---- resources/lib/oojs-ui/oojs-ui.svg.css | 4 ++-- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/resources/lib/oojs-ui/oojs-ui-apex.css b/resources/lib/oojs-ui/oojs-ui-apex.css index 49776bc5b8..89c0d40667 100644 --- a/resources/lib/oojs-ui/oojs-ui-apex.css +++ b/resources/lib/oojs-ui/oojs-ui-apex.css @@ -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 */ /* * Blank theme mixins. diff --git a/resources/lib/oojs-ui/oojs-ui-minerva.css b/resources/lib/oojs-ui/oojs-ui-minerva.css index e12abd2c6b..c33b38e3d3 100644 --- a/resources/lib/oojs-ui/oojs-ui-minerva.css +++ b/resources/lib/oojs-ui/oojs-ui-minerva.css @@ -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 */ /* * Blank theme mixins. diff --git a/resources/lib/oojs-ui/oojs-ui.js b/resources/lib/oojs-ui/oojs-ui.js index 068c8facd7..41b6fabb14 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 diff --git a/resources/lib/oojs-ui/oojs-ui.svg.css b/resources/lib/oojs-ui/oojs-ui.svg.css index ee34c602fc..5f5eda98af 100644 --- a/resources/lib/oojs-ui/oojs-ui.svg.css +++ b/resources/lib/oojs-ui/oojs-ui.svg.css @@ -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 */ /* * Blank theme mixins. -- 2.20.1