From b3bddf938e6816ebd2e93e3e310e1d65861f6daf Mon Sep 17 00:00:00 2001 From: "James D. Forrester" Date: Wed, 29 Jun 2016 14:32:06 +0100 Subject: [PATCH] Update OOjs UI to v0.17.5 Release notes: https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.17.5 Change-Id: I17caee666b1d1cc2da670e073ef57122a66ecfc6 --- composer.json | 2 +- resources/lib/oojs-ui/i18n/id.json | 7 +- resources/lib/oojs-ui/i18n/inh.json | 24 +++++++ resources/lib/oojs-ui/i18n/jv.json | 24 ++++--- resources/lib/oojs-ui/i18n/ku-latn.json | 1 + resources/lib/oojs-ui/i18n/pnb.json | 21 ++++++ resources/lib/oojs-ui/i18n/sw.json | 3 +- resources/lib/oojs-ui/oojs-ui-apex.js | 4 +- resources/lib/oojs-ui/oojs-ui-core-apex.css | 13 ++-- .../lib/oojs-ui/oojs-ui-core-mediawiki.css | 27 ++++--- resources/lib/oojs-ui/oojs-ui-core.js | 25 +++---- resources/lib/oojs-ui/oojs-ui-mediawiki.js | 4 +- .../lib/oojs-ui/oojs-ui-toolbars-apex.css | 4 +- .../oojs-ui/oojs-ui-toolbars-mediawiki.css | 4 +- resources/lib/oojs-ui/oojs-ui-toolbars.js | 4 +- .../lib/oojs-ui/oojs-ui-widgets-apex.css | 71 +++++++++++-------- .../lib/oojs-ui/oojs-ui-widgets-mediawiki.css | 57 ++++++++------- resources/lib/oojs-ui/oojs-ui-widgets.js | 40 ++++++----- .../lib/oojs-ui/oojs-ui-windows-apex.css | 7 +- .../lib/oojs-ui/oojs-ui-windows-mediawiki.css | 17 +++-- resources/lib/oojs-ui/oojs-ui-windows.js | 10 ++- 21 files changed, 221 insertions(+), 148 deletions(-) create mode 100644 resources/lib/oojs-ui/i18n/inh.json create mode 100644 resources/lib/oojs-ui/i18n/pnb.json diff --git a/composer.json b/composer.json index a2614490c0..0e512a65be 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ "ext-xml": "*", "liuggio/statsd-php-client": "1.0.18", "mediawiki/at-ease": "1.1.0", - "oojs/oojs-ui": "0.17.4", + "oojs/oojs-ui": "0.17.5", "oyejorge/less.php": "1.7.0.10", "php": ">=5.5.9", "psr/log": "1.0.0", diff --git a/resources/lib/oojs-ui/i18n/id.json b/resources/lib/oojs-ui/i18n/id.json index 400a432524..ac7f6c68f3 100644 --- a/resources/lib/oojs-ui/i18n/id.json +++ b/resources/lib/oojs-ui/i18n/id.json @@ -8,7 +8,8 @@ "Kenrick95", "McDutchie", "Rv77ax", - "William Surya Permana" + "William Surya Permana", + "Rachmat.Wahidi" ] }, "ooui-outline-control-move-down": "Pindahkan butir ke bawah", @@ -23,6 +24,8 @@ "ooui-dialog-process-dismiss": "Tutup", "ooui-dialog-process-retry": "Coba lagi", "ooui-dialog-process-continue": "Lanjutkan", + "ooui-selectfile-button-select": "Pilih berkas", "ooui-selectfile-not-supported": "Peilihan berkas tidak didukung", - "ooui-selectfile-placeholder": "Tidak ada berkas yang terpilih" + "ooui-selectfile-placeholder": "Tidak ada berkas yang terpilih", + "ooui-selectfile-dragdrop-placeholder": "Letakkan berkas di sini" } diff --git a/resources/lib/oojs-ui/i18n/inh.json b/resources/lib/oojs-ui/i18n/inh.json new file mode 100644 index 0000000000..a897ed584f --- /dev/null +++ b/resources/lib/oojs-ui/i18n/inh.json @@ -0,0 +1,24 @@ +{ + "@metadata": { + "authors": [ + "Adam-Yourist", + "ElizaMag" + ] + }, + "ooui-outline-control-move-down": "Элемент Iолохеяккха", + "ooui-outline-control-move-up": "Элемент Iолакхеяккха", + "ooui-outline-control-remove": "ДIаяккха пункт", + "ooui-toolbar-more": "Кхы а", + "ooui-toolgroup-expand": "Дукха", + "ooui-toolgroup-collapse": "КӀезига", + "ooui-dialog-message-accept": "ОК", + "ooui-dialog-message-reject": "Эшац", + "ooui-dialog-process-error": "Харцахь хилар цхьа хIама", + "ooui-dialog-process-dismiss": "ДIакъовла", + "ooui-dialog-process-retry": "Кхы цкъа де гIорта", + "ooui-dialog-process-continue": "ДIаьхде", + "ooui-selectfile-button-select": "Файл хьахаржа", + "ooui-selectfile-not-supported": "Файл харжа вIаштаь дац", + "ooui-selectfile-placeholder": "Файл хержа яц", + "ooui-selectfile-dragdrop-placeholder": "Хьадехьаяккха файл укхаз" +} diff --git a/resources/lib/oojs-ui/i18n/jv.json b/resources/lib/oojs-ui/i18n/jv.json index 1024d2ad02..8da8ef14e6 100644 --- a/resources/lib/oojs-ui/i18n/jv.json +++ b/resources/lib/oojs-ui/i18n/jv.json @@ -8,18 +8,20 @@ "Meursault2004" ] }, - "ooui-outline-control-move-down": "Pindhahaken butir mangandhap", - "ooui-outline-control-move-up": "Pindhah kara menyang dhuwur", - "ooui-outline-control-remove": "Busak kara", - "ooui-toolbar-more": "Manèh", - "ooui-toolgroup-expand": "Manèh", - "ooui-toolgroup-collapse": "Suda", - "ooui-dialog-message-accept": "Oké", - "ooui-dialog-message-reject": "Batal", + "ooui-outline-control-move-down": "Lih barang mangisor", + "ooui-outline-control-move-up": "Lih barang mandhuwur", + "ooui-outline-control-remove": "Buwang barang", + "ooui-toolbar-more": "Liyané", + "ooui-toolgroup-expand": "Liyané", + "ooui-toolgroup-collapse": "Sacukupé", + "ooui-dialog-message-accept": "Ha'a", + "ooui-dialog-message-reject": "Wurungaké", "ooui-dialog-process-error": "Ana sing klèru", "ooui-dialog-process-dismiss": "Tutup", "ooui-dialog-process-retry": "Jajal manèh", - "ooui-dialog-process-continue": "Tutug", - "ooui-selectfile-not-supported": "Pilihan berkas ora disokong", - "ooui-selectfile-placeholder": "Ora ana berkas sing kapilih" + "ooui-dialog-process-continue": "Banjuraké", + "ooui-selectfile-button-select": "Pilih barkas", + "ooui-selectfile-not-supported": "Barkas pilihan ora disengkuyung", + "ooui-selectfile-placeholder": "Ora ana barkas sing dipilih", + "ooui-selectfile-dragdrop-placeholder": "Dèkèk barkas ing kéné" } diff --git a/resources/lib/oojs-ui/i18n/ku-latn.json b/resources/lib/oojs-ui/i18n/ku-latn.json index 94b4687357..9954744933 100644 --- a/resources/lib/oojs-ui/i18n/ku-latn.json +++ b/resources/lib/oojs-ui/i18n/ku-latn.json @@ -12,5 +12,6 @@ "ooui-dialog-message-reject": "Betal bike", "ooui-dialog-process-retry": "Dîsa hewl bide", "ooui-dialog-process-continue": "Bidomîne", + "ooui-selectfile-button-select": "Dosyeyekê hilbijêre", "ooui-selectfile-placeholder": "Ti dosye nehatiye hilbijartin" } diff --git a/resources/lib/oojs-ui/i18n/pnb.json b/resources/lib/oojs-ui/i18n/pnb.json new file mode 100644 index 0000000000..8bd4be8b3b --- /dev/null +++ b/resources/lib/oojs-ui/i18n/pnb.json @@ -0,0 +1,21 @@ +{ + "@metadata": { + "authors": [ + "Saanvel" + ] + }, + "ooui-outline-control-move-down": "شیہ تھلے کرو", + "ooui-outline-control-move-up": "شیہ اتے کرو", + "ooui-outline-control-remove": "شیہ مٹاؤ", + "ooui-toolbar-more": "ہور", + "ooui-toolgroup-expand": "ہور", + "ooui-dialog-message-accept": "OK", + "ooui-dialog-message-reject": "مکاؤ", + "ooui-dialog-process-error": "کوئی رپھڑ پے گیا اے۔", + "ooui-dialog-process-dismiss": "مکاؤ", + "ooui-dialog-process-retry": "فیر کرو", + "ooui-dialog-process-continue": "چلاؤ", + "ooui-selectfile-button-select": "فائل چنو", + "ooui-selectfile-placeholder": "کوئی فائل نئی چنی ہوئی", + "ooui-selectfile-dragdrop-placeholder": "فائل ایتھے پاؤ" +} diff --git a/resources/lib/oojs-ui/i18n/sw.json b/resources/lib/oojs-ui/i18n/sw.json index 510e468d32..598acbcde5 100644 --- a/resources/lib/oojs-ui/i18n/sw.json +++ b/resources/lib/oojs-ui/i18n/sw.json @@ -2,7 +2,8 @@ "@metadata": { "authors": [ "Lloffiwr", - "Muddyb Blast Producer" + "Muddyb Blast Producer", + "Muddyb" ] }, "ooui-outline-control-move-down": "Sogeza kipengee chini", diff --git a/resources/lib/oojs-ui/oojs-ui-apex.js b/resources/lib/oojs-ui/oojs-ui-apex.js index 537a9d7406..026bbb3af9 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.17.4 + * OOjs UI v0.17.5 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2016 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2016-05-31T21:50:52Z + * Date: 2016-06-29T13:27:08Z */ ( function ( OO ) { diff --git a/resources/lib/oojs-ui/oojs-ui-core-apex.css b/resources/lib/oojs-ui/oojs-ui-core-apex.css index fdfd3e4f3c..fa5ec0af4c 100644 --- a/resources/lib/oojs-ui/oojs-ui-core-apex.css +++ b/resources/lib/oojs-ui/oojs-ui-core-apex.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.17.4 + * OOjs UI v0.17.5 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2016 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2016-05-31T21:50:56Z + * Date: 2016-06-29T13:27:11Z */ .oo-ui-element-hidden { display: none !important; @@ -784,13 +784,13 @@ .oo-ui-textInputWidget textarea { display: block; width: 100%; - resize: none; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; } .oo-ui-textInputWidget textarea { overflow: auto; + resize: none; } .oo-ui-textInputWidget [type="search"] { -webkit-appearance: textfield; @@ -969,6 +969,7 @@ white-space: nowrap; overflow: hidden; text-overflow: ellipsis; + cursor: default; -webkit-touch-callout: none; -webkit-user-select: none; -moz-user-select: none; @@ -982,13 +983,13 @@ .oo-ui-dropdownWidget-handle .oo-ui-iconElement-icon { position: absolute; } +.oo-ui-dropdownWidget.oo-ui-widget-enabled .oo-ui-dropdownWidget-handle { + cursor: pointer; +} .oo-ui-dropdownWidget > .oo-ui-menuSelectWidget { z-index: 1; width: 100%; } -.oo-ui-dropdownWidget.oo-ui-widget-enabled .oo-ui-dropdownWidget-handle { - cursor: pointer; -} .oo-ui-dropdownWidget:last-child { margin-right: 0; } diff --git a/resources/lib/oojs-ui/oojs-ui-core-mediawiki.css b/resources/lib/oojs-ui/oojs-ui-core-mediawiki.css index 05f383850e..03380b2468 100644 --- a/resources/lib/oojs-ui/oojs-ui-core-mediawiki.css +++ b/resources/lib/oojs-ui/oojs-ui-core-mediawiki.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.17.4 + * OOjs UI v0.17.5 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2016 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2016-05-31T21:50:56Z + * Date: 2016-06-29T13:27:11Z */ .oo-ui-element-hidden { display: none !important; @@ -67,7 +67,6 @@ .oo-ui-buttonElement-frameless > input.oo-ui-buttonElement-button { padding-left: 0.25em; padding-right: 0.25em; - color: #333333; } .oo-ui-buttonElement-frameless.oo-ui-widget-enabled > .oo-ui-buttonElement-button:focus { box-shadow: inset 0 0 0 1px #347bff, 0 0 0 1px #347bff; @@ -270,7 +269,7 @@ } .oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-primary.oo-ui-flaggedElement-progressive.oo-ui-widget-enabled > .oo-ui-buttonElement-button:focus { border-color: #347bff; - box-shadow: inset 0 0 0 1px #ffffff; + box-shadow: inset 0 0 0 1px #347bff, inset 0 0 0 2px #ffffff; } .oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-primary.oo-ui-flaggedElement-constructive > .oo-ui-buttonElement-button { color: #ffffff; @@ -294,7 +293,7 @@ } .oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-primary.oo-ui-flaggedElement-constructive.oo-ui-widget-enabled > .oo-ui-buttonElement-button:focus { border-color: #347bff; - box-shadow: inset 0 0 0 1px #ffffff; + box-shadow: inset 0 0 0 1px #347bff, inset 0 0 0 2px #ffffff; } .oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-primary.oo-ui-flaggedElement-destructive > .oo-ui-buttonElement-button { color: #ffffff; @@ -318,7 +317,7 @@ } .oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-primary.oo-ui-flaggedElement-destructive.oo-ui-widget-enabled > .oo-ui-buttonElement-button:focus { border-color: #d11d13; - box-shadow: inset 0 0 0 1px #ffffff; + box-shadow: inset 0 0 0 1px #d11d13, inset 0 0 0 2px #ffffff; } .oo-ui-clippableElement-clippable { -webkit-box-sizing: border-box; @@ -1035,13 +1034,13 @@ .oo-ui-textInputWidget textarea { display: block; width: 100%; - resize: none; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; } .oo-ui-textInputWidget textarea { overflow: auto; + resize: none; } .oo-ui-textInputWidget [type="search"] { -webkit-appearance: textfield; @@ -1095,7 +1094,6 @@ .oo-ui-textInputWidget input, .oo-ui-textInputWidget textarea { padding: 0.5em; - line-height: 1.275em; margin: 0; font-size: inherit; font-family: inherit; @@ -1103,9 +1101,9 @@ color: #000000; border: 1px solid #cccccc; border-radius: 2px; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; +} +.oo-ui-textInputWidget textarea { + line-height: 1.275em; } .oo-ui-textInputWidget .oo-ui-pendingElement-pending { background-color: transparent; @@ -1249,6 +1247,7 @@ white-space: nowrap; overflow: hidden; text-overflow: ellipsis; + cursor: default; -webkit-touch-callout: none; -webkit-user-select: none; -moz-user-select: none; @@ -1262,13 +1261,13 @@ .oo-ui-dropdownWidget-handle .oo-ui-iconElement-icon { position: absolute; } +.oo-ui-dropdownWidget.oo-ui-widget-enabled .oo-ui-dropdownWidget-handle { + cursor: pointer; +} .oo-ui-dropdownWidget > .oo-ui-menuSelectWidget { z-index: 1; width: 100%; } -.oo-ui-dropdownWidget.oo-ui-widget-enabled .oo-ui-dropdownWidget-handle { - cursor: pointer; -} .oo-ui-dropdownWidget:last-child { margin-right: 0; } diff --git a/resources/lib/oojs-ui/oojs-ui-core.js b/resources/lib/oojs-ui/oojs-ui-core.js index 6836553eee..e230a49aca 100644 --- a/resources/lib/oojs-ui/oojs-ui-core.js +++ b/resources/lib/oojs-ui/oojs-ui-core.js @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.17.4 + * OOjs UI v0.17.5 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2016 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2016-05-31T21:50:52Z + * Date: 2016-06-29T13:27:08Z */ ( function ( OO ) { @@ -2219,7 +2219,7 @@ OO.ui.mixin.GroupElement.prototype.aggregate = function ( events ) { * @chainable */ OO.ui.mixin.GroupElement.prototype.addItems = function ( items, index ) { - var i, len, item, event, events, currentIndex, + var i, len, item, itemEvent, events, currentIndex, itemElements = []; for ( i = 0, len = items.length; i < len; i++ ) { @@ -2237,8 +2237,8 @@ OO.ui.mixin.GroupElement.prototype.addItems = function ( items, index ) { // Add the item if ( item.connect && item.disconnect && !$.isEmptyObject( this.aggregateItemEvents ) ) { events = {}; - for ( event in this.aggregateItemEvents ) { - events[ event ] = [ 'emit', this.aggregateItemEvents[ event ], item ]; + for ( itemEvent in this.aggregateItemEvents ) { + events[ itemEvent ] = [ 'emit', this.aggregateItemEvents[ itemEvent ], item ]; } item.connect( this, events ); } @@ -2271,22 +2271,19 @@ OO.ui.mixin.GroupElement.prototype.addItems = function ( items, index ) { * @chainable */ OO.ui.mixin.GroupElement.prototype.removeItems = function ( items ) { - var i, len, item, index, remove, itemEvent; + var i, len, item, index, events, itemEvent; // Remove specific items for ( i = 0, len = items.length; i < len; i++ ) { item = items[ i ]; index = this.items.indexOf( item ); if ( index !== -1 ) { - if ( - item.connect && item.disconnect && - !$.isEmptyObject( this.aggregateItemEvents ) - ) { - remove = {}; - if ( Object.prototype.hasOwnProperty.call( this.aggregateItemEvents, itemEvent ) ) { - remove[ itemEvent ] = [ 'emit', this.aggregateItemEvents[ itemEvent ], item ]; + if ( item.connect && item.disconnect && !$.isEmptyObject( this.aggregateItemEvents ) ) { + events = {}; + for ( itemEvent in this.aggregateItemEvents ) { + events[ itemEvent ] = [ 'emit', this.aggregateItemEvents[ itemEvent ], item ]; } - item.disconnect( this, remove ); + item.disconnect( this, events ); } item.setElementGroup( null ); this.items.splice( index, 1 ); diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki.js b/resources/lib/oojs-ui/oojs-ui-mediawiki.js index 750ab66704..15d4d44a51 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.17.4 + * OOjs UI v0.17.5 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2016 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2016-05-31T21:50:52Z + * Date: 2016-06-29T13:27:08Z */ ( function ( OO ) { diff --git a/resources/lib/oojs-ui/oojs-ui-toolbars-apex.css b/resources/lib/oojs-ui/oojs-ui-toolbars-apex.css index 3f1910eb4f..cb5eedac56 100644 --- a/resources/lib/oojs-ui/oojs-ui-toolbars-apex.css +++ b/resources/lib/oojs-ui/oojs-ui-toolbars-apex.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.17.4 + * OOjs UI v0.17.5 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2016 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2016-05-31T21:50:56Z + * Date: 2016-06-29T13:27:11Z */ .oo-ui-popupTool .oo-ui-popupWidget-popup, .oo-ui-popupTool .oo-ui-popupWidget-anchor { diff --git a/resources/lib/oojs-ui/oojs-ui-toolbars-mediawiki.css b/resources/lib/oojs-ui/oojs-ui-toolbars-mediawiki.css index dd59a23faa..09730d4747 100644 --- a/resources/lib/oojs-ui/oojs-ui-toolbars-mediawiki.css +++ b/resources/lib/oojs-ui/oojs-ui-toolbars-mediawiki.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.17.4 + * OOjs UI v0.17.5 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2016 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2016-05-31T21:50:56Z + * Date: 2016-06-29T13:27:11Z */ .oo-ui-popupTool .oo-ui-popupWidget-popup, .oo-ui-popupTool .oo-ui-popupWidget-anchor { diff --git a/resources/lib/oojs-ui/oojs-ui-toolbars.js b/resources/lib/oojs-ui/oojs-ui-toolbars.js index 3b1e15d65c..97a8fc9978 100644 --- a/resources/lib/oojs-ui/oojs-ui-toolbars.js +++ b/resources/lib/oojs-ui/oojs-ui-toolbars.js @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.17.4 + * OOjs UI v0.17.5 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2016 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2016-05-31T21:50:52Z + * Date: 2016-06-29T13:27:08Z */ ( function ( OO ) { diff --git a/resources/lib/oojs-ui/oojs-ui-widgets-apex.css b/resources/lib/oojs-ui/oojs-ui-widgets-apex.css index 0767ab777d..68156c7564 100644 --- a/resources/lib/oojs-ui/oojs-ui-widgets-apex.css +++ b/resources/lib/oojs-ui/oojs-ui-widgets-apex.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.17.4 + * OOjs UI v0.17.5 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2016 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2016-05-31T21:50:56Z + * Date: 2016-06-29T13:27:11Z */ .oo-ui-draggableElement-handle, .oo-ui-draggableElement-handle.oo-ui-widget { @@ -17,7 +17,6 @@ cursor: grab; } .oo-ui-draggableElement-handle:active { - cursor: move; cursor: url(images/grabbing.cur ); cursor: -webkit-grabbing; cursor: -moz-grabbing; @@ -251,27 +250,16 @@ -moz-box-sizing: border-box; box-sizing: border-box; } -.oo-ui-toggleSwitchWidget .oo-ui-toggleSwitchWidget-glow { - position: absolute; - top: 0; - bottom: 0; - right: 0; - left: 0; - -webkit-touch-callout: none; - -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; -} -.oo-ui-toggleWidget-off .oo-ui-toggleSwitchWidget-glow { - display: none; -} .oo-ui-toggleSwitchWidget:last-child { margin-right: 0; } .oo-ui-toggleSwitchWidget.oo-ui-widget-disabled { opacity: 0.5; } +.oo-ui-toggleSwitchWidget.oo-ui-widget-enabled:hover, +.oo-ui-toggleSwitchWidget.oo-ui-widget-enabled:hover .oo-ui-toggleSwitchWidget-grip { + border-color: #aaaaaa; +} .oo-ui-toggleSwitchWidget-grip { top: 0.25em; left: 0.25em; @@ -291,11 +279,12 @@ background-image: linear-gradient(to bottom, #ffffff 0, #dddddd 100%); -ms-filter: "progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffffff', endColorstr='#ffdddddd' )"; } -.oo-ui-toggleSwitchWidget.oo-ui-widget-enabled:hover, -.oo-ui-toggleSwitchWidget.oo-ui-widget-enabled:hover .oo-ui-toggleSwitchWidget-grip { - border-color: #aaaaaa; -} -.oo-ui-toggleSwitchWidget .oo-ui-toggleSwitchWidget-glow { +.oo-ui-toggleSwitchWidget-glow { + position: absolute; + top: 0; + bottom: 0; + right: 0; + left: 0; border-radius: 1em; box-shadow: inset 0 1px 4px 0 rgba(0, 0, 0, 0.07); -webkit-transition: opacity 250ms ease; @@ -307,22 +296,26 @@ background-image: -moz-linear-gradient(top, #b0d9ee 0, #eaf4fa 100%); background-image: linear-gradient(to bottom, #b0d9ee 0, #eaf4fa 100%); -ms-filter: "progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffb0d9ee', endColorstr='#ffeaf4fa' )"; -} -.oo-ui-toggleWidget-on .oo-ui-toggleSwitchWidget-glow { - opacity: 1; -} -.oo-ui-toggleWidget-on .oo-ui-toggleSwitchWidget-grip { - left: 2.25em; - margin-left: -2px; + -webkit-touch-callout: none; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; } .oo-ui-toggleWidget-off .oo-ui-toggleSwitchWidget-glow { - display: block; opacity: 0; } .oo-ui-toggleWidget-off .oo-ui-toggleSwitchWidget-grip { left: 0.25em; margin-left: 0; } +.oo-ui-toggleWidget-on .oo-ui-toggleSwitchWidget-glow { + opacity: 1; +} +.oo-ui-toggleWidget-on .oo-ui-toggleSwitchWidget-grip { + left: 2.25em; + margin-left: -2px; +} .oo-ui-progressBarWidget { max-width: 50em; background-color: #ffffff; @@ -435,6 +428,14 @@ .oo-ui-selectFileWidget-info > .oo-ui-selectFileWidget-clearButton { position: absolute; } +.oo-ui-widget-disabled .oo-ui-selectFileWidget-info { + cursor: default; + -webkit-touch-callout: none; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; +} .oo-ui-selectFileWidget .oo-ui-selectFileWidget-clearButton { z-index: 2; } @@ -512,6 +513,14 @@ display: block; } .oo-ui-selectFileWidget-empty.oo-ui-widget-disabled .oo-ui-selectFileWidget-dropTarget, +.oo-ui-selectFileWidget-notsupported .oo-ui-selectFileWidget-dropTarget { + -webkit-touch-callout: none; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; +} +.oo-ui-selectFileWidget-empty.oo-ui-widget-disabled .oo-ui-selectFileWidget-dropTarget, .oo-ui-selectFileWidget-notsupported .oo-ui-selectFileWidget-dropTarget, .oo-ui-selectFileWidget-empty.oo-ui-widget-disabled .oo-ui-selectFileWidget-dropTarget .oo-ui-buttonElement-button, .oo-ui-selectFileWidget-notsupported .oo-ui-selectFileWidget-dropTarget .oo-ui-buttonElement-button { diff --git a/resources/lib/oojs-ui/oojs-ui-widgets-mediawiki.css b/resources/lib/oojs-ui/oojs-ui-widgets-mediawiki.css index 82d0b5ff92..048e732cb3 100644 --- a/resources/lib/oojs-ui/oojs-ui-widgets-mediawiki.css +++ b/resources/lib/oojs-ui/oojs-ui-widgets-mediawiki.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.17.4 + * OOjs UI v0.17.5 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2016 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2016-05-31T21:50:56Z + * Date: 2016-06-29T13:27:11Z */ .oo-ui-draggableElement-handle, .oo-ui-draggableElement-handle.oo-ui-widget { @@ -17,7 +17,6 @@ cursor: grab; } .oo-ui-draggableElement-handle:active { - cursor: move; cursor: url(images/grabbing.cur ); cursor: -webkit-grabbing; cursor: -moz-grabbing; @@ -261,21 +260,6 @@ -moz-box-sizing: border-box; box-sizing: border-box; } -.oo-ui-toggleSwitchWidget .oo-ui-toggleSwitchWidget-glow { - position: absolute; - top: 0; - bottom: 0; - right: 0; - left: 0; - -webkit-touch-callout: none; - -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; -} -.oo-ui-toggleWidget-off .oo-ui-toggleSwitchWidget-glow { - display: none; -} .oo-ui-toggleSwitchWidget:last-child { margin-right: 0; } @@ -283,17 +267,22 @@ content: ""; display: block; position: absolute; - top: 0; - left: 0; - bottom: 0; - right: 0; + top: 1px; + left: 1px; + bottom: 1px; + right: 1px; border: 1px solid transparent; border-radius: 1em; z-index: 1; + -webkit-transition: border-color 100ms; + -moz-transition: border-color 100ms; + transition: border-color 100ms; } .oo-ui-toggleSwitchWidget-grip { top: 0.35em; + min-width: 16px; width: 1.2em; + min-height: 16px; height: 1.2em; border-radius: 1.2em; background-color: #555555; @@ -304,14 +293,14 @@ .oo-ui-toggleSwitchWidget-glow { display: none; } -.oo-ui-toggleSwitchWidget.oo-ui-toggleWidget-on .oo-ui-toggleSwitchWidget-grip { - left: 1.9em; - margin-left: -2px; -} .oo-ui-toggleSwitchWidget.oo-ui-toggleWidget-off .oo-ui-toggleSwitchWidget-grip { left: 0.4em; margin-left: 0; } +.oo-ui-toggleSwitchWidget.oo-ui-toggleWidget-on .oo-ui-toggleSwitchWidget-grip { + left: 1.9em; + margin-left: -2px; +} .oo-ui-toggleSwitchWidget.oo-ui-widget-enabled.oo-ui-toggleWidget-on { background-color: #347bff; border-color: #347bff; @@ -462,6 +451,14 @@ .oo-ui-selectFileWidget-info > .oo-ui-selectFileWidget-clearButton { position: absolute; } +.oo-ui-widget-disabled .oo-ui-selectFileWidget-info { + cursor: default; + -webkit-touch-callout: none; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; +} .oo-ui-selectFileWidget .oo-ui-selectFileWidget-clearButton { z-index: 2; } @@ -539,6 +536,14 @@ display: block; } .oo-ui-selectFileWidget-empty.oo-ui-widget-disabled .oo-ui-selectFileWidget-dropTarget, +.oo-ui-selectFileWidget-notsupported .oo-ui-selectFileWidget-dropTarget { + -webkit-touch-callout: none; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; +} +.oo-ui-selectFileWidget-empty.oo-ui-widget-disabled .oo-ui-selectFileWidget-dropTarget, .oo-ui-selectFileWidget-notsupported .oo-ui-selectFileWidget-dropTarget, .oo-ui-selectFileWidget-empty.oo-ui-widget-disabled .oo-ui-selectFileWidget-dropTarget .oo-ui-buttonElement-button, .oo-ui-selectFileWidget-notsupported .oo-ui-selectFileWidget-dropTarget .oo-ui-buttonElement-button { diff --git a/resources/lib/oojs-ui/oojs-ui-widgets.js b/resources/lib/oojs-ui/oojs-ui-widgets.js index cc010a632e..c4486d3a99 100644 --- a/resources/lib/oojs-ui/oojs-ui-widgets.js +++ b/resources/lib/oojs-ui/oojs-ui-widgets.js @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.17.4 + * OOjs UI v0.17.5 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2016 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2016-05-31T21:50:52Z + * Date: 2016-06-29T13:27:08Z */ ( function ( OO ) { @@ -374,18 +374,22 @@ OO.ui.mixin.DraggableGroupElement.prototype.reorder = function ( item, newIndex * @param {OO.ui.mixin.DraggableElement} item Dragged item */ OO.ui.mixin.DraggableGroupElement.prototype.setDragItem = function ( item ) { - this.dragItem = item; - this.$element.on( 'dragover', this.onDragOver.bind( this ) ); - this.$element.addClass( 'oo-ui-draggableGroupElement-dragging' ); + if ( this.dragItem !== item ) { + this.dragItem = item; + this.$element.on( 'dragover', this.onDragOver.bind( this ) ); + this.$element.addClass( 'oo-ui-draggableGroupElement-dragging' ); + } }; /** * Unset the current dragged item */ OO.ui.mixin.DraggableGroupElement.prototype.unsetDragItem = function () { - this.dragItem = null; - this.$element.off( 'dragover' ); - this.$element.removeClass( 'oo-ui-draggableGroupElement-dragging' ); + if ( this.dragItem ) { + this.dragItem = null; + this.$element.off( 'dragover' ); + this.$element.removeClass( 'oo-ui-draggableGroupElement-dragging' ); + } }; /** @@ -1770,11 +1774,13 @@ OO.ui.BookletLayout.prototype.onStackLayoutVisibleItemChange = function ( page ) OO.ui.BookletLayout.prototype.onStackLayoutSet = function ( page ) { var layout = this; if ( !this.scrolling && page ) { - page.scrollElementIntoView( { complete: function () { - if ( layout.autoFocus ) { - layout.focus(); + page.scrollElementIntoView( { + complete: function () { + if ( layout.autoFocus ) { + layout.focus(); + } } - } } ); + } ); } }; @@ -2278,11 +2284,13 @@ OO.ui.IndexLayout.prototype.onStackLayoutFocus = function ( e ) { OO.ui.IndexLayout.prototype.onStackLayoutSet = function ( card ) { var layout = this; if ( card ) { - card.scrollElementIntoView( { complete: function () { - if ( layout.autoFocus ) { - layout.focus(); + card.scrollElementIntoView( { + complete: function () { + if ( layout.autoFocus ) { + layout.focus(); + } } - } } ); + } ); } }; diff --git a/resources/lib/oojs-ui/oojs-ui-windows-apex.css b/resources/lib/oojs-ui/oojs-ui-windows-apex.css index de80299e13..b55dd253e3 100644 --- a/resources/lib/oojs-ui/oojs-ui-windows-apex.css +++ b/resources/lib/oojs-ui/oojs-ui-windows-apex.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.17.4 + * OOjs UI v0.17.5 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2016 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2016-05-31T21:50:56Z + * Date: 2016-06-29T13:27:11Z */ .oo-ui-actionWidget.oo-ui-pendingElement-pending { background-image: /* @embed */ url(themes/apex/images/textures/pending.gif); @@ -64,8 +64,7 @@ bottom: 0; } .oo-ui-dialog-content > .oo-ui-window-foot { - overflow: hidden; - z-index: 1; + z-index: 3; bottom: 0; } .oo-ui-dialog-content > .oo-ui-window-body { diff --git a/resources/lib/oojs-ui/oojs-ui-windows-mediawiki.css b/resources/lib/oojs-ui/oojs-ui-windows-mediawiki.css index 5aaedc1c25..727e87461f 100644 --- a/resources/lib/oojs-ui/oojs-ui-windows-mediawiki.css +++ b/resources/lib/oojs-ui/oojs-ui-windows-mediawiki.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.17.4 + * OOjs UI v0.17.5 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2016 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2016-05-31T21:50:56Z + * Date: 2016-06-29T13:27:11Z */ .oo-ui-window { background: transparent; @@ -60,13 +60,9 @@ bottom: 0; } .oo-ui-dialog-content > .oo-ui-window-foot { - overflow: hidden; - z-index: 1; + z-index: 3; bottom: 0; } -.oo-ui-dialog-content > .oo-ui-window-body { - outline: 1px solid #aaaaaa; -} .oo-ui-messageDialog-actions-horizontal { display: table; table-layout: fixed; @@ -98,6 +94,9 @@ display: inline; white-space: nowrap; } +.oo-ui-messageDialog-content > .oo-ui-window-foot { + outline: 1px solid #aaaaaa; +} .oo-ui-messageDialog-title, .oo-ui-messageDialog-message { display: block; @@ -137,7 +136,7 @@ border-bottom-width: 0; } .oo-ui-messageDialog-actions .oo-ui-actionWidget { - height: 3.4em; + min-height: 3.4em; margin-right: 0; } .oo-ui-messageDialog-actions .oo-ui-actionWidget:last-child { @@ -145,7 +144,7 @@ } .oo-ui-messageDialog-actions .oo-ui-actionWidget.oo-ui-labelElement .oo-ui-labelElement-label { text-align: center; - line-height: 3.4em; + line-height: 3.4; } .oo-ui-messageDialog-actions .oo-ui-actionWidget:hover { background-color: rgba(0, 0, 0, 0.05); diff --git a/resources/lib/oojs-ui/oojs-ui-windows.js b/resources/lib/oojs-ui/oojs-ui-windows.js index 17bab019c5..8234b6dec6 100644 --- a/resources/lib/oojs-ui/oojs-ui-windows.js +++ b/resources/lib/oojs-ui/oojs-ui-windows.js @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.17.4 + * OOjs UI v0.17.5 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2016 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2016-05-31T21:50:52Z + * Date: 2016-06-29T13:27:08Z */ ( function ( OO ) { @@ -3114,7 +3114,11 @@ OO.ui.ProcessDialog.prototype.initialize = function () { .append( this.$errors ); this.$navigation .addClass( 'oo-ui-processDialog-navigation' ) - .append( this.$safeActions, this.$location, this.$primaryActions ); + // Note: Order of appends below is important. These are in the order + // we want tab to go through them. Display-order is handled entirely + // by CSS absolute-positioning. As such, primary actions like "done" + // should go first. + .append( this.$primaryActions, this.$location, this.$safeActions ); this.$head.append( this.$navigation ); this.$foot.append( this.$otherActions ); }; -- 2.20.1