jenkins-bot has submitted this change and it was merged. Change subject: Update OOjs UI to v0.1.0-pre (05f0fefc3f) ......................................................................
Update OOjs UI to v0.1.0-pre (05f0fefc3f) New changes: e784137 mediawiki: Replace instances of 0.3em border-radius with variable 9b47eff Update OOjs to v1.1.2 3ad3295 Localisation updates from https://translatewiki.net. 59e926f Murdering OptionWidget's `rel` config option ca6a16f Show the modal overlay as soon as openWindow is called 69fb4a0 Localisation updates from https://translatewiki.net. d579dbd Localisation updates from https://translatewiki.net. af5f5b9 Match 'color' rules to 'background-color' rules for accessibility f1efb3b .theme-oo-ui-textInputWidget cleanup 845bb0a Localisation updates from https://translatewiki.net. 05f0fef Add missing config documentation for PendingElement Change-Id: Iec009d9e535cd4427c2bb1100e29cf78b4494152 --- M resources/lib/oojs-ui/i18n/fy.json M resources/lib/oojs-ui/i18n/he.json M resources/lib/oojs-ui/i18n/ilo.json M resources/lib/oojs-ui/i18n/ja.json M resources/lib/oojs-ui/i18n/pt.json M resources/lib/oojs-ui/i18n/ta.json M resources/lib/oojs-ui/i18n/zh-hant.json M resources/lib/oojs-ui/oojs-ui-apex.css M resources/lib/oojs-ui/oojs-ui-apex.js M resources/lib/oojs-ui/oojs-ui-apex.svg.css M resources/lib/oojs-ui/oojs-ui-mediawiki.css M resources/lib/oojs-ui/oojs-ui-mediawiki.js M resources/lib/oojs-ui/oojs-ui-mediawiki.svg.css M resources/lib/oojs-ui/oojs-ui.js 14 files changed, 119 insertions(+), 101 deletions(-) Approvals: Esanders: Looks good to me, approved jenkins-bot: Verified diff --git a/resources/lib/oojs-ui/i18n/fy.json b/resources/lib/oojs-ui/i18n/fy.json index 2aaf960..ddf9ff7 100644 --- a/resources/lib/oojs-ui/i18n/fy.json +++ b/resources/lib/oojs-ui/i18n/fy.json @@ -4,5 +4,8 @@ "Robin0van0der0vliet" ] }, + "ooui-toolbar-more": "Mear", + "ooui-toolgroup-expand": "Mear", + "ooui-dialog-message-accept": "OK", "ooui-dialog-message-reject": "Annulearje" } diff --git a/resources/lib/oojs-ui/i18n/he.json b/resources/lib/oojs-ui/i18n/he.json index 81690ab..cadc416 100644 --- a/resources/lib/oojs-ui/i18n/he.json +++ b/resources/lib/oojs-ui/i18n/he.json @@ -25,5 +25,6 @@ "ooui-dialog-message-reject": "ביטול", "ooui-dialog-process-error": "משהו השתבש", "ooui-dialog-process-dismiss": "לוותר", - "ooui-dialog-process-retry": "לנסות שוב" + "ooui-dialog-process-retry": "לנסות שוב", + "ooui-dialog-process-continue": "המשך" } diff --git a/resources/lib/oojs-ui/i18n/ilo.json b/resources/lib/oojs-ui/i18n/ilo.json index 81a91ed..b37beae 100644 --- a/resources/lib/oojs-ui/i18n/ilo.json +++ b/resources/lib/oojs-ui/i18n/ilo.json @@ -8,9 +8,12 @@ "ooui-outline-control-move-up": "Ipangato ti banag", "ooui-outline-control-remove": "Ikkaten ti banag", "ooui-toolbar-more": "Adu pay", + "ooui-toolgroup-expand": "Adu pay", + "ooui-toolgroup-collapse": "Basbassit", "ooui-dialog-message-accept": "Sige", "ooui-dialog-message-reject": "Ukasen", "ooui-dialog-process-error": "Adda madi a napasamak", "ooui-dialog-process-dismiss": "Pugsayen", - "ooui-dialog-process-retry": "Padasen manen" + "ooui-dialog-process-retry": "Padasen manen", + "ooui-dialog-process-continue": "Agtuloy" } diff --git a/resources/lib/oojs-ui/i18n/ja.json b/resources/lib/oojs-ui/i18n/ja.json index 6442342..ec86124 100644 --- a/resources/lib/oojs-ui/i18n/ja.json +++ b/resources/lib/oojs-ui/i18n/ja.json @@ -5,7 +5,8 @@ "Miya", "Penn Station", "Shirayuki", - "Takot" + "Takot", + "Los688" ] }, "ooui-outline-control-move-down": "項目を下に移動させる", @@ -18,5 +19,6 @@ "ooui-dialog-message-reject": "キャンセル", "ooui-dialog-process-error": "エラーが発生しました…", "ooui-dialog-process-dismiss": "閉じる", - "ooui-dialog-process-retry": "もう一度お試しください" + "ooui-dialog-process-retry": "もう一度お試しください", + "ooui-dialog-process-continue": "続行" } diff --git a/resources/lib/oojs-ui/i18n/pt.json b/resources/lib/oojs-ui/i18n/pt.json index d261e2d..7b3176f 100644 --- a/resources/lib/oojs-ui/i18n/pt.json +++ b/resources/lib/oojs-ui/i18n/pt.json @@ -18,6 +18,7 @@ "ooui-outline-control-remove": "Remover elemento", "ooui-toolbar-more": "Mais", "ooui-toolgroup-expand": "Mais", + "ooui-toolgroup-collapse": "Menos", "ooui-dialog-message-accept": "Aceitar", "ooui-dialog-message-reject": "Cancelar", "ooui-dialog-process-error": "Algo correu mal", diff --git a/resources/lib/oojs-ui/i18n/ta.json b/resources/lib/oojs-ui/i18n/ta.json index 0145017..122d4a2 100644 --- a/resources/lib/oojs-ui/i18n/ta.json +++ b/resources/lib/oojs-ui/i18n/ta.json @@ -4,7 +4,10 @@ "Jayarathina", "Sank", "Shanmugamp7", - "மதனாஹரன்" + "மதனாஹரன்", + "ElangoRamanujam" ] - } + }, + "ooui-toolgroup-expand": "மேலும்", + "ooui-dialog-process-continue": "தொடரவும்" } diff --git a/resources/lib/oojs-ui/i18n/zh-hant.json b/resources/lib/oojs-ui/i18n/zh-hant.json index 1110669..3fd8d36 100644 --- a/resources/lib/oojs-ui/i18n/zh-hant.json +++ b/resources/lib/oojs-ui/i18n/zh-hant.json @@ -13,7 +13,8 @@ "Simon Shek", "Spring Roll Conan", "Waihorace", - "Cwlin0416" + "Cwlin0416", + "LNDDYL" ] }, "ooui-outline-control-move-down": "項目下移", @@ -26,5 +27,6 @@ "ooui-dialog-message-reject": "取消", "ooui-dialog-process-error": "發生不明錯誤", "ooui-dialog-process-dismiss": "關閉", - "ooui-dialog-process-retry": "再試一次" + "ooui-dialog-process-retry": "再試一次", + "ooui-dialog-process-continue": "繼續" } diff --git a/resources/lib/oojs-ui/oojs-ui-apex.css b/resources/lib/oojs-ui/oojs-ui-apex.css index 4cac5e5..b225b4b 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 (12b66051ff) + * OOjs UI v0.1.0-pre (05f0fefc3f) * 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-06T19:08:43Z + * Date: 2014-11-11T16:30:00Z */ /* @noflip */ .oo-ui-rtl { @@ -1301,6 +1301,7 @@ font-size: 1em; font-family: sans-serif; background-color: #ffffff; + color: black; border: solid 1px #cccccc; box-shadow: 0 0 0 white, inset 0 0.1em 0.2em #dddddd; border-radius: 0.25em; @@ -1323,26 +1324,21 @@ border-color: #a7dcff; box-shadow: 0 0 0.3em #a7dcff, 0 0 0 white; } -.oo-ui-textInputWidget.oo-ui-pendingElement-pending input, -.oo-ui-textInputWidget.oo-ui-pendingElement-pending textarea { - background-image: /* @embed */ url(themes/apex/images/textures/pending.gif); -} -.oo-ui-textInputWidget input[readonly], -.oo-ui-textInputWidget textarea[readonly] { +.oo-ui-textInputWidget.oo-ui-widget-enabled input[readonly], +.oo-ui-textInputWidget.oo-ui-widget-enabled textarea[readonly] { color: #777777; } -.oo-ui-textInputWidget.oo-ui-pendingElement-pending input, -.oo-ui-textInputWidget.oo-ui-pendingElement-pending textarea { - background-color: transparent; -} .oo-ui-textInputWidget.oo-ui-widget-disabled input, -.oo-ui-textInputWidget.oo-ui-widget-disabled input:focus, -.oo-ui-textInputWidget.oo-ui-widget-disabled textarea, -.oo-ui-textInputWidget.oo-ui-widget-disabled textarea:focus { +.oo-ui-textInputWidget.oo-ui-widget-disabled textarea { color: #cccccc; text-shadow: 0 1px 1px #ffffff; border-color: #dddddd; background-color: #f3f3f3; +} +.oo-ui-textInputWidget.oo-ui-pendingElement-pending input, +.oo-ui-textInputWidget.oo-ui-pendingElement-pending textarea { + background-color: transparent; + background-image: /* @embed */ url(themes/apex/images/textures/pending.gif); } .oo-ui-textInputWidget .oo-ui-iconElement-icon, .oo-ui-textInputWidget .oo-ui-indicatorElement-indicator { @@ -1978,7 +1974,7 @@ height: 0; overflow: hidden; } -.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-setup { +.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-load { width: auto; height: auto; top: 0; @@ -1999,6 +1995,12 @@ .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%; @@ -2030,7 +2032,7 @@ -o-transition: all 250ms ease-in-out; transition: all 250ms ease-in-out; } -.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-ready { +.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-load { opacity: 1; } .oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-ready > .oo-ui-window-frame { diff --git a/resources/lib/oojs-ui/oojs-ui-apex.js b/resources/lib/oojs-ui/oojs-ui-apex.js index a2edf03..8c4ddfc 100644 --- a/resources/lib/oojs-ui/oojs-ui-apex.js +++ b/resources/lib/oojs-ui/oojs-ui-apex.js @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (12b66051ff) + * OOjs UI v0.1.0-pre (05f0fefc3f) * 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-06T19:08:33Z + * Date: 2014-11-11T16:29:49Z */ /* Instantiation */ diff --git a/resources/lib/oojs-ui/oojs-ui-apex.svg.css b/resources/lib/oojs-ui/oojs-ui-apex.svg.css index 5bf6e69..14ad38f 100644 --- a/resources/lib/oojs-ui/oojs-ui-apex.svg.css +++ b/resources/lib/oojs-ui/oojs-ui-apex.svg.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (12b66051ff) + * OOjs UI v0.1.0-pre (05f0fefc3f) * 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-06T19:08:43Z + * Date: 2014-11-11T16:30:00Z */ /* @noflip */ .oo-ui-rtl { @@ -1301,6 +1301,7 @@ font-size: 1em; font-family: sans-serif; background-color: #ffffff; + color: black; border: solid 1px #cccccc; box-shadow: 0 0 0 white, inset 0 0.1em 0.2em #dddddd; border-radius: 0.25em; @@ -1323,26 +1324,21 @@ border-color: #a7dcff; box-shadow: 0 0 0.3em #a7dcff, 0 0 0 white; } -.oo-ui-textInputWidget.oo-ui-pendingElement-pending input, -.oo-ui-textInputWidget.oo-ui-pendingElement-pending textarea { - background-image: /* @embed */ url(themes/apex/images/textures/pending.gif); -} -.oo-ui-textInputWidget input[readonly], -.oo-ui-textInputWidget textarea[readonly] { +.oo-ui-textInputWidget.oo-ui-widget-enabled input[readonly], +.oo-ui-textInputWidget.oo-ui-widget-enabled textarea[readonly] { color: #777777; } -.oo-ui-textInputWidget.oo-ui-pendingElement-pending input, -.oo-ui-textInputWidget.oo-ui-pendingElement-pending textarea { - background-color: transparent; -} .oo-ui-textInputWidget.oo-ui-widget-disabled input, -.oo-ui-textInputWidget.oo-ui-widget-disabled input:focus, -.oo-ui-textInputWidget.oo-ui-widget-disabled textarea, -.oo-ui-textInputWidget.oo-ui-widget-disabled textarea:focus { +.oo-ui-textInputWidget.oo-ui-widget-disabled textarea { color: #cccccc; text-shadow: 0 1px 1px #ffffff; border-color: #dddddd; background-color: #f3f3f3; +} +.oo-ui-textInputWidget.oo-ui-pendingElement-pending input, +.oo-ui-textInputWidget.oo-ui-pendingElement-pending textarea { + background-color: transparent; + background-image: /* @embed */ url(themes/apex/images/textures/pending.gif); } .oo-ui-textInputWidget .oo-ui-iconElement-icon, .oo-ui-textInputWidget .oo-ui-indicatorElement-indicator { @@ -1978,7 +1974,7 @@ height: 0; overflow: hidden; } -.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-setup { +.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-load { width: auto; height: auto; top: 0; @@ -1999,6 +1995,12 @@ .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%; @@ -2030,7 +2032,7 @@ -o-transition: all 250ms ease-in-out; transition: all 250ms ease-in-out; } -.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-ready { +.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-load { opacity: 1; } .oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-ready > .oo-ui-window-frame { diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki.css b/resources/lib/oojs-ui/oojs-ui-mediawiki.css index 90355a2..34db397 100644 --- a/resources/lib/oojs-ui/oojs-ui-mediawiki.css +++ b/resources/lib/oojs-ui/oojs-ui-mediawiki.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (12b66051ff) + * OOjs UI v0.1.0-pre (05f0fefc3f) * 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-06T19:08:43Z + * Date: 2014-11-11T16:30:00Z */ /* @noflip */ .oo-ui-rtl { @@ -1229,6 +1229,7 @@ font-size: 1em; font-family: sans-serif; background-color: #ffffff; + color: black; border: solid 1px #cccccc; box-shadow: inset 0 0 0 0 #0274ff; border-radius: 0.1em; @@ -1254,31 +1255,26 @@ border-color: #aaaaaa; box-shadow: inset 0.4em 0 0 0 #0274ff; } -.oo-ui-textInputWidget.oo-ui-pendingElement-pending input, -.oo-ui-textInputWidget.oo-ui-pendingElement-pending textarea { - background-image: /* @embed */ url(themes/mediawiki/images/textures/pending.gif); -} -.oo-ui-textInputWidget input[readonly], -.oo-ui-textInputWidget textarea[readonly] { +.oo-ui-textInputWidget.oo-ui-widget-enabled input[readonly], +.oo-ui-textInputWidget.oo-ui-widget-enabled textarea[readonly] { color: #777777; text-shadow: 0 1px 1px #ffffff; } -.oo-ui-textInputWidget input[readonly]:focus, -.oo-ui-textInputWidget textarea[readonly]:focus { +.oo-ui-textInputWidget.oo-ui-widget-enabled input[readonly]:focus, +.oo-ui-textInputWidget.oo-ui-widget-enabled textarea[readonly]:focus { box-shadow: inset 0.4em 0 0 0 #cccccc; } -.oo-ui-textInputWidget.oo-ui-pendingElement-pending input, -.oo-ui-textInputWidget.oo-ui-pendingElement-pending textarea { - background-color: transparent; -} .oo-ui-textInputWidget.oo-ui-widget-disabled input, -.oo-ui-textInputWidget.oo-ui-widget-disabled input:focus, -.oo-ui-textInputWidget.oo-ui-widget-disabled textarea, -.oo-ui-textInputWidget.oo-ui-widget-disabled textarea:focus { +.oo-ui-textInputWidget.oo-ui-widget-disabled textarea { color: #cccccc; text-shadow: 0 1px 1px #ffffff; border-color: #dddddd; background-color: #f3f3f3; +} +.oo-ui-textInputWidget.oo-ui-pendingElement-pending input, +.oo-ui-textInputWidget.oo-ui-pendingElement-pending textarea { + background-color: transparent; + background-image: /* @embed */ url(themes/mediawiki/images/textures/pending.gif); } .oo-ui-textInputWidget.oo-ui-iconElement input, .oo-ui-textInputWidget.oo-ui-iconElement textarea { @@ -1850,7 +1846,7 @@ height: 0; overflow: hidden; } -.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-setup { +.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-load { width: auto; height: auto; top: 0; @@ -1871,6 +1867,12 @@ .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%; @@ -1902,7 +1904,7 @@ -o-transition: all 250ms ease-in-out; transition: all 250ms ease-in-out; } -.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-ready { +.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-load { opacity: 1; } .oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-ready > .oo-ui-window-frame { diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki.js b/resources/lib/oojs-ui/oojs-ui-mediawiki.js index cd436e2..1ef5bca 100644 --- a/resources/lib/oojs-ui/oojs-ui-mediawiki.js +++ b/resources/lib/oojs-ui/oojs-ui-mediawiki.js @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (12b66051ff) + * OOjs UI v0.1.0-pre (05f0fefc3f) * 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-06T19:08:33Z + * Date: 2014-11-11T16:29:49Z */ /** * @class diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki.svg.css b/resources/lib/oojs-ui/oojs-ui-mediawiki.svg.css index 0d399f9..aa5605a 100644 --- a/resources/lib/oojs-ui/oojs-ui-mediawiki.svg.css +++ b/resources/lib/oojs-ui/oojs-ui-mediawiki.svg.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (12b66051ff) + * OOjs UI v0.1.0-pre (05f0fefc3f) * 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-06T19:08:43Z + * Date: 2014-11-11T16:30:00Z */ /* @noflip */ .oo-ui-rtl { @@ -1229,6 +1229,7 @@ font-size: 1em; font-family: sans-serif; background-color: #ffffff; + color: black; border: solid 1px #cccccc; box-shadow: inset 0 0 0 0 #0274ff; border-radius: 0.1em; @@ -1254,31 +1255,26 @@ border-color: #aaaaaa; box-shadow: inset 0.4em 0 0 0 #0274ff; } -.oo-ui-textInputWidget.oo-ui-pendingElement-pending input, -.oo-ui-textInputWidget.oo-ui-pendingElement-pending textarea { - background-image: /* @embed */ url(themes/mediawiki/images/textures/pending.gif); -} -.oo-ui-textInputWidget input[readonly], -.oo-ui-textInputWidget textarea[readonly] { +.oo-ui-textInputWidget.oo-ui-widget-enabled input[readonly], +.oo-ui-textInputWidget.oo-ui-widget-enabled textarea[readonly] { color: #777777; text-shadow: 0 1px 1px #ffffff; } -.oo-ui-textInputWidget input[readonly]:focus, -.oo-ui-textInputWidget textarea[readonly]:focus { +.oo-ui-textInputWidget.oo-ui-widget-enabled input[readonly]:focus, +.oo-ui-textInputWidget.oo-ui-widget-enabled textarea[readonly]:focus { box-shadow: inset 0.4em 0 0 0 #cccccc; } -.oo-ui-textInputWidget.oo-ui-pendingElement-pending input, -.oo-ui-textInputWidget.oo-ui-pendingElement-pending textarea { - background-color: transparent; -} .oo-ui-textInputWidget.oo-ui-widget-disabled input, -.oo-ui-textInputWidget.oo-ui-widget-disabled input:focus, -.oo-ui-textInputWidget.oo-ui-widget-disabled textarea, -.oo-ui-textInputWidget.oo-ui-widget-disabled textarea:focus { +.oo-ui-textInputWidget.oo-ui-widget-disabled textarea { color: #cccccc; text-shadow: 0 1px 1px #ffffff; border-color: #dddddd; background-color: #f3f3f3; +} +.oo-ui-textInputWidget.oo-ui-pendingElement-pending input, +.oo-ui-textInputWidget.oo-ui-pendingElement-pending textarea { + background-color: transparent; + background-image: /* @embed */ url(themes/mediawiki/images/textures/pending.gif); } .oo-ui-textInputWidget.oo-ui-iconElement input, .oo-ui-textInputWidget.oo-ui-iconElement textarea { @@ -1850,7 +1846,7 @@ height: 0; overflow: hidden; } -.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-setup { +.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-load { width: auto; height: auto; top: 0; @@ -1871,6 +1867,12 @@ .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%; @@ -1902,7 +1904,7 @@ -o-transition: all 250ms ease-in-out; transition: all 250ms ease-in-out; } -.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-ready { +.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-load { opacity: 1; } .oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-ready > .oo-ui-window-frame { diff --git a/resources/lib/oojs-ui/oojs-ui.js b/resources/lib/oojs-ui/oojs-ui.js index 387df23..a8d0029 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 (12b66051ff) + * OOjs UI v0.1.0-pre (05f0fefc3f) * 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-06T19:08:33Z + * Date: 2014-11-11T16:29:49Z */ ( function ( OO ) { @@ -202,6 +202,7 @@ * * @constructor * @param {Object} [config] Configuration options + * @cfg {jQuery} [$pending] Element to mark as pending, defaults to this.$element */ OO.ui.PendingElement = function OoUiPendingElement( config ) { // Configuration initialization @@ -1438,7 +1439,6 @@ * @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 @@ -1820,7 +1820,7 @@ * instead of display. * * @param {boolean} [show] Make window visible, omit to toggle visibility - * @fires visible + * @fires toggle * @chainable */ OO.ui.Window.prototype.toggle = function ( show ) { @@ -2081,7 +2081,7 @@ this.getTeardownProcess( data ).execute().done( function () { // Force redraw by asking the browser to measure the elements' widths - win.$element.removeClass( 'oo-ui-window-setup' ).width(); + win.$element.removeClass( 'oo-ui-window-load oo-ui-window-setup' ).width(); win.$content.removeClass( 'oo-ui-window-content-setup' ).width(); win.$element.hide(); win.visible = false; @@ -2094,10 +2094,9 @@ /** * Load the frame contents. * - * 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. + * 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. * * Sounds simple right? Read on... * @@ -2126,11 +2125,12 @@ * 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 ) { @@ -2855,13 +2855,10 @@ // Window opening if ( opening.state() !== 'rejected' ) { - // 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) + if ( !win.getManager() ) { 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 @@ -9928,7 +9925,6 @@ * @constructor * @param {Mixed} data Option data * @param {Object} [config] Configuration options - * @cfg {string} [rel] Value for `rel` attribute in DOM, allowing per-option styling */ OO.ui.OptionWidget = function OoUiOptionWidget( data, config ) { // Configuration initialization @@ -9951,7 +9947,6 @@ // Initialization this.$element .data( 'oo-ui-optionWidget', this ) - .attr( 'rel', config.rel ) .attr( 'role', 'option' ) .addClass( 'oo-ui-optionWidget' ) .append( this.$label ); -- To view, visit https://gerrit.wikimedia.org/r/172561 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iec009d9e535cd4427c2bb1100e29cf78b4494152 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Jforrester <[email protected]> Gerrit-Reviewer: Esanders <[email protected]> Gerrit-Reviewer: Jack Phoenix <[email protected]> Gerrit-Reviewer: Krinkle <[email protected]> Gerrit-Reviewer: Siebrand <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
