From: James D. Forrester Date: Wed, 17 Feb 2016 02:10:44 +0000 (-0800) Subject: Update OOjs UI to v0.15.4 X-Git-Tag: 1.31.0-rc.0~7936^2 X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/password.php?a=commitdiff_plain;h=c420284038cb3471d8dd41db9f4c41fc6ed4ecc2;p=lhc%2Fweb%2Fwiklou.git Update OOjs UI to v0.15.4 Release notes: https://git.wikimedia.org/blob/oojs%2Fui.git/v0.15.4/History.md Change-Id: I29c8db4c654ecf575113199ace1006d70ce29012 --- diff --git a/composer.json b/composer.json index 0b50c2a6dd..5bec8e41c9 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ "ext-iconv": "*", "liuggio/statsd-php-client": "1.0.18", "mediawiki/at-ease": "1.1.0", - "oojs/oojs-ui": "0.15.3", + "oojs/oojs-ui": "0.15.4", "oyejorge/less.php": "1.7.0.10", "php": ">=5.5.9", "psr/log": "1.0.0", diff --git a/resources/lib/oojs-ui/i18n/nn.json b/resources/lib/oojs-ui/i18n/nn.json index 943e6adc73..c8fba3db06 100644 --- a/resources/lib/oojs-ui/i18n/nn.json +++ b/resources/lib/oojs-ui/i18n/nn.json @@ -7,5 +7,7 @@ }, "ooui-outline-control-move-down": "Flytt element ned", "ooui-outline-control-move-up": "Flytt element opp", - "ooui-toolbar-more": "Fleire" + "ooui-toolbar-more": "Fleire", + "ooui-selectfile-button-select": "Vel ei fil", + "ooui-selectfile-placeholder": "Inga fil er vald" } diff --git a/resources/lib/oojs-ui/i18n/tt-cyrl.json b/resources/lib/oojs-ui/i18n/tt-cyrl.json index efe50bd18d..911b6183be 100644 --- a/resources/lib/oojs-ui/i18n/tt-cyrl.json +++ b/resources/lib/oojs-ui/i18n/tt-cyrl.json @@ -7,6 +7,15 @@ }, "ooui-outline-control-move-down": "Элементны аска күчерү", "ooui-outline-control-move-up": "Элементны өскә күчерү", + "ooui-outline-control-remove": "Пунктны бетерү", + "ooui-toolbar-more": "Тагын", + "ooui-toolgroup-expand": "Күбрәк", + "ooui-toolgroup-collapse": "Азрак", + "ooui-dialog-message-accept": "ОК", + "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": "Файл сайланмаган" diff --git a/resources/lib/oojs-ui/oojs-ui-apex.js b/resources/lib/oojs-ui/oojs-ui-apex.js index 36378186e4..58b0ed0719 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.15.3 + * OOjs UI v0.15.4 * 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-02-09T21:21:16Z + * Date: 2016-02-17T02:03:23Z */ ( 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 734ff71497..633c5584b3 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.15.3 + * OOjs UI v0.15.4 * 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-02-09T21:21:21Z + * Date: 2016-02-17T02:03:27Z */ .oo-ui-element-hidden { display: none !important; @@ -756,6 +756,12 @@ border: 1px solid rgba(0, 0, 0, 0.1); border-radius: 0.25em; } +.oo-ui-dropdownInputWidget option { + font-size: inherit; + font-family: inherit; + height: 1.5em; + padding: 0.5em 1em; +} .oo-ui-dropdownInputWidget.oo-ui-widget-enabled select:hover, .oo-ui-dropdownInputWidget.oo-ui-widget-enabled select:focus { border-color: rgba(0, 0, 0, 0.2); diff --git a/resources/lib/oojs-ui/oojs-ui-core-mediawiki.css b/resources/lib/oojs-ui/oojs-ui-core-mediawiki.css index 51abc2d88a..2062ec69dd 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.15.3 + * OOjs UI v0.15.4 * 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-02-09T21:21:21Z + * Date: 2016-02-17T02:03:27Z */ .oo-ui-element-hidden { display: none !important; @@ -155,9 +155,9 @@ min-width: 1em; border-radius: 2px; position: relative; - -webkit-transition: background 100ms ease, color 100ms ease, border-color 100ms ease, box-shadow 100ms ease; - -moz-transition: background 100ms ease, color 100ms ease, border-color 100ms ease, box-shadow 100ms ease; - transition: background 100ms ease, color 100ms ease, border-color 100ms ease, box-shadow 100ms ease; + -webkit-transition: background 100ms, color 100ms, border-color 100ms, box-shadow 100ms; + -moz-transition: background 100ms, color 100ms, border-color 100ms, box-shadow 100ms; + transition: background 100ms, color 100ms, border-color 100ms, box-shadow 100ms; } .oo-ui-buttonElement-framed > .oo-ui-buttonElement-button:hover, .oo-ui-buttonElement-framed > .oo-ui-buttonElement-button:focus { @@ -778,9 +778,9 @@ border-width: 9px; } .oo-ui-popupWidget-transitioning .oo-ui-popupWidget-popup { - -webkit-transition: width 100ms ease, height 100ms ease, left 100ms ease; - -moz-transition: width 100ms ease, height 100ms ease, left 100ms ease; - transition: width 100ms ease, height 100ms ease, left 100ms ease; + -webkit-transition: width 100ms, height 100ms, left 100ms; + -moz-transition: width 100ms, height 100ms, left 100ms; + transition: width 100ms, height 100ms, left 100ms; } .oo-ui-popupWidget-head { height: 2.5em; @@ -924,6 +924,12 @@ padding-left: 1em; vertical-align: middle; } +.oo-ui-dropdownInputWidget option { + font-size: inherit; + font-family: inherit; + height: 1.5em; + padding: 0.5em 1em; +} .oo-ui-dropdownInputWidget.oo-ui-widget-enabled select:hover, .oo-ui-dropdownInputWidget.oo-ui-widget-enabled select:focus { border-color: #aaaaaa; diff --git a/resources/lib/oojs-ui/oojs-ui-core.js b/resources/lib/oojs-ui/oojs-ui-core.js index 5a4322806a..f0b96d5036 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.15.3 + * OOjs UI v0.15.4 * 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-02-09T21:21:16Z + * Date: 2016-02-17T02:03:23Z */ ( function ( OO ) { @@ -1055,71 +1055,77 @@ OO.ui.Element.static.getClosestScrollableContainer = function ( el, dimension ) * @static * @param {HTMLElement} el Element to scroll into view * @param {Object} [config] Configuration options - * @param {string} [config.duration] jQuery animation duration value + * @param {string} [config.duration='fast'] jQuery animation duration value * @param {string} [config.direction] Scroll in only one direction, e.g. 'x' or 'y', omit * to scroll in both directions - * @param {Function} [config.complete] Function to call when scrolling completes + * @param {Function} [config.complete] Function to call when scrolling completes. + * Deprecated since 0.15.4, use the return promise instead. + * @return {jQuery.Promise} Promise which resolves when the scroll is complete */ OO.ui.Element.static.scrollIntoView = function ( el, config ) { - var rel, anim, callback, sc, $sc, eld, scd, $win; + var position, animations, callback, container, $container, elementDimensions, containerDimensions, $window, + deferred = $.Deferred(); // Configuration initialization config = config || {}; - anim = {}; + animations = {}; callback = typeof config.complete === 'function' && config.complete; - sc = this.getClosestScrollableContainer( el, config.direction ); - $sc = $( sc ); - eld = this.getDimensions( el ); - scd = this.getDimensions( sc ); - $win = $( this.getWindow( el ) ); - - // Compute the distances between the edges of el and the edges of the scroll viewport - if ( $sc.is( 'html, body' ) ) { + container = this.getClosestScrollableContainer( el, config.direction ); + $container = $( container ); + elementDimensions = this.getDimensions( el ); + containerDimensions = this.getDimensions( container ); + $window = $( this.getWindow( el ) ); + + // Compute the element's position relative to the container + if ( $container.is( 'html, body' ) ) { // If the scrollable container is the root, this is easy - rel = { - top: eld.rect.top, - bottom: $win.innerHeight() - eld.rect.bottom, - left: eld.rect.left, - right: $win.innerWidth() - eld.rect.right + position = { + top: elementDimensions.rect.top, + bottom: $window.innerHeight() - elementDimensions.rect.bottom, + left: elementDimensions.rect.left, + right: $window.innerWidth() - elementDimensions.rect.right }; } else { - // Otherwise, we have to subtract el's coordinates from sc's coordinates - rel = { - top: eld.rect.top - ( scd.rect.top + scd.borders.top ), - bottom: scd.rect.bottom - scd.borders.bottom - scd.scrollbar.bottom - eld.rect.bottom, - left: eld.rect.left - ( scd.rect.left + scd.borders.left ), - right: scd.rect.right - scd.borders.right - scd.scrollbar.right - eld.rect.right + // Otherwise, we have to subtract el's coordinates from container's coordinates + position = { + top: elementDimensions.rect.top - ( containerDimensions.rect.top + containerDimensions.borders.top ), + bottom: containerDimensions.rect.bottom - containerDimensions.borders.bottom - containerDimensions.scrollbar.bottom - elementDimensions.rect.bottom, + left: elementDimensions.rect.left - ( containerDimensions.rect.left + containerDimensions.borders.left ), + right: containerDimensions.rect.right - containerDimensions.borders.right - containerDimensions.scrollbar.right - elementDimensions.rect.right }; } if ( !config.direction || config.direction === 'y' ) { - if ( rel.top < 0 ) { - anim.scrollTop = scd.scroll.top + rel.top; - } else if ( rel.top > 0 && rel.bottom < 0 ) { - anim.scrollTop = scd.scroll.top + Math.min( rel.top, -rel.bottom ); + if ( position.top < 0 ) { + animations.scrollTop = containerDimensions.scroll.top + position.top; + } else if ( position.top > 0 && position.bottom < 0 ) { + animations.scrollTop = containerDimensions.scroll.top + Math.min( position.top, -position.bottom ); } } if ( !config.direction || config.direction === 'x' ) { - if ( rel.left < 0 ) { - anim.scrollLeft = scd.scroll.left + rel.left; - } else if ( rel.left > 0 && rel.right < 0 ) { - anim.scrollLeft = scd.scroll.left + Math.min( rel.left, -rel.right ); + if ( position.left < 0 ) { + animations.scrollLeft = containerDimensions.scroll.left + position.left; + } else if ( position.left > 0 && position.right < 0 ) { + animations.scrollLeft = containerDimensions.scroll.left + Math.min( position.left, -position.right ); } } - if ( !$.isEmptyObject( anim ) ) { - $sc.stop( true ).animate( anim, config.duration === undefined ? 'fast' : config.duration ); - if ( callback ) { - $sc.queue( function ( next ) { + if ( !$.isEmptyObject( animations ) ) { + $container.stop( true ).animate( animations, config.duration === undefined ? 'fast' : config.duration ); + $container.queue( function ( next ) { + if ( callback ) { callback(); - next(); - } ); - } + } + deferred.resolve(); + next(); + } ); } else { if ( callback ) { callback(); } + deferred.resolve(); } + return deferred.promise(); }; /** @@ -1285,6 +1291,8 @@ OO.ui.Element.prototype.getElementWindow = function () { /** * Get closest scrollable container. + * + * @return {HTMLElement} Closest scrollable container */ OO.ui.Element.prototype.getClosestScrollableElementContainer = function () { return OO.ui.Element.static.getClosestScrollableContainer( this.$element[ 0 ] ); @@ -1314,6 +1322,7 @@ OO.ui.Element.prototype.setElementGroup = function ( group ) { * Scroll element into view. * * @param {Object} [config] Configuration options + * @return {jQuery.Promise} Promise which resolves when the scroll is complete */ OO.ui.Element.prototype.scrollElementIntoView = function ( config ) { return OO.ui.Element.static.scrollIntoView( this.$element[ 0 ], config ); @@ -4082,9 +4091,9 @@ OO.ui.mixin.ClippableElement.prototype.clip = function () { * This config option is only relevant if #autoClose is set to `true`. See the [OOjs UI docs on MediaWiki][2] * for an example. * [2]: https://www.mediawiki.org/wiki/OOjs_UI/Widgets/Popups#autocloseExample - * @cfg {boolean} [head] Show a popup header that contains a #label (if specified) and close + * @cfg {boolean} [head=false] Show a popup header that contains a #label (if specified) and close * button. - * @cfg {boolean} [padded] Add padding to the popup's body + * @cfg {boolean} [padded=false] Add padding to the popup's body */ OO.ui.PopupWidget = function OoUiPopupWidget( config ) { // Configuration initialization @@ -4105,8 +4114,6 @@ OO.ui.PopupWidget = function OoUiPopupWidget( config ) { } ) ); // Properties - this.$head = $( '
' ); - this.$footer = $( '
' ); this.$anchor = $( '
' ); // If undefined, will be computed lazily in updateDimensions() this.$container = config.$container; @@ -4118,44 +4125,45 @@ OO.ui.PopupWidget = function OoUiPopupWidget( config ) { this.width = config.width !== undefined ? config.width : 320; this.height = config.height !== undefined ? config.height : null; this.setAlignment( config.align ); - this.closeButton = new OO.ui.ButtonWidget( { framed: false, icon: 'close' } ); this.onMouseDownHandler = this.onMouseDown.bind( this ); this.onDocumentKeyDownHandler = this.onDocumentKeyDown.bind( this ); - // Events - this.closeButton.connect( this, { click: 'onCloseButtonClick' } ); - // Initialization this.toggleAnchor( config.anchor === undefined || config.anchor ); this.$body.addClass( 'oo-ui-popupWidget-body' ); this.$anchor.addClass( 'oo-ui-popupWidget-anchor' ); - this.$head - .addClass( 'oo-ui-popupWidget-head' ) - .append( this.$label, this.closeButton.$element ); - this.$footer.addClass( 'oo-ui-popupWidget-footer' ); - if ( !config.head ) { - this.$head.addClass( 'oo-ui-element-hidden' ); - } - if ( !config.$footer ) { - this.$footer.addClass( 'oo-ui-element-hidden' ); - } this.$popup .addClass( 'oo-ui-popupWidget-popup' ) - .append( this.$head, this.$body, this.$footer ); + .append( this.$body ); this.$element .addClass( 'oo-ui-popupWidget' ) .append( this.$popup, this.$anchor ); // Move content, which was added to #$element by OO.ui.Widget, to the body + // FIXME This is gross, we should use '$body' or something for the config if ( config.$content instanceof jQuery ) { this.$body.append( config.$content ); } - if ( config.$footer instanceof jQuery ) { - this.$footer.append( config.$footer ); - } + if ( config.padded ) { this.$body.addClass( 'oo-ui-popupWidget-body-padded' ); } + if ( config.head ) { + this.closeButton = new OO.ui.ButtonWidget( { framed: false, icon: 'close' } ); + this.closeButton.connect( this, { click: 'onCloseButtonClick' } ); + this.$head = $( '
' ) + .addClass( 'oo-ui-popupWidget-head' ) + .append( this.$label, this.closeButton.$element ); + this.$popup.prepend( this.$head ); + } + + if ( config.$footer ) { + this.$footer = $( '
' ) + .addClass( 'oo-ui-popupWidget-footer' ) + .append( config.$footer ); + this.$popup.append( this.$footer ); + } + // Initially hidden - using #toggle may cause errors if subclasses override toggle with methods // that reference properties not initialized at that time of parent class construction // TODO: Find a better way to handle post-constructor setup @@ -4879,6 +4887,7 @@ OO.ui.SelectWidget = function OoUiSelectWidget( config ) { this.onKeyPressHandler = this.onKeyPress.bind( this ); this.keyPressBuffer = ''; this.keyPressBufferTimer = null; + this.blockMouseOverEvents = 0; // Events this.connect( this, { @@ -5041,7 +5050,9 @@ OO.ui.SelectWidget.prototype.onMouseMove = function ( e ) { */ OO.ui.SelectWidget.prototype.onMouseOver = function ( e ) { var item; - + if ( this.blockMouseOverEvents ) { + return; + } if ( !this.isDisabled() ) { item = this.getTargetItem( e ); this.highlightItem( item && item.isHighlightable() ? item : null ); @@ -5112,7 +5123,7 @@ OO.ui.SelectWidget.prototype.onKeyDown = function ( e ) { } else { this.chooseItem( nextItem ); } - nextItem.scrollElementIntoView(); + this.scrollItemIntoView( nextItem ); } if ( handled ) { @@ -5140,6 +5151,23 @@ OO.ui.SelectWidget.prototype.unbindKeyDownListener = function () { this.getElementWindow().removeEventListener( 'keydown', this.onKeyDownHandler, true ); }; +/** + * Scroll item into view, preventing spurious mouse highlight actions from happening. + * + * @return {OO.ui.OptionWidget} Item to scroll into view + */ +OO.ui.SelectWidget.prototype.scrollItemIntoView = function ( item ) { + var widget = this; + // Chromium's Blink engine will generate spurious 'mouseover' events during programmatic scrolling + // and around 100-150 ms after it is finished. + this.blockMouseOverEvents++; + item.scrollElementIntoView().done( function () { + setTimeout( function () { + widget.blockMouseOverEvents--; + }, 200 ); + } ); +}; + /** * Clear the key-press buffer * @@ -5202,7 +5230,7 @@ OO.ui.SelectWidget.prototype.onKeyPress = function ( e ) { } else { this.chooseItem( item ); } - item.scrollElementIntoView(); + this.scrollItemIntoView( item ); } e.preventDefault(); diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki.js b/resources/lib/oojs-ui/oojs-ui-mediawiki.js index 27a4657563..de585a7d47 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.15.3 + * OOjs UI v0.15.4 * 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-02-09T21:21:16Z + * Date: 2016-02-17T02:03:23Z */ ( 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 0021721bdd..4a37310b73 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.15.3 + * OOjs UI v0.15.4 * 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-02-09T21:21:21Z + * Date: 2016-02-17T02:03:27Z */ .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 7b1e5b75c2..a13af69b29 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.15.3 + * OOjs UI v0.15.4 * 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-02-09T21:21:21Z + * Date: 2016-02-17T02:03:27Z */ .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 1d1ed87abd..b033276800 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.15.3 + * OOjs UI v0.15.4 * 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-02-09T21:21:16Z + * Date: 2016-02-17T02:03:23Z */ ( function ( OO ) { @@ -2093,6 +2093,11 @@ OO.ui.ListToolGroup.prototype.populate = function () { this.updateCollapsibleState(); }; +/** + * Get the expand/collapse tool for this group + * + * @return {OO.ui.Tool} Expand collapse tool + */ OO.ui.ListToolGroup.prototype.getExpandCollapseTool = function () { var ExpandCollapseTool; if ( this.expandCollapseTool === undefined ) { diff --git a/resources/lib/oojs-ui/oojs-ui-widgets-apex.css b/resources/lib/oojs-ui/oojs-ui-widgets-apex.css index 071e33bbba..dff61e9e5a 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.15.3 + * OOjs UI v0.15.4 * 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-02-09T21:21:21Z + * Date: 2016-02-17T02:03:27Z */ .oo-ui-draggableElement { cursor: -webkit-grab -moz-grab, url(images/grab.cur), move; diff --git a/resources/lib/oojs-ui/oojs-ui-widgets-mediawiki.css b/resources/lib/oojs-ui/oojs-ui-widgets-mediawiki.css index 8475dd18a9..cc12598d80 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.15.3 + * OOjs UI v0.15.4 * 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-02-09T21:21:21Z + * Date: 2016-02-17T02:03:27Z */ .oo-ui-draggableElement { cursor: -webkit-grab -moz-grab, url(images/grab.cur), move; @@ -238,9 +238,9 @@ border-radius: 1em; background-color: #ffffff; margin-right: 0.5em; - -webkit-transition: background-color 100ms ease, border-color 100ms ease; - -moz-transition: background-color 100ms ease, border-color 100ms ease; - transition: background-color 100ms ease, border-color 100ms ease; + -webkit-transition: background-color 100ms, border-color 100ms; + -moz-transition: background-color 100ms, border-color 100ms; + transition: background-color 100ms, border-color 100ms; } .oo-ui-toggleSwitchWidget.oo-ui-widget-enabled { cursor: pointer; @@ -288,9 +288,9 @@ height: 1.2em; border-radius: 1.2em; background-color: #555555; - -webkit-transition: left 100ms ease, margin-left 100ms ease; - -moz-transition: left 100ms ease, margin-left 100ms ease; - transition: left 100ms ease, margin-left 100ms ease; + -webkit-transition: left 100ms, margin-left 100ms; + -moz-transition: left 100ms, margin-left 100ms; + transition: left 100ms, margin-left 100ms; } .oo-ui-toggleSwitchWidget-glow { display: none; diff --git a/resources/lib/oojs-ui/oojs-ui-widgets.js b/resources/lib/oojs-ui/oojs-ui-widgets.js index 521dfbb91d..4f5e0ed436 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.15.3 + * OOjs UI v0.15.4 * 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-02-09T21:21:16Z + * Date: 2016-02-17T02:03:23Z */ ( function ( OO ) { diff --git a/resources/lib/oojs-ui/oojs-ui-windows-apex.css b/resources/lib/oojs-ui/oojs-ui-windows-apex.css index adf3bfda17..f122db5885 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.15.3 + * OOjs UI v0.15.4 * 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-02-09T21:21:21Z + * Date: 2016-02-17T02:03:27Z */ .oo-ui-actionWidget.oo-ui-pendingElement-pending { background-image: /* @embed */ url(themes/apex/images/textures/pending.gif); diff --git a/resources/lib/oojs-ui/oojs-ui-windows-mediawiki.css b/resources/lib/oojs-ui/oojs-ui-windows-mediawiki.css index 101673cc87..ed0716a2e1 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.15.3 + * OOjs UI v0.15.4 * 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-02-09T21:21:21Z + * Date: 2016-02-17T02:03:27Z */ .oo-ui-window { background: transparent; @@ -350,9 +350,9 @@ .oo-ui-windowManager-modal > .oo-ui-dialog { background-color: rgba(255, 255, 255, 0.5); opacity: 0; - -webkit-transition: opacity 250ms ease; - -moz-transition: opacity 250ms ease; - transition: opacity 250ms ease; + -webkit-transition: opacity 250ms; + -moz-transition: opacity 250ms; + transition: opacity 250ms; } .oo-ui-windowManager-modal > .oo-ui-dialog > .oo-ui-window-frame { background-color: #ffffff; @@ -361,9 +361,9 @@ -moz-transform: scale(0.5); -ms-transform: scale(0.5); transform: scale(0.5); - -webkit-transition: all 250ms ease; - -moz-transition: all 250ms ease; - transition: all 250ms ease; + -webkit-transition: all 250ms; + -moz-transition: all 250ms; + transition: all 250ms; } .oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-setup { opacity: 1; diff --git a/resources/lib/oojs-ui/oojs-ui-windows.js b/resources/lib/oojs-ui/oojs-ui-windows.js index 1a569452eb..aa11142fd3 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.15.3 + * OOjs UI v0.15.4 * 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-02-09T21:21:16Z + * Date: 2016-02-17T02:03:23Z */ ( function ( OO ) {