Merge "Show the revision list immediately on "umerge" log action links"

[lhc/web/wiklou.git] / resources / lib / oojs-ui / oojs-ui.js

diff --git a/resources/lib/oojs-ui/oojs-ui.js b/resources/lib/oojs-ui/oojs-ui.js
index 068c8fa..67eef40 100644 (file)
--- 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 (f9c217dfa4)
  * 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-10T17:25:40Z
  */
 ( 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
@@ -6428,7 +6429,7 @@ OO.ui.FieldLayout = function OoUiFieldLayout( field, config ) {
        if ( config.help ) {
                this.popupButtonWidget = new OO.ui.PopupButtonWidget( {
                        $: this.$,
-                       frameless: true,
+                       framed: false,
                        icon: 'info',
                        title: config.help
                } );
@@ -9942,11 +9943,11 @@ OO.ui.PopupWidget.prototype.toggle = function ( show ) {
 
        if ( change ) {
                if ( show ) {
-                       this.toggleClipping( true );
                        if ( this.autoClose ) {
                                this.bindMouseDownListener();
                        }
                        this.updateDimensions();
+                       this.toggleClipping( true );
                } else {
                        this.toggleClipping( false );
                        if ( this.autoClose ) {