jenkins-bot has submitted this change and it was merged. Change subject: Update OOjs UI to v0.1.0-pre (9cd400e3d5) ......................................................................
Update OOjs UI to v0.1.0-pre (9cd400e3d5) New changes: a1b99bb Dialog title alignment and iframe size fixes a30c514 Localisation updates from https://translatewiki.net. e2e1a12 Localisation updates from https://translatewiki.net. a6248f0 build: Update grunt-jscs (formerly grunt-jscs-checker) from 0.6.0 to 0.6.1 7710fe7 Set actions buttons to be framed by default 59ef352 Localisation updates from https://translatewiki.net. 6544476 Give MessageDialog actions 'action' properties d10d0d9 Localisation updates from https://translatewiki.net. 91b11b4 Use native focus f808d83 Add role attribute to a few widgets 8bd708b Special case for measuring clippableContainer == body Change-Id: I56a21b2d652cc31748b369f26c0dc1cf5e0e81e2 --- M lib/oojs-ui/i18n/ast.json M lib/oojs-ui/i18n/es.json M lib/oojs-ui/i18n/ilo.json M lib/oojs-ui/i18n/om.json M lib/oojs-ui/i18n/qqq.json M lib/oojs-ui/i18n/yi.json M lib/oojs-ui/i18n/zh-hant.json M lib/oojs-ui/oojs-ui-agora.css M lib/oojs-ui/oojs-ui-agora.rtl.css M lib/oojs-ui/oojs-ui-apex.css M lib/oojs-ui/oojs-ui-apex.rtl.css M lib/oojs-ui/oojs-ui.js M lib/oojs-ui/oojs-ui.rtl.css M lib/oojs-ui/oojs-ui.svg.css M lib/oojs-ui/oojs-ui.svg.rtl.css 15 files changed, 163 insertions(+), 124 deletions(-) Approvals: Catrope: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/oojs-ui/i18n/ast.json b/lib/oojs-ui/i18n/ast.json index eb39dac..87d7688 100644 --- a/lib/oojs-ui/i18n/ast.json +++ b/lib/oojs-ui/i18n/ast.json @@ -6,13 +6,13 @@ "Xuacu" ] }, - "ooui-dialog-action-close": "Zarrar", "ooui-outline-control-move-down": "Mover abaxo l'elementu", "ooui-outline-control-move-up": "Mover arriba l'elementu", "ooui-outline-control-remove": "Desaniciar elementu", "ooui-toolbar-more": "Más", - "ooui-dialog-confirm-title": "Confirmar", - "ooui-dialog-confirm-default-prompt": "¿Tas seguru?", - "ooui-dialog-confirm-default-ok": "Aceutar", - "ooui-dialog-confirm-default-cancel": "Encaboxar" + "ooui-dialog-message-accept": "Aceutar", + "ooui-dialog-message-reject": "Encaboxar", + "ooui-dialog-process-error": "Daqué funcionó mal", + "ooui-dialog-process-dismiss": "Descartar", + "ooui-dialog-process-retry": "Vuelvi a intentalo" } diff --git a/lib/oojs-ui/i18n/es.json b/lib/oojs-ui/i18n/es.json index 805897d..7660d4a 100644 --- a/lib/oojs-ui/i18n/es.json +++ b/lib/oojs-ui/i18n/es.json @@ -14,7 +14,8 @@ "PoLuX124", "Ralgis", "Thehelpfulone", - "Gloria sah" + "Gloria sah", + "Macofe" ] }, "ooui-outline-control-move-down": "Bajar elemento", @@ -23,5 +24,7 @@ "ooui-toolbar-more": "Más", "ooui-dialog-message-accept": "Aceptar", "ooui-dialog-message-reject": "Cancelar", + "ooui-dialog-process-error": "Algo salió mal", + "ooui-dialog-process-dismiss": "Descartar", "ooui-dialog-process-retry": "Intentar de nuevo" } diff --git a/lib/oojs-ui/i18n/ilo.json b/lib/oojs-ui/i18n/ilo.json index 5d9e3bb..81a91ed 100644 --- a/lib/oojs-ui/i18n/ilo.json +++ b/lib/oojs-ui/i18n/ilo.json @@ -4,13 +4,13 @@ "Lam-ang" ] }, - "ooui-dialog-action-close": "Irekep", "ooui-outline-control-move-down": "Ipababa ti banag", "ooui-outline-control-move-up": "Ipangato ti banag", "ooui-outline-control-remove": "Ikkaten ti banag", "ooui-toolbar-more": "Adu pay", - "ooui-dialog-confirm-title": "Pasingkedan", - "ooui-dialog-confirm-default-prompt": "Siguradoka kadi?", - "ooui-dialog-confirm-default-ok": "Sige", - "ooui-dialog-confirm-default-cancel": "Ukasen" + "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" } diff --git a/lib/oojs-ui/i18n/om.json b/lib/oojs-ui/i18n/om.json index 35e7ee4..c62782e 100644 --- a/lib/oojs-ui/i18n/om.json +++ b/lib/oojs-ui/i18n/om.json @@ -5,9 +5,13 @@ "Tumsaa" ] }, - "ooui-dialog-action-close": "Cufi", "ooui-outline-control-move-down": "Gad buusi", "ooui-outline-control-move-up": "Ol baasi", "ooui-outline-control-remove": "Balleessi", - "ooui-toolbar-more": "Dabalata" + "ooui-toolbar-more": "Dabalata", + "ooui-dialog-message-accept": "Tole", + "ooui-dialog-message-reject": "Dhiisi", + "ooui-dialog-process-error": "Dogoggorri wayii ummameera", + "ooui-dialog-process-dismiss": "Didi", + "ooui-dialog-process-retry": "Itti deebi'ii yaali" } diff --git a/lib/oojs-ui/i18n/qqq.json b/lib/oojs-ui/i18n/qqq.json index e8ab9f9..9b3bb60 100644 --- a/lib/oojs-ui/i18n/qqq.json +++ b/lib/oojs-ui/i18n/qqq.json @@ -24,8 +24,8 @@ "ooui-outline-control-move-up": "Tool tip for a button that moves items in a list up one place", "ooui-outline-control-remove": "Tool tip for a button that removes items from a list.\n{{Identical|Remove item}}", "ooui-toolbar-more": "Label for the toolbar group that contains a list of all other available tools.\n{{Identical|More}}", - "ooui-dialog-message-accept": "Default label for the accept button of a message dialog", - "ooui-dialog-message-reject": "Default label for the reject button of a message dialog", + "ooui-dialog-message-accept": "Default label for the accept button of a message dialog\n{{Identical|OK}}", + "ooui-dialog-message-reject": "Default label for the reject button of a message dialog\n{{Identical|Cancel}}", "ooui-dialog-process-error": "Title for process dialog error description", "ooui-dialog-process-dismiss": "Label for process dialog dismiss error button, visible when describing errors\n{{Identical|Dismiss}}", "ooui-dialog-process-retry": "Label for process dialog retry action button, visible when describing recoverable errors\n{{Identical|Try again}}" diff --git a/lib/oojs-ui/i18n/yi.json b/lib/oojs-ui/i18n/yi.json index e26af70..a850fce 100644 --- a/lib/oojs-ui/i18n/yi.json +++ b/lib/oojs-ui/i18n/yi.json @@ -13,5 +13,6 @@ "ooui-dialog-message-accept": "יאָ", "ooui-dialog-message-reject": "אַנולירן", "ooui-dialog-process-error": "עפעס איז דורכגעפאלן", + "ooui-dialog-process-dismiss": "צומאַכן", "ooui-dialog-process-retry": "פרובירט נאכאמאל" } diff --git a/lib/oojs-ui/i18n/zh-hant.json b/lib/oojs-ui/i18n/zh-hant.json index 255658b..05fb20d 100644 --- a/lib/oojs-ui/i18n/zh-hant.json +++ b/lib/oojs-ui/i18n/zh-hant.json @@ -16,13 +16,13 @@ "Cwlin0416" ] }, - "ooui-dialog-action-close": "關閉", "ooui-outline-control-move-down": "項目下移", "ooui-outline-control-move-up": "項目上移", "ooui-outline-control-remove": "移除項目", "ooui-toolbar-more": "更多", - "ooui-dialog-confirm-title": "確認", - "ooui-dialog-confirm-default-prompt": "您確定嗎？", - "ooui-dialog-confirm-default-ok": "確定", - "ooui-dialog-confirm-default-cancel": "取消" + "ooui-dialog-message-accept": "確定", + "ooui-dialog-message-reject": "取消", + "ooui-dialog-process-error": "發生不明錯誤", + "ooui-dialog-process-dismiss": "放棄", + "ooui-dialog-process-retry": "再試一次" } diff --git a/lib/oojs-ui/oojs-ui-agora.css b/lib/oojs-ui/oojs-ui-agora.css index 71915c2..fe55b19 100644 --- a/lib/oojs-ui/oojs-ui-agora.css +++ b/lib/oojs-ui/oojs-ui-agora.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (97dbb50137) + * OOjs UI v0.1.0-pre (9cd400e3d5) * 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-07-16T22:10:07Z + * Date: 2014-07-22T21:55:25Z */ .oo-ui-dialog-content > .oo-ui-window-head, .oo-ui-dialog-content > .oo-ui-window-body, @@ -221,6 +221,14 @@ margin-top: -0.125em; } +.oo-ui-processDialog-actions-safe .oo-ui-actionWidget.oo-ui-buttonedElement-framed, +.oo-ui-processDialog-actions-primary .oo-ui-actionWidget.oo-ui-buttonedElement-framed, +.oo-ui-processDialog-actions-other .oo-ui-actionWidget.oo-ui-buttonedElement-framed { + margin: 0.75em 0 0.75em 0.75em; + border: solid 1px #ccc; + border-radius: 0.25em; +} + .oo-ui-processDialog-actions-safe .oo-ui-actionWidget.oo-ui-buttonedElement-framed .oo-ui-buttonedElement-button, .oo-ui-processDialog-actions-primary .oo-ui-actionWidget.oo-ui-buttonedElement-framed .oo-ui-buttonedElement-button, .oo-ui-processDialog-actions-other .oo-ui-actionWidget.oo-ui-buttonedElement-framed .oo-ui-buttonedElement-button { @@ -241,6 +249,18 @@ .oo-ui-processDialog-actions-safe .oo-ui-actionWidget:active, .oo-ui-processDialog-actions-primary .oo-ui-actionWidget:active { background-color: rgba(0, 0, 0, 0.1); +} + +.oo-ui-processDialog-actions-safe .oo-ui-actionWidget.oo-ui-buttonedElement-framed, +.oo-ui-processDialog-actions-primary .oo-ui-actionWidget.oo-ui-buttonedElement-framed { + margin: 0.75em; +} + +.oo-ui-processDialog-actions-safe .oo-ui-actionWidget.oo-ui-buttonedElement-framed .oo-ui-buttonedElement-button, +.oo-ui-processDialog-actions-primary .oo-ui-actionWidget.oo-ui-buttonedElement-framed .oo-ui-buttonedElement-button { + /* Adjust for border so text aligns with title */ + + margin: -1px; } .oo-ui-processDialog-actions-safe .oo-ui-actionWidget.oo-ui-flaggableElement-primary:hover, @@ -292,16 +312,6 @@ .oo-ui-processDialog-actions-primary .oo-ui-actionWidget.oo-ui-iconedElement .oo-ui-labeledElement-label { padding-right: 2.25em; -} - -.oo-ui-processDialog-actions-other:not(:empty) { - padding: 0.75em; -} - -.oo-ui-processDialog-actions-other:not(:empty) .oo-ui-actionWidget { - margin: 0 0.75em 0 0; - border: solid 1px #ccc; - border-radius: 0.25em; } .oo-ui-processDialog > .oo-ui-window-frame { diff --git a/lib/oojs-ui/oojs-ui-agora.rtl.css b/lib/oojs-ui/oojs-ui-agora.rtl.css index 32494ca..73a3ba0 100644 --- a/lib/oojs-ui/oojs-ui-agora.rtl.css +++ b/lib/oojs-ui/oojs-ui-agora.rtl.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (97dbb50137) + * OOjs UI v0.1.0-pre (9cd400e3d5) * 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-07-16T22:10:07Z + * Date: 2014-07-22T21:55:25Z */ .oo-ui-dialog-content > .oo-ui-window-head, .oo-ui-dialog-content > .oo-ui-window-body, @@ -221,6 +221,14 @@ margin-top: -0.125em; } +.oo-ui-processDialog-actions-safe .oo-ui-actionWidget.oo-ui-buttonedElement-framed, +.oo-ui-processDialog-actions-primary .oo-ui-actionWidget.oo-ui-buttonedElement-framed, +.oo-ui-processDialog-actions-other .oo-ui-actionWidget.oo-ui-buttonedElement-framed { + margin: 0.75em 0.75em 0.75em 0; + border: solid 1px #ccc; + border-radius: 0.25em; +} + .oo-ui-processDialog-actions-safe .oo-ui-actionWidget.oo-ui-buttonedElement-framed .oo-ui-buttonedElement-button, .oo-ui-processDialog-actions-primary .oo-ui-actionWidget.oo-ui-buttonedElement-framed .oo-ui-buttonedElement-button, .oo-ui-processDialog-actions-other .oo-ui-actionWidget.oo-ui-buttonedElement-framed .oo-ui-buttonedElement-button { @@ -241,6 +249,18 @@ .oo-ui-processDialog-actions-safe .oo-ui-actionWidget:active, .oo-ui-processDialog-actions-primary .oo-ui-actionWidget:active { background-color: rgba(0, 0, 0, 0.1); +} + +.oo-ui-processDialog-actions-safe .oo-ui-actionWidget.oo-ui-buttonedElement-framed, +.oo-ui-processDialog-actions-primary .oo-ui-actionWidget.oo-ui-buttonedElement-framed { + margin: 0.75em; +} + +.oo-ui-processDialog-actions-safe .oo-ui-actionWidget.oo-ui-buttonedElement-framed .oo-ui-buttonedElement-button, +.oo-ui-processDialog-actions-primary .oo-ui-actionWidget.oo-ui-buttonedElement-framed .oo-ui-buttonedElement-button { + /* Adjust for border so text aligns with title */ + + margin: -1px; } .oo-ui-processDialog-actions-safe .oo-ui-actionWidget.oo-ui-flaggableElement-primary:hover, @@ -292,16 +312,6 @@ .oo-ui-processDialog-actions-primary .oo-ui-actionWidget.oo-ui-iconedElement .oo-ui-labeledElement-label { padding-left: 2.25em; -} - -.oo-ui-processDialog-actions-other:not(:empty) { - padding: 0.75em; -} - -.oo-ui-processDialog-actions-other:not(:empty) .oo-ui-actionWidget { - margin: 0 0 0 0.75em; - border: solid 1px #ccc; - border-radius: 0.25em; } .oo-ui-processDialog > .oo-ui-window-frame { diff --git a/lib/oojs-ui/oojs-ui-apex.css b/lib/oojs-ui/oojs-ui-apex.css index 52bda5a..fa93350 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 (97dbb50137) + * OOjs UI v0.1.0-pre (9cd400e3d5) * 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-07-16T22:10:07Z + * Date: 2014-07-22T21:55:25Z */ .oo-ui-dialog-content > .oo-ui-window-head, .oo-ui-dialog-content > .oo-ui-window-body, @@ -251,7 +251,7 @@ .oo-ui-processDialog-location { height: 1.9em; - padding: 0.75em 0; + padding: 0.25em 0; text-align: center; cursor: default; } @@ -284,16 +284,17 @@ margin-top: -0.125em; } +.oo-ui-processDialog-actions-safe .oo-ui-actionWidget.oo-ui-buttonedElement-framed, +.oo-ui-processDialog-actions-primary .oo-ui-actionWidget.oo-ui-buttonedElement-framed, +.oo-ui-processDialog-actions-other .oo-ui-actionWidget.oo-ui-buttonedElement-framed { + margin: 0.75em 0 0.75em 0.75em; +} + .oo-ui-processDialog-actions-safe .oo-ui-actionWidget.oo-ui-buttonedElement-framed .oo-ui-buttonedElement-button, .oo-ui-processDialog-actions-primary .oo-ui-actionWidget.oo-ui-buttonedElement-framed .oo-ui-buttonedElement-button, .oo-ui-processDialog-actions-other .oo-ui-actionWidget.oo-ui-buttonedElement-framed .oo-ui-buttonedElement-button { padding: 0; vertical-align: middle; -} - -.oo-ui-processDialog-actions-safe.oo-ui-buttonedElement-framed .oo-ui-buttonedElement-button, -.oo-ui-processDialog-actions-primary.oo-ui-buttonedElement-framed .oo-ui-buttonedElement-button { - margin: 0.75em; } .oo-ui-processDialog-actions-safe .oo-ui-actionWidget:hover, @@ -304,6 +305,18 @@ .oo-ui-processDialog-actions-safe .oo-ui-actionWidget:active, .oo-ui-processDialog-actions-primary .oo-ui-actionWidget:active { background-color: rgba(0, 0, 0, 0.1); +} + +.oo-ui-processDialog-actions-safe .oo-ui-actionWidget.oo-ui-buttonedElement-framed, +.oo-ui-processDialog-actions-primary .oo-ui-actionWidget.oo-ui-buttonedElement-framed { + margin: 0.75em; +} + +.oo-ui-processDialog-actions-safe .oo-ui-actionWidget.oo-ui-buttonedElement-framed .oo-ui-buttonedElement-button, +.oo-ui-processDialog-actions-primary .oo-ui-actionWidget.oo-ui-buttonedElement-framed .oo-ui-buttonedElement-button { + /* Adjust for border so text aligns with title */ + + margin: -1px; } .oo-ui-processDialog-actions-safe .oo-ui-actionWidget.oo-ui-flaggableElement-primary:hover, @@ -355,14 +368,6 @@ .oo-ui-processDialog-actions-primary .oo-ui-actionWidget.oo-ui-iconedElement .oo-ui-labeledElement-label { padding-right: 2.25em; -} - -.oo-ui-processDialog-actions-other:not(:empty) { - padding: 0.75em; -} - -.oo-ui-processDialog-actions-other:not(:empty) .oo-ui-actionWidget { - margin: 0 0.75em 0 0; } .oo-ui-processDialog > .oo-ui-window-frame { diff --git a/lib/oojs-ui/oojs-ui-apex.rtl.css b/lib/oojs-ui/oojs-ui-apex.rtl.css index 1e6d1d1..66777a6 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 (97dbb50137) + * OOjs UI v0.1.0-pre (9cd400e3d5) * 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-07-16T22:10:07Z + * Date: 2014-07-22T21:55:25Z */ .oo-ui-dialog-content > .oo-ui-window-head, .oo-ui-dialog-content > .oo-ui-window-body, @@ -251,7 +251,7 @@ .oo-ui-processDialog-location { height: 1.9em; - padding: 0.75em 0; + padding: 0.25em 0; text-align: center; cursor: default; } @@ -284,16 +284,17 @@ margin-top: -0.125em; } +.oo-ui-processDialog-actions-safe .oo-ui-actionWidget.oo-ui-buttonedElement-framed, +.oo-ui-processDialog-actions-primary .oo-ui-actionWidget.oo-ui-buttonedElement-framed, +.oo-ui-processDialog-actions-other .oo-ui-actionWidget.oo-ui-buttonedElement-framed { + margin: 0.75em 0.75em 0.75em 0; +} + .oo-ui-processDialog-actions-safe .oo-ui-actionWidget.oo-ui-buttonedElement-framed .oo-ui-buttonedElement-button, .oo-ui-processDialog-actions-primary .oo-ui-actionWidget.oo-ui-buttonedElement-framed .oo-ui-buttonedElement-button, .oo-ui-processDialog-actions-other .oo-ui-actionWidget.oo-ui-buttonedElement-framed .oo-ui-buttonedElement-button { padding: 0; vertical-align: middle; -} - -.oo-ui-processDialog-actions-safe.oo-ui-buttonedElement-framed .oo-ui-buttonedElement-button, -.oo-ui-processDialog-actions-primary.oo-ui-buttonedElement-framed .oo-ui-buttonedElement-button { - margin: 0.75em; } .oo-ui-processDialog-actions-safe .oo-ui-actionWidget:hover, @@ -304,6 +305,18 @@ .oo-ui-processDialog-actions-safe .oo-ui-actionWidget:active, .oo-ui-processDialog-actions-primary .oo-ui-actionWidget:active { background-color: rgba(0, 0, 0, 0.1); +} + +.oo-ui-processDialog-actions-safe .oo-ui-actionWidget.oo-ui-buttonedElement-framed, +.oo-ui-processDialog-actions-primary .oo-ui-actionWidget.oo-ui-buttonedElement-framed { + margin: 0.75em; +} + +.oo-ui-processDialog-actions-safe .oo-ui-actionWidget.oo-ui-buttonedElement-framed .oo-ui-buttonedElement-button, +.oo-ui-processDialog-actions-primary .oo-ui-actionWidget.oo-ui-buttonedElement-framed .oo-ui-buttonedElement-button { + /* Adjust for border so text aligns with title */ + + margin: -1px; } .oo-ui-processDialog-actions-safe .oo-ui-actionWidget.oo-ui-flaggableElement-primary:hover, @@ -355,14 +368,6 @@ .oo-ui-processDialog-actions-primary .oo-ui-actionWidget.oo-ui-iconedElement .oo-ui-labeledElement-label { padding-left: 2.25em; -} - -.oo-ui-processDialog-actions-other:not(:empty) { - padding: 0.75em; -} - -.oo-ui-processDialog-actions-other:not(:empty) .oo-ui-actionWidget { - margin: 0 0 0 0.75em; } .oo-ui-processDialog > .oo-ui-window-frame { diff --git a/lib/oojs-ui/oojs-ui.js b/lib/oojs-ui/oojs-ui.js index d408a4a..859b92d 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 (97dbb50137) + * OOjs UI v0.1.0-pre (9cd400e3d5) * 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-07-16T22:10:07Z + * Date: 2014-07-22T21:55:25Z */ ( function ( OO ) { @@ -1920,7 +1920,7 @@ var win = this, deferred = $.Deferred(); - this.frame.$content.focus(); + this.frame.$content[0].focus(); this.getReadyProcess( data ).execute().done( function () { // Force redraw by asking the browser to measure the elements' widths win.$element.addClass( 'oo-ui-window-ready' ).width(); @@ -1945,7 +1945,10 @@ deferred = $.Deferred(); this.getHoldProcess( data ).execute().done( function () { - win.frame.$content.find( ':focus' ).blur(); + var $focused = win.frame.$content.find( ':focus' ); + if ( $focused.length ) { + $focused[0].blur(); + } // Force redraw by asking the browser to measure the elements' widths win.$element.removeClass( 'oo-ui-window-ready' ).width(); win.frame.$content.removeClass( 'oo-ui-window-content-ready' ).width(); @@ -3549,9 +3552,10 @@ var buffer = 10, cOffset = this.$clippable.offset(), - ccOffset = this.$clippableContainer.offset() || { 'top': 0, 'left': 0 }, - ccHeight = this.$clippableContainer.innerHeight() - buffer, - ccWidth = this.$clippableContainer.innerWidth() - buffer, + $container = this.$clippableContainer.is( 'body' ) ? this.$clippableWindow : this.$clippableContainer, + ccOffset = $container.offset() || { 'top': 0, 'left': 0 }, + ccHeight = $container.innerHeight() - buffer, + ccWidth = $container.innerWidth() - buffer, scrollTop = this.$clippableScroller.scrollTop(), scrollLeft = this.$clippableScroller.scrollLeft(), desiredWidth = ( ccOffset.left + scrollLeft + ccWidth ) - cOffset.left, @@ -5157,8 +5161,8 @@ OO.ui.MessageDialog.static.message = null; OO.ui.MessageDialog.static.actions = [ - { 'label': OO.ui.deferMsg( 'ooui-dialog-message-accept' ), 'flags': 'primary' }, - { 'label': OO.ui.deferMsg( 'ooui-dialog-message-reject' ), 'flags': 'safe' } + { 'action': 'accept', 'label': OO.ui.deferMsg( 'ooui-dialog-message-accept' ), 'flags': 'primary' }, + { 'action': 'reject', 'label': OO.ui.deferMsg( 'ooui-dialog-message-reject' ), 'flags': 'safe' } ]; /* Methods */ @@ -5455,7 +5459,7 @@ others = this.actions.getOthers(); if ( special.primary ) { this.$primaryActions.append( special.primary.$element ); - special.primary.toggleFramed( false ); + special.primary.toggleFramed( true ); } if ( others.length ) { for ( i = 0, len = others.length; i < len; i++ ) { @@ -5466,7 +5470,7 @@ } if ( special.safe ) { this.$safeActions.append( special.safe.$element ); - special.safe.toggleFramed( false ); + special.safe.toggleFramed( true ); } this.fitLabel(); @@ -5657,13 +5661,16 @@ * @param {OO.ui.PanelLayout|null} page The page panel that is now the current panel */ OO.ui.BookletLayout.prototype.onStackLayoutSet = function ( page ) { - var layout = this; + var $input, layout = this; if ( page ) { page.scrollElementIntoView( { 'complete': function () { if ( layout.autoFocus ) { // Set focus to the first input if nothing on the page is focused yet if ( !page.$element.find( ':focus' ).length ) { - page.$element.find( ':input:first' ).focus(); + $input = page.$element.find( ':input:first' ); + if ( $input.length ) { + $input[0].focus(); + } } } } } ); @@ -5914,6 +5921,7 @@ */ OO.ui.BookletLayout.prototype.setPage = function ( name ) { var selectedItem, + $focused, page = this.pages[name]; if ( name !== this.currentPageName ) { @@ -5930,7 +5938,10 @@ // is not needed if the next page has something focusable because once it is focused // this blur happens automatically if ( this.autoFocus && !page.$element.find( ':input' ).length ) { - this.pages[this.currentPageName].$element.find( ':focus' ).blur(); + $focused = this.pages[this.currentPageName].$element.find( ':focus' ); + if ( $focused.length ) { + $focused[0].blur(); + } } } this.currentPageName = name; @@ -8283,7 +8294,7 @@ if ( this.$input.is( ':checkbox,:radio' ) ) { this.$input.click(); } else if ( this.$input.is( ':input' ) ) { - this.$input.focus(); + this.$input[0].focus(); } } }; @@ -8328,7 +8339,7 @@ * @chainable */ OO.ui.InputWidget.prototype.focus = function () { - this.$input.focus(); + this.$input[0].focus(); return this; }; @@ -8338,7 +8349,7 @@ * @chainable */ OO.ui.InputWidget.prototype.blur = function () { - this.$input.blur(); + this.$input[0].blur(); return this; }; @@ -8449,7 +8460,7 @@ this.$( '<span>' ) .addClass( 'oo-ui-textInputWidget-icon oo-ui-icon-' + config.icon ) .mousedown( function () { - widget.$input.focus(); + widget.$input[0].focus(); return false; } ) ); @@ -8457,6 +8468,7 @@ if ( config.placeholder ) { this.$input.attr( 'placeholder', config.placeholder ); } + this.$element.attr( 'role', 'textbox' ); }; /* Setup */ @@ -8712,6 +8724,7 @@ this.$element .data( 'oo-ui-optionWidget', this ) .attr( 'rel', config.rel ) + .attr( 'role', 'option' ) .addClass( 'oo-ui-optionWidget' ) .append( this.$label ); this.$element @@ -8982,7 +8995,9 @@ OO.ui.MenuItemWidget.super.call( this, data, config ); // Initialization - this.$element.addClass( 'oo-ui-menuItemWidget' ); + this.$element + .attr( 'role', 'menuitem' ) + .addClass( 'oo-ui-menuItemWidget' ); }; /* Setup */ @@ -10158,6 +10173,7 @@ // Initialization this.$element .hide() + .attr( 'role', 'menu' ) .addClass( 'oo-ui-menuWidget' ); }; @@ -10330,7 +10346,7 @@ // Change focus to enable keyboard navigation if ( this.isolated && this.$input && !this.$input.is( ':focus' ) ) { this.$previousFocus = this.$( ':focus' ); - this.$input.focus(); + this.$input[0].focus(); } if ( this.newItems && this.newItems.length ) { for ( i = 0, len = this.newItems.length; i < len; i++ ) { @@ -10349,7 +10365,7 @@ } else { this.unbindKeyDownListener(); if ( this.isolated && this.$previousFocus ) { - this.$previousFocus.focus(); + this.$previousFocus[0].focus(); this.$previousFocus = null; } this.getElementDocument().removeEventListener( diff --git a/lib/oojs-ui/oojs-ui.rtl.css b/lib/oojs-ui/oojs-ui.rtl.css index 6794c83..b56dc13 100644 --- a/lib/oojs-ui/oojs-ui.rtl.css +++ b/lib/oojs-ui/oojs-ui.rtl.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (97dbb50137) + * OOjs UI v0.1.0-pre (9cd400e3d5) * 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-07-16T22:10:07Z + * Date: 2014-07-22T21:55:25Z */ /* Textures */ @@ -112,13 +112,13 @@ line-height: 1em; } -> .oo-ui-window-frame { +.oo-ui-window > .oo-ui-window-frame { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; } -> .oo-ui-window-frame > .oo-ui-frame { +.oo-ui-window > .oo-ui-window-frame > .oo-ui-frame { width: 100%; height: 100%; } @@ -163,11 +163,6 @@ max-height: 100%; margin: auto; overflow: hidden; -} - -.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-setup > .oo-ui-window-frame .oo-ui-frame { - width: 100%; - height: 100%; } .oo-ui-windowManager-fullscreen > .oo-ui-dialog > .oo-ui-window-frame { diff --git a/lib/oojs-ui/oojs-ui.svg.css b/lib/oojs-ui/oojs-ui.svg.css index 3a37670..011ffc3 100644 --- a/lib/oojs-ui/oojs-ui.svg.css +++ b/lib/oojs-ui/oojs-ui.svg.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (97dbb50137) + * OOjs UI v0.1.0-pre (9cd400e3d5) * 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-07-16T22:10:07Z + * Date: 2014-07-22T21:55:25Z */ /* Textures */ @@ -112,13 +112,13 @@ line-height: 1em; } -> .oo-ui-window-frame { +.oo-ui-window > .oo-ui-window-frame { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; } -> .oo-ui-window-frame > .oo-ui-frame { +.oo-ui-window > .oo-ui-window-frame > .oo-ui-frame { width: 100%; height: 100%; } @@ -163,11 +163,6 @@ max-height: 100%; margin: auto; overflow: hidden; -} - -.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-setup > .oo-ui-window-frame .oo-ui-frame { - width: 100%; - height: 100%; } .oo-ui-windowManager-fullscreen > .oo-ui-dialog > .oo-ui-window-frame { diff --git a/lib/oojs-ui/oojs-ui.svg.rtl.css b/lib/oojs-ui/oojs-ui.svg.rtl.css index 6c7d441..8a40f53 100644 --- a/lib/oojs-ui/oojs-ui.svg.rtl.css +++ b/lib/oojs-ui/oojs-ui.svg.rtl.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (97dbb50137) + * OOjs UI v0.1.0-pre (9cd400e3d5) * 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-07-16T22:10:07Z + * Date: 2014-07-22T21:55:25Z */ /* Textures */ @@ -112,13 +112,13 @@ line-height: 1em; } -> .oo-ui-window-frame { +.oo-ui-window > .oo-ui-window-frame { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; } -> .oo-ui-window-frame > .oo-ui-frame { +.oo-ui-window > .oo-ui-window-frame > .oo-ui-frame { width: 100%; height: 100%; } @@ -163,11 +163,6 @@ max-height: 100%; margin: auto; overflow: hidden; -} - -.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-setup > .oo-ui-window-frame .oo-ui-frame { - width: 100%; - height: 100%; } .oo-ui-windowManager-fullscreen > .oo-ui-dialog > .oo-ui-window-frame { -- To view, visit https://gerrit.wikimedia.org/r/148521 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I56a21b2d652cc31748b369f26c0dc1cf5e0e81e2 Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: master Gerrit-Owner: Jforrester <[email protected]> Gerrit-Reviewer: Catrope <[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
