jenkins-bot has submitted this change and it was merged. Change subject: Update OOjs UI to v0.1.0-pre (d4cfcce969) ......................................................................
Update OOjs UI to v0.1.0-pre (d4cfcce969) New changes: f6adfbc Give help content box a reasonable line height for legibility af5d71c Remove CSS hack for positioning popupButtonWidget c0768f9 PHP: Add missing OOUI\Exception class 76800b4 PHP: Wrap __toString() in try-catch to avoid unhelpful fatals d399920 Revert "Followup ca6a16f: use parent selector both for hiding and showing windows" 234cd9f Revert "Show the modal overlay as soon as openWindow is called" Change-Id: I317b4a747389de35411aca4ffdbbc2306b5b74cc --- M lib/oojs-ui/oojs-ui-apex.css M lib/oojs-ui/oojs-ui-apex.js M lib/oojs-ui/oojs-ui-apex.rtl.css M lib/oojs-ui/oojs-ui-apex.svg.css M lib/oojs-ui/oojs-ui-apex.svg.rtl.css M lib/oojs-ui/oojs-ui-mediawiki.css M lib/oojs-ui/oojs-ui-mediawiki.js M lib/oojs-ui/oojs-ui-mediawiki.rtl.css M lib/oojs-ui/oojs-ui-mediawiki.svg.css M lib/oojs-ui/oojs-ui-mediawiki.svg.rtl.css M lib/oojs-ui/oojs-ui.js 11 files changed, 59 insertions(+), 143 deletions(-) Approvals: Alex Monk: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/oojs-ui/oojs-ui-apex.css b/lib/oojs-ui/oojs-ui-apex.css index 96b4538..8a4952e 100644 --- a/lib/oojs-ui/oojs-ui-apex.css +++ b/lib/oojs-ui/oojs-ui-apex.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (20c61ec865) + * OOjs UI v0.1.0-pre (d4cfcce969) * 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-11-20T18:42:16Z + * Date: 2014-11-21T00:12:03Z */ .oo-ui-progressBarWidget-slide-frames from { margin-left: -40%; @@ -383,6 +383,7 @@ } .oo-ui-fieldLayout .oo-ui-fieldLayout-help-content { padding: 0.5em 0.75em; + line-height: 1.5em; } .oo-ui-fieldLayout:last-child { margin-bottom: 0; @@ -1306,14 +1307,8 @@ .oo-ui-popupButtonWidget.oo-ui-buttonElement-frameless > .oo-ui-popupWidget { left: 1em; } -.oo-ui-popupButtonWidget.oo-ui-buttonElement-frameless > .oo-ui-popupWidget > .oo-ui-popupWidget-popup { - left: -1em; -} .oo-ui-popupButtonWidget.oo-ui-buttonElement-framed > .oo-ui-popupWidget { left: 1.25em; -} -.oo-ui-popupButtonWidget.oo-ui-buttonElement-framed > .oo-ui-popupWidget > .oo-ui-popupWidget-popup { - left: -1.25em; } .oo-ui-textInputWidget { position: relative; @@ -2030,7 +2025,7 @@ height: 0; overflow: hidden; } -.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-load { +.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-setup { width: auto; height: auto; top: 0; @@ -2051,12 +2046,6 @@ .oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-setup > .oo-ui-window-frame > iframe { width: 100%; height: 100%; -} -.oo-ui-windowManager-modal > .oo-ui-dialog > .oo-ui-window-frame { - visibility: hidden; -} -.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-ready > .oo-ui-window-frame { - visibility: visible; } .oo-ui-windowManager-fullscreen > .oo-ui-dialog > .oo-ui-window-frame { width: 100%; @@ -2088,7 +2077,7 @@ -o-transition: all 250ms ease-in-out; transition: all 250ms ease-in-out; } -.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-load { +.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-ready { opacity: 1; } .oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-ready > .oo-ui-window-frame { diff --git a/lib/oojs-ui/oojs-ui-apex.js b/lib/oojs-ui/oojs-ui-apex.js index 53f5148..59f51c0 100644 --- a/lib/oojs-ui/oojs-ui-apex.js +++ b/lib/oojs-ui/oojs-ui-apex.js @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (20c61ec865) + * OOjs UI v0.1.0-pre (d4cfcce969) * 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-11-20T18:42:06Z + * Date: 2014-11-21T00:11:53Z */ /* Instantiation */ diff --git a/lib/oojs-ui/oojs-ui-apex.rtl.css b/lib/oojs-ui/oojs-ui-apex.rtl.css index 965e472..818d166 100644 --- a/lib/oojs-ui/oojs-ui-apex.rtl.css +++ b/lib/oojs-ui/oojs-ui-apex.rtl.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (20c61ec865) + * OOjs UI v0.1.0-pre (d4cfcce969) * 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-11-20T18:42:16Z + * Date: 2014-11-21T00:12:03Z */ .oo-ui-progressBarWidget-slide-frames from { margin-right: -40%; @@ -383,6 +383,7 @@ } .oo-ui-fieldLayout .oo-ui-fieldLayout-help-content { padding: 0.5em 0.75em; + line-height: 1.5em; } .oo-ui-fieldLayout:last-child { margin-bottom: 0; @@ -1306,14 +1307,8 @@ .oo-ui-popupButtonWidget.oo-ui-buttonElement-frameless > .oo-ui-popupWidget { right: 1em; } -.oo-ui-popupButtonWidget.oo-ui-buttonElement-frameless > .oo-ui-popupWidget > .oo-ui-popupWidget-popup { - right: -1em; -} .oo-ui-popupButtonWidget.oo-ui-buttonElement-framed > .oo-ui-popupWidget { right: 1.25em; -} -.oo-ui-popupButtonWidget.oo-ui-buttonElement-framed > .oo-ui-popupWidget > .oo-ui-popupWidget-popup { - right: -1.25em; } .oo-ui-textInputWidget { position: relative; @@ -2030,7 +2025,7 @@ height: 0; overflow: hidden; } -.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-load { +.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-setup { width: auto; height: auto; top: 0; @@ -2051,12 +2046,6 @@ .oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-setup > .oo-ui-window-frame > iframe { width: 100%; height: 100%; -} -.oo-ui-windowManager-modal > .oo-ui-dialog > .oo-ui-window-frame { - visibility: hidden; -} -.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-ready > .oo-ui-window-frame { - visibility: visible; } .oo-ui-windowManager-fullscreen > .oo-ui-dialog > .oo-ui-window-frame { width: 100%; @@ -2088,7 +2077,7 @@ -o-transition: all 250ms ease-in-out; transition: all 250ms ease-in-out; } -.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-load { +.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-ready { opacity: 1; } .oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-ready > .oo-ui-window-frame { diff --git a/lib/oojs-ui/oojs-ui-apex.svg.css b/lib/oojs-ui/oojs-ui-apex.svg.css index 4fc6e9b..9b64e0f 100644 --- a/lib/oojs-ui/oojs-ui-apex.svg.css +++ b/lib/oojs-ui/oojs-ui-apex.svg.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (20c61ec865) + * OOjs UI v0.1.0-pre (d4cfcce969) * 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-11-20T18:42:16Z + * Date: 2014-11-21T00:12:03Z */ .oo-ui-progressBarWidget-slide-frames from { margin-left: -40%; @@ -383,6 +383,7 @@ } .oo-ui-fieldLayout .oo-ui-fieldLayout-help-content { padding: 0.5em 0.75em; + line-height: 1.5em; } .oo-ui-fieldLayout:last-child { margin-bottom: 0; @@ -1306,14 +1307,8 @@ .oo-ui-popupButtonWidget.oo-ui-buttonElement-frameless > .oo-ui-popupWidget { left: 1em; } -.oo-ui-popupButtonWidget.oo-ui-buttonElement-frameless > .oo-ui-popupWidget > .oo-ui-popupWidget-popup { - left: -1em; -} .oo-ui-popupButtonWidget.oo-ui-buttonElement-framed > .oo-ui-popupWidget { left: 1.25em; -} -.oo-ui-popupButtonWidget.oo-ui-buttonElement-framed > .oo-ui-popupWidget > .oo-ui-popupWidget-popup { - left: -1.25em; } .oo-ui-textInputWidget { position: relative; @@ -2030,7 +2025,7 @@ height: 0; overflow: hidden; } -.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-load { +.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-setup { width: auto; height: auto; top: 0; @@ -2051,12 +2046,6 @@ .oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-setup > .oo-ui-window-frame > iframe { width: 100%; height: 100%; -} -.oo-ui-windowManager-modal > .oo-ui-dialog > .oo-ui-window-frame { - visibility: hidden; -} -.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-ready > .oo-ui-window-frame { - visibility: visible; } .oo-ui-windowManager-fullscreen > .oo-ui-dialog > .oo-ui-window-frame { width: 100%; @@ -2088,7 +2077,7 @@ -o-transition: all 250ms ease-in-out; transition: all 250ms ease-in-out; } -.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-load { +.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-ready { opacity: 1; } .oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-ready > .oo-ui-window-frame { diff --git a/lib/oojs-ui/oojs-ui-apex.svg.rtl.css b/lib/oojs-ui/oojs-ui-apex.svg.rtl.css index 90f11c7..081e161 100644 --- a/lib/oojs-ui/oojs-ui-apex.svg.rtl.css +++ b/lib/oojs-ui/oojs-ui-apex.svg.rtl.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (20c61ec865) + * OOjs UI v0.1.0-pre (d4cfcce969) * 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-11-20T18:42:16Z + * Date: 2014-11-21T00:12:03Z */ .oo-ui-progressBarWidget-slide-frames from { margin-right: -40%; @@ -383,6 +383,7 @@ } .oo-ui-fieldLayout .oo-ui-fieldLayout-help-content { padding: 0.5em 0.75em; + line-height: 1.5em; } .oo-ui-fieldLayout:last-child { margin-bottom: 0; @@ -1306,14 +1307,8 @@ .oo-ui-popupButtonWidget.oo-ui-buttonElement-frameless > .oo-ui-popupWidget { right: 1em; } -.oo-ui-popupButtonWidget.oo-ui-buttonElement-frameless > .oo-ui-popupWidget > .oo-ui-popupWidget-popup { - right: -1em; -} .oo-ui-popupButtonWidget.oo-ui-buttonElement-framed > .oo-ui-popupWidget { right: 1.25em; -} -.oo-ui-popupButtonWidget.oo-ui-buttonElement-framed > .oo-ui-popupWidget > .oo-ui-popupWidget-popup { - right: -1.25em; } .oo-ui-textInputWidget { position: relative; @@ -2030,7 +2025,7 @@ height: 0; overflow: hidden; } -.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-load { +.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-setup { width: auto; height: auto; top: 0; @@ -2051,12 +2046,6 @@ .oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-setup > .oo-ui-window-frame > iframe { width: 100%; height: 100%; -} -.oo-ui-windowManager-modal > .oo-ui-dialog > .oo-ui-window-frame { - visibility: hidden; -} -.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-ready > .oo-ui-window-frame { - visibility: visible; } .oo-ui-windowManager-fullscreen > .oo-ui-dialog > .oo-ui-window-frame { width: 100%; @@ -2088,7 +2077,7 @@ -o-transition: all 250ms ease-in-out; transition: all 250ms ease-in-out; } -.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-load { +.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-ready { opacity: 1; } .oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-ready > .oo-ui-window-frame { diff --git a/lib/oojs-ui/oojs-ui-mediawiki.css b/lib/oojs-ui/oojs-ui-mediawiki.css index 8fff9af..0342b7b 100644 --- a/lib/oojs-ui/oojs-ui-mediawiki.css +++ b/lib/oojs-ui/oojs-ui-mediawiki.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (20c61ec865) + * OOjs UI v0.1.0-pre (d4cfcce969) * 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-11-20T18:42:16Z + * Date: 2014-11-21T00:12:03Z */ .oo-ui-progressBarWidget-slide-frames from { margin-left: -40%; @@ -369,6 +369,7 @@ } .oo-ui-fieldLayout .oo-ui-fieldLayout-help-content { padding: 0.5em 0.75em; + line-height: 1.5em; } .oo-ui-fieldLayout:last-child { margin-bottom: 0; @@ -1184,14 +1185,8 @@ .oo-ui-popupButtonWidget.oo-ui-buttonElement-frameless > .oo-ui-popupWidget { left: 1em; } -.oo-ui-popupButtonWidget.oo-ui-buttonElement-frameless > .oo-ui-popupWidget > .oo-ui-popupWidget-popup { - left: -1em; -} .oo-ui-popupButtonWidget.oo-ui-buttonElement-framed > .oo-ui-popupWidget { left: 1.75em; -} -.oo-ui-popupButtonWidget.oo-ui-buttonElement-framed > .oo-ui-popupWidget > .oo-ui-popupWidget-popup { - left: -1.75em; } .oo-ui-checkboxInputWidget { position: relative; @@ -1901,7 +1896,7 @@ height: 0; overflow: hidden; } -.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-load { +.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-setup { width: auto; height: auto; top: 0; @@ -1922,12 +1917,6 @@ .oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-setup > .oo-ui-window-frame > iframe { width: 100%; height: 100%; -} -.oo-ui-windowManager-modal > .oo-ui-dialog > .oo-ui-window-frame { - visibility: hidden; -} -.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-ready > .oo-ui-window-frame { - visibility: visible; } .oo-ui-windowManager-fullscreen > .oo-ui-dialog > .oo-ui-window-frame { width: 100%; @@ -1959,7 +1948,7 @@ -o-transition: all 250ms ease-in-out; transition: all 250ms ease-in-out; } -.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-load { +.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-ready { opacity: 1; } .oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-ready > .oo-ui-window-frame { diff --git a/lib/oojs-ui/oojs-ui-mediawiki.js b/lib/oojs-ui/oojs-ui-mediawiki.js index f48ee64..12b6321 100644 --- a/lib/oojs-ui/oojs-ui-mediawiki.js +++ b/lib/oojs-ui/oojs-ui-mediawiki.js @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (20c61ec865) + * OOjs UI v0.1.0-pre (d4cfcce969) * 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-11-20T18:42:06Z + * Date: 2014-11-21T00:11:53Z */ /** * @class diff --git a/lib/oojs-ui/oojs-ui-mediawiki.rtl.css b/lib/oojs-ui/oojs-ui-mediawiki.rtl.css index 989f8c1..67e8484 100644 --- a/lib/oojs-ui/oojs-ui-mediawiki.rtl.css +++ b/lib/oojs-ui/oojs-ui-mediawiki.rtl.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (20c61ec865) + * OOjs UI v0.1.0-pre (d4cfcce969) * 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-11-20T18:42:16Z + * Date: 2014-11-21T00:12:03Z */ .oo-ui-progressBarWidget-slide-frames from { margin-right: -40%; @@ -369,6 +369,7 @@ } .oo-ui-fieldLayout .oo-ui-fieldLayout-help-content { padding: 0.5em 0.75em; + line-height: 1.5em; } .oo-ui-fieldLayout:last-child { margin-bottom: 0; @@ -1184,14 +1185,8 @@ .oo-ui-popupButtonWidget.oo-ui-buttonElement-frameless > .oo-ui-popupWidget { right: 1em; } -.oo-ui-popupButtonWidget.oo-ui-buttonElement-frameless > .oo-ui-popupWidget > .oo-ui-popupWidget-popup { - right: -1em; -} .oo-ui-popupButtonWidget.oo-ui-buttonElement-framed > .oo-ui-popupWidget { right: 1.75em; -} -.oo-ui-popupButtonWidget.oo-ui-buttonElement-framed > .oo-ui-popupWidget > .oo-ui-popupWidget-popup { - right: -1.75em; } .oo-ui-checkboxInputWidget { position: relative; @@ -1901,7 +1896,7 @@ height: 0; overflow: hidden; } -.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-load { +.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-setup { width: auto; height: auto; top: 0; @@ -1922,12 +1917,6 @@ .oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-setup > .oo-ui-window-frame > iframe { width: 100%; height: 100%; -} -.oo-ui-windowManager-modal > .oo-ui-dialog > .oo-ui-window-frame { - visibility: hidden; -} -.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-ready > .oo-ui-window-frame { - visibility: visible; } .oo-ui-windowManager-fullscreen > .oo-ui-dialog > .oo-ui-window-frame { width: 100%; @@ -1959,7 +1948,7 @@ -o-transition: all 250ms ease-in-out; transition: all 250ms ease-in-out; } -.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-load { +.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-ready { opacity: 1; } .oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-ready > .oo-ui-window-frame { diff --git a/lib/oojs-ui/oojs-ui-mediawiki.svg.css b/lib/oojs-ui/oojs-ui-mediawiki.svg.css index b604b94..8cd5a26 100644 --- a/lib/oojs-ui/oojs-ui-mediawiki.svg.css +++ b/lib/oojs-ui/oojs-ui-mediawiki.svg.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (20c61ec865) + * OOjs UI v0.1.0-pre (d4cfcce969) * 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-11-20T18:42:16Z + * Date: 2014-11-21T00:12:03Z */ .oo-ui-progressBarWidget-slide-frames from { margin-left: -40%; @@ -369,6 +369,7 @@ } .oo-ui-fieldLayout .oo-ui-fieldLayout-help-content { padding: 0.5em 0.75em; + line-height: 1.5em; } .oo-ui-fieldLayout:last-child { margin-bottom: 0; @@ -1184,14 +1185,8 @@ .oo-ui-popupButtonWidget.oo-ui-buttonElement-frameless > .oo-ui-popupWidget { left: 1em; } -.oo-ui-popupButtonWidget.oo-ui-buttonElement-frameless > .oo-ui-popupWidget > .oo-ui-popupWidget-popup { - left: -1em; -} .oo-ui-popupButtonWidget.oo-ui-buttonElement-framed > .oo-ui-popupWidget { left: 1.75em; -} -.oo-ui-popupButtonWidget.oo-ui-buttonElement-framed > .oo-ui-popupWidget > .oo-ui-popupWidget-popup { - left: -1.75em; } .oo-ui-checkboxInputWidget { position: relative; @@ -1901,7 +1896,7 @@ height: 0; overflow: hidden; } -.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-load { +.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-setup { width: auto; height: auto; top: 0; @@ -1922,12 +1917,6 @@ .oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-setup > .oo-ui-window-frame > iframe { width: 100%; height: 100%; -} -.oo-ui-windowManager-modal > .oo-ui-dialog > .oo-ui-window-frame { - visibility: hidden; -} -.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-ready > .oo-ui-window-frame { - visibility: visible; } .oo-ui-windowManager-fullscreen > .oo-ui-dialog > .oo-ui-window-frame { width: 100%; @@ -1959,7 +1948,7 @@ -o-transition: all 250ms ease-in-out; transition: all 250ms ease-in-out; } -.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-load { +.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-ready { opacity: 1; } .oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-ready > .oo-ui-window-frame { diff --git a/lib/oojs-ui/oojs-ui-mediawiki.svg.rtl.css b/lib/oojs-ui/oojs-ui-mediawiki.svg.rtl.css index 56f2ab6..7b228c1 100644 --- a/lib/oojs-ui/oojs-ui-mediawiki.svg.rtl.css +++ b/lib/oojs-ui/oojs-ui-mediawiki.svg.rtl.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (20c61ec865) + * OOjs UI v0.1.0-pre (d4cfcce969) * 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-11-20T18:42:16Z + * Date: 2014-11-21T00:12:03Z */ .oo-ui-progressBarWidget-slide-frames from { margin-right: -40%; @@ -369,6 +369,7 @@ } .oo-ui-fieldLayout .oo-ui-fieldLayout-help-content { padding: 0.5em 0.75em; + line-height: 1.5em; } .oo-ui-fieldLayout:last-child { margin-bottom: 0; @@ -1184,14 +1185,8 @@ .oo-ui-popupButtonWidget.oo-ui-buttonElement-frameless > .oo-ui-popupWidget { right: 1em; } -.oo-ui-popupButtonWidget.oo-ui-buttonElement-frameless > .oo-ui-popupWidget > .oo-ui-popupWidget-popup { - right: -1em; -} .oo-ui-popupButtonWidget.oo-ui-buttonElement-framed > .oo-ui-popupWidget { right: 1.75em; -} -.oo-ui-popupButtonWidget.oo-ui-buttonElement-framed > .oo-ui-popupWidget > .oo-ui-popupWidget-popup { - right: -1.75em; } .oo-ui-checkboxInputWidget { position: relative; @@ -1901,7 +1896,7 @@ height: 0; overflow: hidden; } -.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-load { +.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-setup { width: auto; height: auto; top: 0; @@ -1922,12 +1917,6 @@ .oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-setup > .oo-ui-window-frame > iframe { width: 100%; height: 100%; -} -.oo-ui-windowManager-modal > .oo-ui-dialog > .oo-ui-window-frame { - visibility: hidden; -} -.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-ready > .oo-ui-window-frame { - visibility: visible; } .oo-ui-windowManager-fullscreen > .oo-ui-dialog > .oo-ui-window-frame { width: 100%; @@ -1959,7 +1948,7 @@ -o-transition: all 250ms ease-in-out; transition: all 250ms ease-in-out; } -.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-load { +.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-ready { opacity: 1; } .oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-ready > .oo-ui-window-frame { diff --git a/lib/oojs-ui/oojs-ui.js b/lib/oojs-ui/oojs-ui.js index b46a0df..c0dfcf2 100644 --- a/lib/oojs-ui/oojs-ui.js +++ b/lib/oojs-ui/oojs-ui.js @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (20c61ec865) + * OOjs UI v0.1.0-pre (d4cfcce969) * 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-11-20T18:42:06Z + * Date: 2014-11-21T00:11:53Z */ ( function ( OO ) { @@ -1463,6 +1463,7 @@ * @param {Object} [config] Configuration options * @cfg {string} [size] Symbolic name of dialog size, `small`, `medium`, `large` or `full`; omit to * use #static-size + * @fires initialize */ OO.ui.Window = function OoUiWindow( config ) { // Configuration initialization @@ -1844,7 +1845,7 @@ * instead of display. * * @param {boolean} [show] Make window visible, omit to toggle visibility - * @fires toggle + * @fires visible * @chainable */ OO.ui.Window.prototype.toggle = function ( show ) { @@ -2105,7 +2106,7 @@ this.getTeardownProcess( data ).execute().done( function () { // Force redraw by asking the browser to measure the elements' widths - win.$element.removeClass( 'oo-ui-window-load oo-ui-window-setup' ).width(); + win.$element.removeClass( 'oo-ui-window-setup' ).width(); win.$content.removeClass( 'oo-ui-window-content-setup' ).width(); win.$element.hide(); win.visible = false; @@ -2118,9 +2119,10 @@ /** * Load the frame contents. * - * Once the iframe's stylesheets are loaded the returned promise will be resolved. Calling while - * loading will return a promise but not trigger a new loading cycle. Calling after loading is - * complete will return a promise that's already been resolved. + * Once the iframe's stylesheets are loaded, the `load` event will be emitted and the returned + * promise will be resolved. Calling while loading will return a promise but not trigger a new + * loading cycle. Calling after loading is complete will return a promise that's already been + * resolved. * * Sounds simple right? Read on... * @@ -2149,12 +2151,11 @@ * All this stylesheet injection and polling magic is in #transplantStyles. * * @return {jQuery.Promise} Promise resolved when loading is complete + * @fires load */ OO.ui.Window.prototype.load = function () { var sub, doc, loading, win = this; - - this.$element.addClass( 'oo-ui-window-load' ); // Non-isolated windows are already "loaded" if ( !this.loading && !this.isolated ) { @@ -2879,10 +2880,13 @@ // Window opening if ( opening.state() !== 'rejected' ) { - if ( !win.getManager() ) { + // Begin loading the window if it's not loading or loaded already - may take noticable time + // and we want to do this in parallel with any other preparatory actions + if ( !win.isLoading() && !win.isLoaded() ) { + // Finish initializing the window (must be done after manager is attached to DOM) win.setManager( this ); + preparing.push( win.load() ); } - preparing.push( win.load() ); if ( this.closing ) { // If a window is currently closing, wait for it to complete -- To view, visit https://gerrit.wikimedia.org/r/174867 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I317b4a747389de35411aca4ffdbbc2306b5b74cc Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: master Gerrit-Owner: Jforrester <[email protected]> Gerrit-Reviewer: Alex Monk <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
