Jforrester has uploaded a new change for review. https://gerrit.wikimedia.org/r/146664
Change subject: Update OOjs UI to v0.1.0-pre (a9d6a42680) ...................................................................... Update OOjs UI to v0.1.0-pre (a9d6a42680) New changes: 436ac66 MenuWidget: Add option to specify an extra widget for mouse events e67bb70 Localisation updates from https://translatewiki.net. a2ba412 Mellow out the shadows being applied to dialog content 085d3a5 Split toolbar demo in two and add action button demo, with labels dfd5100 Allow FieldLayouts to have help text 5f30488 Localisation updates from https://translatewiki.net. d544ffe Remove useless documentation, add more useful documentation Change-Id: I430b31ef3d4d66221599ce803cf887331547ec8c --- M lib/oojs-ui/i18n/ar.json M lib/oojs-ui/i18n/cs.json M lib/oojs-ui/i18n/et.json M lib/oojs-ui/i18n/it.json M lib/oojs-ui/i18n/lv.json M lib/oojs-ui/i18n/pl.json M lib/oojs-ui/i18n/sr-ec.json M lib/oojs-ui/i18n/sv.json M lib/oojs-ui/i18n/vi.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 17 files changed, 167 insertions(+), 101 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor refs/changes/64/146664/1 diff --git a/lib/oojs-ui/i18n/ar.json b/lib/oojs-ui/i18n/ar.json index 34f8972..eb13f59 100644 --- a/lib/oojs-ui/i18n/ar.json +++ b/lib/oojs-ui/i18n/ar.json @@ -8,11 +8,12 @@ "Mido", "OsamaK", "زكريا", - "مشعل الحربي" + "مشعل الحربي", + "ترجمان05" ] }, - "ooui-dialog-action-close": "أغلق", "ooui-outline-control-move-down": "انقل العنصر للأسفل", "ooui-outline-control-move-up": "انقل العنصر للأعلى", - "ooui-toolbar-more": "مزيد" + "ooui-toolbar-more": "مزيد", + "ooui-dialog-process-retry": "حاول مرة أخرى" } diff --git a/lib/oojs-ui/i18n/cs.json b/lib/oojs-ui/i18n/cs.json index ca6d5b4..a75cf0b 100644 --- a/lib/oojs-ui/i18n/cs.json +++ b/lib/oojs-ui/i18n/cs.json @@ -13,13 +13,13 @@ "ශ්වෙත" ] }, - "ooui-dialog-action-close": "Zavřít", "ooui-outline-control-move-down": "Přesunout položku dolů", "ooui-outline-control-move-up": "Přesunout položku nahoru", "ooui-outline-control-remove": "Odstranit položku", "ooui-toolbar-more": "Další", - "ooui-dialog-confirm-title": "Potvrzení", - "ooui-dialog-confirm-default-prompt": "Opravdu?", - "ooui-dialog-confirm-default-ok": "OK", - "ooui-dialog-confirm-default-cancel": "Storno" + "ooui-dialog-message-accept": "OK", + "ooui-dialog-message-reject": "Storno", + "ooui-dialog-process-error": "Něco se pokazilo", + "ooui-dialog-process-dismiss": "Zavřít", + "ooui-dialog-process-retry": "Zkusit znovu" } diff --git a/lib/oojs-ui/i18n/et.json b/lib/oojs-ui/i18n/et.json index 164685c..ac3af74 100644 --- a/lib/oojs-ui/i18n/et.json +++ b/lib/oojs-ui/i18n/et.json @@ -5,13 +5,13 @@ "Pikne" ] }, - "ooui-dialog-action-close": "Sule", "ooui-outline-control-move-down": "Liiguta üksust allapoole", "ooui-outline-control-move-up": "Liiguta üksust ülespoole", "ooui-outline-control-remove": "Eemalda üksus", "ooui-toolbar-more": "Veel", - "ooui-dialog-confirm-title": "Kinnitus", - "ooui-dialog-confirm-default-prompt": "Kas oled kindel?", - "ooui-dialog-confirm-default-ok": "Sobib", - "ooui-dialog-confirm-default-cancel": "Loobu" + "ooui-dialog-message-accept": "Sobib", + "ooui-dialog-message-reject": "Loobu", + "ooui-dialog-process-error": "Midagi läks valesti", + "ooui-dialog-process-dismiss": "Hülga", + "ooui-dialog-process-retry": "Proovi uuesti" } diff --git a/lib/oojs-ui/i18n/it.json b/lib/oojs-ui/i18n/it.json index 162fa8c..3d4e049 100644 --- a/lib/oojs-ui/i18n/it.json +++ b/lib/oojs-ui/i18n/it.json @@ -15,13 +15,13 @@ "Ontsed" ] }, - "ooui-dialog-action-close": "Chiudi", "ooui-outline-control-move-down": "Sposta in basso", "ooui-outline-control-move-up": "Sposta in alto", "ooui-outline-control-remove": "Rimuovi elemento", "ooui-toolbar-more": "Altro", - "ooui-dialog-confirm-title": "Conferma", - "ooui-dialog-confirm-default-prompt": "Sei sicuro?", - "ooui-dialog-confirm-default-ok": "OK", - "ooui-dialog-confirm-default-cancel": "Annulla" + "ooui-dialog-message-accept": "OK", + "ooui-dialog-message-reject": "Annulla", + "ooui-dialog-process-error": "Qualcosa è andato storto", + "ooui-dialog-process-dismiss": "Nascondi", + "ooui-dialog-process-retry": "Riprova" } diff --git a/lib/oojs-ui/i18n/lv.json b/lib/oojs-ui/i18n/lv.json index 7ad74dc..32fc9fe 100644 --- a/lib/oojs-ui/i18n/lv.json +++ b/lib/oojs-ui/i18n/lv.json @@ -8,12 +8,10 @@ "PeterisP" ] }, - "ooui-dialog-action-close": "Aizvērt", "ooui-outline-control-move-down": "Pārvietot vienumu uz leju", "ooui-outline-control-move-up": "Pārvietot vienumu uz augšu", "ooui-toolbar-more": "Vairāk", - "ooui-dialog-confirm-title": "Apstiprināt", - "ooui-dialog-confirm-default-prompt": "Vai esat pārliecināts?", - "ooui-dialog-confirm-default-ok": "Labi", - "ooui-dialog-confirm-default-cancel": "Atcelt" + "ooui-dialog-message-accept": "Labi", + "ooui-dialog-message-reject": "Atcelt", + "ooui-dialog-process-retry": "Mēģināt vēlreiz" } diff --git a/lib/oojs-ui/i18n/pl.json b/lib/oojs-ui/i18n/pl.json index 2431096..7978673 100644 --- a/lib/oojs-ui/i18n/pl.json +++ b/lib/oojs-ui/i18n/pl.json @@ -26,5 +26,6 @@ "ooui-dialog-message-accept": "OK", "ooui-dialog-message-reject": "Anuluj", "ooui-dialog-process-error": "Coś poszło nie tak", + "ooui-dialog-process-dismiss": "Ukryj", "ooui-dialog-process-retry": "Spróbuj ponownie" } diff --git a/lib/oojs-ui/i18n/sr-ec.json b/lib/oojs-ui/i18n/sr-ec.json index 308ed84..d653356 100644 --- a/lib/oojs-ui/i18n/sr-ec.json +++ b/lib/oojs-ui/i18n/sr-ec.json @@ -6,13 +6,13 @@ "Милан Јелисавчић" ] }, - "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/i18n/sv.json b/lib/oojs-ui/i18n/sv.json index fbd03de..40305d0 100644 --- a/lib/oojs-ui/i18n/sv.json +++ b/lib/oojs-ui/i18n/sv.json @@ -14,13 +14,13 @@ "Lokal Profil" ] }, - "ooui-dialog-action-close": "Stäng", "ooui-outline-control-move-down": "Flytta ned objekt", "ooui-outline-control-move-up": "Flytta upp objekt", "ooui-outline-control-remove": "Ta bort objekt", "ooui-toolbar-more": "Mer", - "ooui-dialog-confirm-title": "Bekräfta", - "ooui-dialog-confirm-default-prompt": "Är du säker?", - "ooui-dialog-confirm-default-ok": "OK", - "ooui-dialog-confirm-default-cancel": "Avbryt" + "ooui-dialog-message-accept": "OK", + "ooui-dialog-message-reject": "Avbryt", + "ooui-dialog-process-error": "Något gick fel", + "ooui-dialog-process-dismiss": "Stäng", + "ooui-dialog-process-retry": "Försök igen" } diff --git a/lib/oojs-ui/i18n/vi.json b/lib/oojs-ui/i18n/vi.json index 9cc4543..205cbe8 100644 --- a/lib/oojs-ui/i18n/vi.json +++ b/lib/oojs-ui/i18n/vi.json @@ -6,13 +6,13 @@ "Minh Nguyen" ] }, - "ooui-dialog-action-close": "Đóng", "ooui-outline-control-move-down": "Chuyển mục xuống", "ooui-outline-control-move-up": "Chuyển mục lên", "ooui-outline-control-remove": "Xóa khoản", "ooui-toolbar-more": "Thêm", - "ooui-dialog-confirm-title": "Xác nhận", - "ooui-dialog-confirm-default-prompt": "Bạn có chắc chắn?", - "ooui-dialog-confirm-default-ok": "OK", - "ooui-dialog-confirm-default-cancel": "Hủy bỏ" + "ooui-dialog-message-accept": "OK", + "ooui-dialog-message-reject": "Hủy bỏ", + "ooui-dialog-process-error": "Đã bị trục trặc", + "ooui-dialog-process-dismiss": "Bỏ qua", + "ooui-dialog-process-retry": "Thử lại" } diff --git a/lib/oojs-ui/oojs-ui-agora.css b/lib/oojs-ui/oojs-ui-agora.css index a9785a5..c586959 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 (d2451ac748) + * OOjs UI v0.1.0-pre (a9d6a42680) * 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-14T16:49:55Z + * Date: 2014-07-16T00:57:32Z */ .oo-ui-dialog-content .oo-ui-window-closeButton { position: absolute; diff --git a/lib/oojs-ui/oojs-ui-agora.rtl.css b/lib/oojs-ui/oojs-ui-agora.rtl.css index 1f015cf..489ae8d 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 (d2451ac748) + * OOjs UI v0.1.0-pre (a9d6a42680) * 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-14T16:49:55Z + * Date: 2014-07-16T00:57:32Z */ .oo-ui-dialog-content .oo-ui-window-closeButton { position: absolute; diff --git a/lib/oojs-ui/oojs-ui-apex.css b/lib/oojs-ui/oojs-ui-apex.css index 3ba482d..3594315 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 (d2451ac748) + * OOjs UI v0.1.0-pre (a9d6a42680) * 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-14T16:49:55Z + * Date: 2014-07-16T00:57:32Z */ .oo-ui-dialog-content > .oo-ui-window-head, .oo-ui-dialog-content > .oo-ui-window-body, @@ -189,7 +189,7 @@ .oo-ui-messageDialog-content > .oo-ui-window-body { bottom: 3.4em; - box-shadow: 0 0 0.66em rgba(0, 0, 0, 0.25); + box-shadow: 0 0 0.33em rgba(0, 0, 0, 0.33); } .oo-ui-messageDialog-content > .oo-ui-window-foot { @@ -290,7 +290,7 @@ .oo-ui-processDialog-content > .oo-ui-window-body { top: 3.4em; - box-shadow: 0 0 0.66em rgba(0, 0, 0, 0.25); + box-shadow: 0 0 0.33em rgba(0, 0, 0, 0.33); } .oo-ui-processDialog-navigation { diff --git a/lib/oojs-ui/oojs-ui-apex.rtl.css b/lib/oojs-ui/oojs-ui-apex.rtl.css index 446955a..95ecd3e 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 (d2451ac748) + * OOjs UI v0.1.0-pre (a9d6a42680) * 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-14T16:49:55Z + * Date: 2014-07-16T00:57:32Z */ .oo-ui-dialog-content > .oo-ui-window-head, .oo-ui-dialog-content > .oo-ui-window-body, @@ -189,7 +189,7 @@ .oo-ui-messageDialog-content > .oo-ui-window-body { bottom: 3.4em; - box-shadow: 0 0 0.66em rgba(0, 0, 0, 0.25); + box-shadow: 0 0 0.33em rgba(0, 0, 0, 0.33); } .oo-ui-messageDialog-content > .oo-ui-window-foot { @@ -290,7 +290,7 @@ .oo-ui-processDialog-content > .oo-ui-window-body { top: 3.4em; - box-shadow: 0 0 0.66em rgba(0, 0, 0, 0.25); + box-shadow: 0 0 0.33em rgba(0, 0, 0, 0.33); } .oo-ui-processDialog-navigation { diff --git a/lib/oojs-ui/oojs-ui.js b/lib/oojs-ui/oojs-ui.js index b862f76..48dc284 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 (d2451ac748) + * OOjs UI v0.1.0-pre (a9d6a42680) * 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-14T16:49:55Z + * Date: 2014-07-16T00:57:32Z */ ( function ( OO ) { @@ -2915,8 +2915,6 @@ }; /** - * Process error. - * * @abstract * @class * @@ -3282,6 +3280,9 @@ /** * Element with a button. + * + * Buttons are used for controls which can be clicked. They can be configured to use tab indexing + * and access keys for accessibility purposes. * * @abstract * @class @@ -3902,6 +3903,11 @@ /** * Element containing an icon. * + * Icons are graphics, about the size of normal text. They can be used to aid the user in locating + * a control or convey information in a more space efficient way. Icons should rarely be used + * without labels; such as in a toolbar where space is at a premium or within a context where the + * meaning is very clear to the user. + * * @abstract * @class * @@ -3989,6 +3995,11 @@ /** * Element containing an indicator. + * + * Indicators are graphics, smaller than normal text. They can be used to describe unique status or + * behavior. Indicators should only be used in exceptional cases; such as a button that opens a menu + * instead of performing an action directly, or an item in a list which has errors that need to be + * resolved. * * @abstract * @class @@ -4201,7 +4212,7 @@ }; /** - * Popuppable element. + * Element containing an OO.ui.PopupWidget object. * * @abstract * @class @@ -4236,6 +4247,9 @@ /** * Element with a title. + * + * Titles are rendered by the browser and are made visible when hovering the element. Titles are + * not visible on touch devices. * * @abstract * @class @@ -5961,8 +5975,10 @@ * @param {OO.ui.Widget} field Field widget * @param {Object} [config] Configuration options * @cfg {string} [align='left'] Alignment mode, either 'left', 'right', 'top' or 'inline' + * @cfg {string} [help] Explanatory text shown as a '?' icon. */ OO.ui.FieldLayout = function OoUiFieldLayout( field, config ) { + var popupButtonWidget; // Config initialization config = $.extend( { 'align': 'left' }, config ); @@ -5970,7 +5986,22 @@ OO.ui.FieldLayout.super.call( this, config ); // Mixin constructors + this.$help = this.$( '<div>' ); OO.ui.LabeledElement.call( this, this.$( '<label>' ), config ); + if ( config.help ) { + popupButtonWidget = new OO.ui.PopupButtonWidget( $.extend( + { + '$': this.$, + 'frameless': true, + 'icon': 'info', + 'title': config.help + }, + config, + { label: null } + ) ); + popupButtonWidget.getPopup().$body.append( this.getElementDocument().createTextNode( config.help ) ); + this.$help = popupButtonWidget.$element; + } // Properties this.$field = this.$( '<div>' ); @@ -6041,9 +6072,9 @@ } // Reorder elements if ( value === 'inline' ) { - this.$element.append( this.$field, this.$label ); + this.$element.append( this.$field, this.$label, this.$help ); } else { - this.$element.append( this.$label, this.$field ); + this.$element.append( this.$help, this.$label, this.$field ); } // Set classes if ( this.align ) { @@ -6105,7 +6136,7 @@ OO.ui.FieldsetLayout.static.tagName = 'div'; /** - * Form layout. + * Layout with an HTML form. * * @class * @extends OO.ui.Layout @@ -6956,9 +6987,7 @@ }; /** - * Group widget. - * - * Mixin for OO.ui.Widget subclasses. + * Mixin for OO.ui.Widget subclasses to provide OO.ui.GroupElement. * * Use together with OO.ui.ItemWidget to make disabled state inheritable. * @@ -7007,7 +7036,10 @@ }; /** - * Item widget. + * Mixin for widgets used as items in widgets that inherit OO.ui.GroupWidget. + * + * Item widgets have a reference to a OO.ui.GroupWidget while they are attached to the group. This + * allows bidrectional communication. * * Use together with OO.ui.GroupWidget to make disabled state inheritable. * @@ -7052,10 +7084,9 @@ }; /** - * Lookup input widget. + * Mixin that adds a menu showing suggested values for a text input. * - * Mixin that adds a menu showing suggested values to a text input. Subclasses must handle `select` - * and `choose` events on #lookupMenu to make use of selections. + * Subclasses must handle `select` and `choose` events on #lookupMenu to make use of selections. * * @class * @abstract @@ -7289,11 +7320,14 @@ }; /** - * Creates an OO.ui.OutlineControlsWidget object. + * Set of controls for an OO.ui.OutlineWidget. * - * Use together with OO.ui.OutlineWidget.js + * Controls include moving items up and down, removing items, and adding different kinds of items. * * @class + * @extends OO.ui.Widget + * @mixins OO.ui.GroupElement + * @mixins OO.ui.IconedElement * * @constructor * @param {OO.ui.OutlineWidget} outline Outline to control @@ -7403,9 +7437,7 @@ }; /** - * Width with on and off states. - * - * Mixin for widgets with a boolean state. + * Mixin for widgets with a boolean on/off state. * * @abstract * @class @@ -7463,7 +7495,7 @@ }; /** - * Container for multiple related buttons. + * Group widget for multiple related buttons. * * Use together with OO.ui.ButtonWidget. * @@ -7495,7 +7527,7 @@ OO.mixinClass( OO.ui.ButtonGroupWidget, OO.ui.GroupElement ); /** - * Button widget. + * Generic widget for buttons. * * @class * @extends OO.ui.Widget @@ -7657,7 +7689,7 @@ }; /** - * ActionButton widget. + * Button widget that executes an action and is managed by an OO.ui.ActionSet. * * @class * @extends OO.ui.ButtonWidget @@ -7951,6 +7983,8 @@ /** * Indicator widget. * + * See OO.ui.IndicatedElement for more information. + * * @class * @extends OO.ui.Widget * @mixins OO.ui.IndicatedElement @@ -7987,6 +8021,9 @@ /** * Inline menu of options. * + * Inline menus provide a control for accessing a menu and compose a menu within the widget, which + * can be accessed using the #getMenu method. + * * Use with OO.ui.MenuOptionWidget. * * @class @@ -8014,7 +8051,7 @@ OO.ui.TitledElement.call( this, this.$label, config ); // Properties - this.menu = new OO.ui.MenuWidget( $.extend( { '$': this.$ }, config.menu ) ); + this.menu = new OO.ui.MenuWidget( $.extend( { '$': this.$, 'widget': this }, config.menu ) ); this.$handle = this.$( '<span>' ); // Events @@ -8093,7 +8130,7 @@ }; /** - * Input widget. + * Base class for input widgets. * * @abstract * @class @@ -8300,7 +8337,7 @@ }; /** - * Checkbox widget. + * Checkbox input widget. * * @class * @extends OO.ui.InputWidget @@ -8368,7 +8405,7 @@ }; /** - * Text input widget. + * Input widget with a text field. * * @class * @extends OO.ui.InputWidget @@ -8635,9 +8672,7 @@ }; /** - * Option widget. - * - * Use with OO.ui.SelectWidget. + * Generic option widget for use with OO.ui.SelectWidget. * * @class * @extends OO.ui.Widget @@ -8838,7 +8873,7 @@ }; /** - * Option with an option icon and indicator. + * Option widget with an option icon and indicator. * * Use together with OO.ui.SelectWidget. * @@ -8924,9 +8959,7 @@ }; /** - * Menu item widget. - * - * Use with OO.ui.MenuWidget. + * Item of an OO.ui.MenuWidget. * * @class * @extends OO.ui.DecoratedOptionWidget @@ -8951,9 +8984,7 @@ OO.inheritClass( OO.ui.MenuItemWidget, OO.ui.DecoratedOptionWidget ); /** - * Menu section item widget. - * - * Use with OO.ui.MenuWidget. + * Section to group one or more items in a OO.ui.MenuWidget. * * @class * @extends OO.ui.DecoratedOptionWidget @@ -8981,9 +9012,7 @@ OO.ui.MenuSectionItemWidget.static.highlightable = false; /** - * Creates an OO.ui.OutlineItemWidget object. - * - * Use with OO.ui.OutlineWidget. + * Items for an OO.ui.OutlineWidget. * * @class * @extends OO.ui.DecoratedOptionWidget @@ -9381,7 +9410,8 @@ /** * Search widget. * - * Combines query and results selection widgets. + * Search widgets combine a query input, placed above, and a results selection widget, placed below. + * Results are cleared and populated each time the query is changed. * * @class * @extends OO.ui.Widget @@ -9533,7 +9563,10 @@ }; /** - * Selection of options. + * Generic selection of options. + * + * Items can contain any rendering, and are uniquely identified by a has of thier data. Any widget + * that provides options, from which the user must choose one, should be built on this class. * * Use together with OO.ui.OptionWidget. * @@ -10077,7 +10110,10 @@ OO.inheritClass( OO.ui.ButtonSelectWidget, OO.ui.SelectWidget ); /** - * Menu widget. + * Overlaid menu of options. + * + * Menus are clipped to the visible viewport. They do not provide a control for opening or closing + * the menu. * * Use together with OO.ui.MenuItemWidget. * @@ -10088,6 +10124,7 @@ * @constructor * @param {Object} [config] Configuration options * @cfg {OO.ui.InputWidget} [input] Input to bind keyboard handlers to + * @cfg {OO.ui.Widget} [widget] Widget to bind mouse handlers to * @cfg {boolean} [autoHide=true] Hide the menu when the mouse is pressed outside the menu */ OO.ui.MenuWidget = function OoUiMenuWidget( config ) { @@ -10106,6 +10143,7 @@ this.newItems = null; this.autoHide = config.autoHide === undefined || !!config.autoHide; this.$input = config.input ? config.input.$input : null; + this.$widget = config.widget ? config.widget.$element : null; this.$previousFocus = null; this.isolated = !config.input; this.onKeyDownHandler = OO.ui.bind( this.onKeyDown, this ); @@ -10130,7 +10168,7 @@ * @param {jQuery.Event} e Key down event */ OO.ui.MenuWidget.prototype.onDocumentMouseDown = function ( e ) { - if ( !$.contains( this.$element[0], e.target ) ) { + if ( !$.contains( this.$element[0], e.target ) && ( !this.$widget || !$.contains( this.$widget[0], e.target ) ) ) { this.toggle( false ); } }; @@ -10321,6 +10359,10 @@ /** * Menu for a text input widget. * + * This menu is specially designed to be positioned beneeth the text input widget. Even if the input + * is in a different frame, the menu's position is automatically calulated and maintained when the + * menu is toggled or the window is resized. + * * @class * @extends OO.ui.MenuWidget * @@ -10415,7 +10457,7 @@ }; /** - * Create an OO.ui.OutlineWidget object. + * Structured list of items. * * Use with OO.ui.OutlineItemWidget. * diff --git a/lib/oojs-ui/oojs-ui.rtl.css b/lib/oojs-ui/oojs-ui.rtl.css index 24ca88e..495966c 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 (d2451ac748) + * OOjs UI v0.1.0-pre (a9d6a42680) * 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-14T16:49:55Z + * Date: 2014-07-16T00:57:32Z */ /* Textures */ @@ -322,6 +322,14 @@ padding: 0.5em 0; } +.oo-ui-fieldLayout > .oo-ui-popupButtonWidget > .oo-ui-buttonedElement-button > .oo-ui-iconedElement-icon { + margin-top: 0.25em; +} + +.oo-ui-fieldLayout > .oo-ui-popupButtonWidget > .oo-ui-popupWidget > .oo-ui-popupWidget-popup { + z-index: 1; +} + .oo-ui-fieldsetLayout { position: relative; padding: 0; diff --git a/lib/oojs-ui/oojs-ui.svg.css b/lib/oojs-ui/oojs-ui.svg.css index b397d03..54650b8 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 (d2451ac748) + * OOjs UI v0.1.0-pre (a9d6a42680) * 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-14T16:49:55Z + * Date: 2014-07-16T00:57:32Z */ /* Textures */ @@ -322,6 +322,14 @@ padding: 0.5em 0; } +.oo-ui-fieldLayout > .oo-ui-popupButtonWidget > .oo-ui-buttonedElement-button > .oo-ui-iconedElement-icon { + margin-top: 0.25em; +} + +.oo-ui-fieldLayout > .oo-ui-popupButtonWidget > .oo-ui-popupWidget > .oo-ui-popupWidget-popup { + z-index: 1; +} + .oo-ui-fieldsetLayout { position: relative; padding: 0; diff --git a/lib/oojs-ui/oojs-ui.svg.rtl.css b/lib/oojs-ui/oojs-ui.svg.rtl.css index 0241c7b..3b1b40d 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 (d2451ac748) + * OOjs UI v0.1.0-pre (a9d6a42680) * 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-14T16:49:55Z + * Date: 2014-07-16T00:57:32Z */ /* Textures */ @@ -322,6 +322,14 @@ padding: 0.5em 0; } +.oo-ui-fieldLayout > .oo-ui-popupButtonWidget > .oo-ui-buttonedElement-button > .oo-ui-iconedElement-icon { + margin-top: 0.25em; +} + +.oo-ui-fieldLayout > .oo-ui-popupButtonWidget > .oo-ui-popupWidget > .oo-ui-popupWidget-popup { + z-index: 1; +} + .oo-ui-fieldsetLayout { position: relative; padding: 0; -- To view, visit https://gerrit.wikimedia.org/r/146664 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I430b31ef3d4d66221599ce803cf887331547ec8c Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: master Gerrit-Owner: Jforrester <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
