From 6c03dceae4ed465e0daaa40359022a6c6cfa6b39 Mon Sep 17 00:00:00 2001 From: "James D. Forrester" Date: Mon, 3 Mar 2014 16:15:57 -0800 Subject: [PATCH] Update OOjs UI to v0.1.0-pre (f3bc5c6) New changes: 3372b3d Localisation updates from https://translatewiki.net. d02bccd Localisation updates from https://translatewiki.net. e01b627 Convert remaining browser-prefixed rules to LESS mixins 0e1cbd9 Allow focusing of inputs in booklet layouts without continuous pages e87a54e Add maxrows option to OO.ui.TextInputWidget f3bc5c6 Adjust the size when a textarea is inserted into the DOM Change-Id: I166c49e69bf49bf1d76dee85355a406f557e6004 --- resources/oojs-ui/i18n/bg.json | 4 +- resources/oojs-ui/i18n/de.json | 1 + resources/oojs-ui/i18n/fr.json | 1 + resources/oojs-ui/i18n/hsb.json | 1 + resources/oojs-ui/i18n/it.json | 1 + resources/oojs-ui/i18n/ja.json | 1 + resources/oojs-ui/i18n/mk.json | 1 + resources/oojs-ui/i18n/om.json | 1 + resources/oojs-ui/i18n/pl.json | 4 +- resources/oojs-ui/i18n/qqq.json | 2 +- resources/oojs-ui/i18n/ro.json | 1 + resources/oojs-ui/i18n/ru.json | 1 + resources/oojs-ui/i18n/sl.json | 1 + resources/oojs-ui/i18n/sr-ec.json | 1 + resources/oojs-ui/i18n/zh-hans.json | 1 + resources/oojs-ui/i18n/zh-hant.json | 1 + resources/oojs-ui/oojs-ui.js | 57 ++++++++++++++++------------- resources/oojs-ui/oojs-ui.svg.css | 24 ++++++------ 18 files changed, 63 insertions(+), 41 deletions(-) diff --git a/resources/oojs-ui/i18n/bg.json b/resources/oojs-ui/i18n/bg.json index 67e664b81b..939719b4da 100644 --- a/resources/oojs-ui/i18n/bg.json +++ b/resources/oojs-ui/i18n/bg.json @@ -3,9 +3,11 @@ "authors": [ "DCLXVI", "Hristofor.mirchev", - "පසිඳු කාවින්ද" + "පසිඳු කාවින්ද", + "Mitzev" ] }, "ooui-dialog-action-close": "Затваряне", + "ooui-outline-control-remove": "Премахване на обекти", "ooui-toolbar-more": "Още" } \ No newline at end of file diff --git a/resources/oojs-ui/i18n/de.json b/resources/oojs-ui/i18n/de.json index 3a66648534..bed2b2c682 100644 --- a/resources/oojs-ui/i18n/de.json +++ b/resources/oojs-ui/i18n/de.json @@ -16,5 +16,6 @@ "ooui-dialog-action-close": "Schließen", "ooui-outline-control-move-down": "Element nach unten verschieben", "ooui-outline-control-move-up": "Element nach oben verschieben", + "ooui-outline-control-remove": "Element entfernen", "ooui-toolbar-more": "Mehr" } \ No newline at end of file diff --git a/resources/oojs-ui/i18n/fr.json b/resources/oojs-ui/i18n/fr.json index eb24b5a60b..7674d2f404 100644 --- a/resources/oojs-ui/i18n/fr.json +++ b/resources/oojs-ui/i18n/fr.json @@ -31,5 +31,6 @@ "ooui-dialog-action-close": "Fermer", "ooui-outline-control-move-down": "Faire descendre l’élément", "ooui-outline-control-move-up": "Faire monter l’élément", + "ooui-outline-control-remove": "Supprimer l’élément", "ooui-toolbar-more": "Plus" } \ No newline at end of file diff --git a/resources/oojs-ui/i18n/hsb.json b/resources/oojs-ui/i18n/hsb.json index b20c5f379a..f674cd2e1f 100644 --- a/resources/oojs-ui/i18n/hsb.json +++ b/resources/oojs-ui/i18n/hsb.json @@ -8,5 +8,6 @@ "ooui-dialog-action-close": "Začinić", "ooui-outline-control-move-down": "Zapisk dele přesunyć", "ooui-outline-control-move-up": "Zapisk horje přesunyć", + "ooui-outline-control-remove": "Zapisk wotstronić", "ooui-toolbar-more": "Wjace" } \ No newline at end of file diff --git a/resources/oojs-ui/i18n/it.json b/resources/oojs-ui/i18n/it.json index 6158cfff3a..747ec79181 100644 --- a/resources/oojs-ui/i18n/it.json +++ b/resources/oojs-ui/i18n/it.json @@ -17,5 +17,6 @@ "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" } \ No newline at end of file diff --git a/resources/oojs-ui/i18n/ja.json b/resources/oojs-ui/i18n/ja.json index 789fbeb4f9..c7c085123b 100644 --- a/resources/oojs-ui/i18n/ja.json +++ b/resources/oojs-ui/i18n/ja.json @@ -10,5 +10,6 @@ "ooui-dialog-action-close": "閉じる", "ooui-outline-control-move-down": "項目を下に移動させる", "ooui-outline-control-move-up": "項目を上に移動させる", + "ooui-outline-control-remove": "項目を除去", "ooui-toolbar-more": "その他" } \ No newline at end of file diff --git a/resources/oojs-ui/i18n/mk.json b/resources/oojs-ui/i18n/mk.json index b363a45eb3..22fd037f7d 100644 --- a/resources/oojs-ui/i18n/mk.json +++ b/resources/oojs-ui/i18n/mk.json @@ -9,5 +9,6 @@ "ooui-dialog-action-close": "Затвори", "ooui-outline-control-move-down": "Помести надолу", "ooui-outline-control-move-up": "Помести нагоре", + "ooui-outline-control-remove": "Отстрани ставка", "ooui-toolbar-more": "Повеќе" } \ No newline at end of file diff --git a/resources/oojs-ui/i18n/om.json b/resources/oojs-ui/i18n/om.json index dca7b7d4b7..cd22c402ae 100644 --- a/resources/oojs-ui/i18n/om.json +++ b/resources/oojs-ui/i18n/om.json @@ -8,5 +8,6 @@ "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" } \ No newline at end of file diff --git a/resources/oojs-ui/i18n/pl.json b/resources/oojs-ui/i18n/pl.json index ba33322d1d..8798603957 100644 --- a/resources/oojs-ui/i18n/pl.json +++ b/resources/oojs-ui/i18n/pl.json @@ -12,11 +12,13 @@ "Ty221", "WTM", "Woytecr", - "Wpedzich" + "Wpedzich", + "Jacenty359" ] }, "ooui-dialog-action-close": "Zamknij", "ooui-outline-control-move-down": "Przenieś niżej", "ooui-outline-control-move-up": "Przenieś wyżej", + "ooui-outline-control-remove": "Usuń przedmiot", "ooui-toolbar-more": "Więcej" } \ No newline at end of file diff --git a/resources/oojs-ui/i18n/qqq.json b/resources/oojs-ui/i18n/qqq.json index c5b8ffa140..75bbec41ca 100644 --- a/resources/oojs-ui/i18n/qqq.json +++ b/resources/oojs-ui/i18n/qqq.json @@ -22,6 +22,6 @@ "ooui-dialog-action-close": "Label text for button to exit from dialog.\n\n{{Identical|Close}}", "ooui-outline-control-move-down": "Tool tip for a button that moves items in a list down one place", "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", + "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}}" } \ No newline at end of file diff --git a/resources/oojs-ui/i18n/ro.json b/resources/oojs-ui/i18n/ro.json index 861b2fedff..48929756b9 100644 --- a/resources/oojs-ui/i18n/ro.json +++ b/resources/oojs-ui/i18n/ro.json @@ -10,5 +10,6 @@ "ooui-dialog-action-close": "Închide", "ooui-outline-control-move-down": "Mută elementul mai jos", "ooui-outline-control-move-up": "Mută elementul mai sus", + "ooui-outline-control-remove": "Elimină elementul", "ooui-toolbar-more": "Mai mult" } \ No newline at end of file diff --git a/resources/oojs-ui/i18n/ru.json b/resources/oojs-ui/i18n/ru.json index be7c6a5e7d..f6e76a6ca1 100644 --- a/resources/oojs-ui/i18n/ru.json +++ b/resources/oojs-ui/i18n/ru.json @@ -21,5 +21,6 @@ "ooui-dialog-action-close": "Закрыть", "ooui-outline-control-move-down": "Переместить элемент вниз", "ooui-outline-control-move-up": "Переместить элемент вверх", + "ooui-outline-control-remove": "Удалить пункт", "ooui-toolbar-more": "Ещё" } \ No newline at end of file diff --git a/resources/oojs-ui/i18n/sl.json b/resources/oojs-ui/i18n/sl.json index d5bffd9f48..b14d47b0d6 100644 --- a/resources/oojs-ui/i18n/sl.json +++ b/resources/oojs-ui/i18n/sl.json @@ -10,5 +10,6 @@ "ooui-dialog-action-close": "Zapri", "ooui-outline-control-move-down": "Prestavi predmet nižje", "ooui-outline-control-move-up": "Prestavi predmet višje", + "ooui-outline-control-remove": "Odstrani vnos", "ooui-toolbar-more": "Več" } \ No newline at end of file diff --git a/resources/oojs-ui/i18n/sr-ec.json b/resources/oojs-ui/i18n/sr-ec.json index 973baec975..7eaaacd1ab 100644 --- a/resources/oojs-ui/i18n/sr-ec.json +++ b/resources/oojs-ui/i18n/sr-ec.json @@ -9,5 +9,6 @@ "ooui-dialog-action-close": "Затвори", "ooui-outline-control-move-down": "Премести ставку на доле", "ooui-outline-control-move-up": "Премести ставку на горе", + "ooui-outline-control-remove": "Уклони ставку", "ooui-toolbar-more": "Више" } \ No newline at end of file diff --git a/resources/oojs-ui/i18n/zh-hans.json b/resources/oojs-ui/i18n/zh-hans.json index 46cbae39ea..58e8ebe6d6 100644 --- a/resources/oojs-ui/i18n/zh-hans.json +++ b/resources/oojs-ui/i18n/zh-hans.json @@ -21,5 +21,6 @@ "ooui-dialog-action-close": "关闭", "ooui-outline-control-move-down": "下移项", "ooui-outline-control-move-up": "上移项", + "ooui-outline-control-remove": "移除项", "ooui-toolbar-more": "更多" } \ No newline at end of file diff --git a/resources/oojs-ui/i18n/zh-hant.json b/resources/oojs-ui/i18n/zh-hant.json index 9aace2f511..6e7b12e77f 100644 --- a/resources/oojs-ui/i18n/zh-hant.json +++ b/resources/oojs-ui/i18n/zh-hant.json @@ -18,5 +18,6 @@ "ooui-dialog-action-close": "關閉", "ooui-outline-control-move-down": "向下移項", "ooui-outline-control-move-up": "向上移項", + "ooui-outline-control-remove": "移除項", "ooui-toolbar-more": "更多" } \ No newline at end of file diff --git a/resources/oojs-ui/oojs-ui.js b/resources/oojs-ui/oojs-ui.js index 08fe6aecf7..e915bdf94b 100644 --- a/resources/oojs-ui/oojs-ui.js +++ b/resources/oojs-ui/oojs-ui.js @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (51f922ba17) + * OOjs UI v0.1.0-pre (f3bc5c6) * 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: Fri Feb 28 2014 16:33:26 GMT-0800 (PST) + * Date: Mon Mar 03 2014 17:03:30 GMT-0800 (PST) */ ( function () { @@ -3865,8 +3865,10 @@ OO.ui.BookletLayout = function OoUiBookletLayout( config ) { if ( this.outlined ) { this.outlineWidget.connect( this, { 'select': 'onOutlineWidgetSelect' } ); } - // Event 'focus' does not bubble, but 'focusin' does - this.stackLayout.onDOMEvent( 'focusin', OO.ui.bind( this.onStackLayoutFocus, this ) ); + if ( this.autoFocus ) { + // Event 'focus' does not bubble, but 'focusin' does + this.stackLayout.onDOMEvent( 'focusin', OO.ui.bind( this.onStackLayoutFocus, this ) ); + } // Initialization this.$element.addClass( 'oo-ui-bookletLayout' ); @@ -4185,21 +4187,22 @@ OO.ui.BookletLayout.prototype.setPage = function ( name ) { var selectedItem, page = this.pages[name]; - if ( this.outlined ) { - selectedItem = this.outlineWidget.getSelectedItem(); - if ( selectedItem && selectedItem.getData() !== name ) { - this.outlineWidget.selectItem( this.outlineWidget.getItemFromData( name ) ); + if ( name !== this.currentPageName ) { + if ( this.outlined ) { + selectedItem = this.outlineWidget.getSelectedItem(); + if ( selectedItem && selectedItem.getData() !== name ) { + this.outlineWidget.selectItem( this.outlineWidget.getItemFromData( name ) ); + } } - } - - if ( page ) { - if ( this.currentPageName && this.pages[this.currentPageName] ) { - this.pages[this.currentPageName].setActive( false ); + if ( page ) { + if ( this.currentPageName && this.pages[this.currentPageName] ) { + this.pages[this.currentPageName].setActive( false ); + } + this.currentPageName = name; + this.stackLayout.setItem( page ); + page.setActive( true ); + this.emit( 'set', page ); } - this.currentPageName = name; - this.stackLayout.setItem( page ); - page.setActive( true ); - this.emit( 'set', page ); } }; @@ -4463,18 +4466,20 @@ OO.ui.StackLayout.prototype.clearItems = function () { * @chainable */ OO.ui.StackLayout.prototype.setItem = function ( item ) { - if ( !this.continuous ) { - this.$items.css( 'display', '' ); - } - if ( $.inArray( item, this.items ) !== -1 ) { + if ( item !== this.currentItem ) { if ( !this.continuous ) { - item.$element.css( 'display', 'block' ); + this.$items.css( 'display', '' ); } - } else { - item = null; + if ( $.inArray( item, this.items ) !== -1 ) { + if ( !this.continuous ) { + item.$element.css( 'display', 'block' ); + } + } else { + item = null; + } + this.currentItem = item; + this.emit( 'set', item ); } - this.currentItem = item; - this.emit( 'set', item ); return this; }; diff --git a/resources/oojs-ui/oojs-ui.svg.css b/resources/oojs-ui/oojs-ui.svg.css index 718d960f52..7a227206f2 100644 --- a/resources/oojs-ui/oojs-ui.svg.css +++ b/resources/oojs-ui/oojs-ui.svg.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (51f922ba17) + * OOjs UI v0.1.0-pre (f3bc5c6) * 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: Fri Feb 28 2014 16:33:26 GMT-0800 (PST) + * Date: Mon Mar 03 2014 17:03:30 GMT-0800 (PST) */ /* Textures */ @@ -211,6 +211,7 @@ display: inline-block; -webkit-transition: opacity 200ms; -moz-transition: opacity 200ms; + -ms-transition: opacity 200ms; -o-transition: opacity 200ms; transition: opacity 200ms; } @@ -647,8 +648,8 @@ -webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; - -o-user-select: none; user-select: none; + -webkit-touch-callout: none; } .oo-ui-toolbar-actions .oo-ui-popupWidget { @@ -671,6 +672,7 @@ opacity: 0.125; -webkit-transition: opacity 500ms ease-in-out; -moz-transition: opacity 500ms ease-in-out; + -ms-transition: opacity 500ms ease-in-out; -o-transition: opacity 500ms ease-in-out; transition: opacity 500ms ease-in-out; } @@ -1111,6 +1113,7 @@ -moz-user-select: none; -ms-user-select: none; user-select: none; + -webkit-touch-callout: none; } .oo-ui-outlineItemWidget.oo-ui-optionWidget-selected { @@ -1480,14 +1483,11 @@ } .oo-ui-popupWidget-transitioning .oo-ui-popupWidget-popup { - -webkit-transition: width 100ms, height 100ms, left 100ms; - -moz-transition: width 100ms, height 100ms, left 100ms; - -o-transition: width 100ms, height 100ms, left 100ms; - transition: width 100ms, height 100ms, left 100ms; - -webkit-transition-timing-function: ease-in-out; - -moz-transition-timing-function: ease-in-out; - -o-transition-timing-function: ease-in-out; - transition-timing-function: ease-in-out; + -webkit-transition: width 100ms ease-in-out, height 100ms ease-in-out, left 100ms ease-in-out; + -moz-transition: width 100ms ease-in-out, height 100ms ease-in-out, left 100ms ease-in-out; + -ms-transition: width 100ms ease-in-out, height 100ms ease-in-out, left 100ms ease-in-out; + -o-transition: width 100ms ease-in-out, height 100ms ease-in-out, left 100ms ease-in-out; + transition: width 100ms ease-in-out, height 100ms ease-in-out, left 100ms ease-in-out; } .oo-ui-popupWidget-head { @@ -1805,4 +1805,4 @@ .oo-ui-indicator-up { background-image: /* @embed */ url(images/indicators/up.svg); -} \ No newline at end of file +} -- 2.20.1