From 978bdd7d28cc6e3bd3929e83c1131b746a4b5395 Mon Sep 17 00:00:00 2001 From: "James D. Forrester" Date: Wed, 18 Jun 2014 16:19:20 -0700 Subject: [PATCH] Update OOjs UI to v0.1.0-pre (7a0e222a75) New changes: ef2f66f Element: Add unit tests for focusin/focusout hack 54b09fd Element: Remove focusin/focusout hack in onDOMEvent 91ba7d3 Accessibility: Set role=dialog on dialogs 0447150 Accessibility: Restore element focus when a window closes 715f1ef Localisation updates from https://translatewiki.net. 9f343c0 Localisation updates from https://translatewiki.net. 6be64bc Tidy up SVG sources and fix pixel snapping 7a0e222 Fix scrollIntoView() in the case where the scrollable container is the Change-Id: I9d86a238546acc867f20aeb45b102c7499108c89 --- resources/lib/oojs-ui/i18n/ce.json | 2 +- resources/lib/oojs-ui/i18n/kn.json | 2 + .../lib/oojs-ui/images/indicators/alert.svg | 5 +- .../oojs-ui/images/indicators/arrow-down.png | Bin 203 -> 249 bytes .../oojs-ui/images/indicators/arrow-down.svg | 4 +- .../oojs-ui/images/indicators/arrow-ltr.png | Bin 2819 -> 246 bytes .../oojs-ui/images/indicators/arrow-ltr.svg | 4 +- .../oojs-ui/images/indicators/arrow-rtl.png | Bin 2821 -> 247 bytes .../oojs-ui/images/indicators/arrow-rtl.svg | 4 +- .../oojs-ui/images/indicators/arrow-up.png | Bin 206 -> 229 bytes .../oojs-ui/images/indicators/arrow-up.svg | 4 +- .../oojs-ui/images/indicators/required.svg | 9 +- resources/lib/oojs-ui/oojs-ui.js | 117 ++++++------------ resources/lib/oojs-ui/oojs-ui.svg.css | 4 +- 14 files changed, 56 insertions(+), 99 deletions(-) diff --git a/resources/lib/oojs-ui/i18n/ce.json b/resources/lib/oojs-ui/i18n/ce.json index 122be19819..de86daf0f4 100644 --- a/resources/lib/oojs-ui/i18n/ce.json +++ b/resources/lib/oojs-ui/i18n/ce.json @@ -9,7 +9,7 @@ "ooui-outline-control-move-down": "ÐÐ°ÑÐ° ÑÐºÐºÑÐ° ÑÐ»ÐµÐ¼ÐµÐ½Ñ", "ooui-outline-control-move-up": "ÐÐ°ÐºÐºÑÐ° ÑÐºÐºÑÐ° ÑÐ»ÐµÐ¼ÐµÐ½Ñ", "ooui-outline-control-remove": "ÐÓÐ°Ð´Ð°ÑÐ° Ð¼ÐµÑÑÐ¸Ð³", - "ooui-toolbar-more": "ÐÑÐ¸Ð½ ÑÓÐµ", + "ooui-toolbar-more": "ÐÑÐ¸Ð½", "ooui-dialog-confirm-title": "ÐÐ°ÐºÑÐ´Ð°Ð½", "ooui-dialog-confirm-default-prompt": "ÐÐ°ÐºÑÐ°Ð»Ð»Ð° Ð»Ð°ÑÐ¸Ð¹ ÑÓÑÐ½Ð°?", "ooui-dialog-confirm-default-ok": "Ð¥ÓÐ°Ñ", diff --git a/resources/lib/oojs-ui/i18n/kn.json b/resources/lib/oojs-ui/i18n/kn.json index 76b654b810..85931f573f 100644 --- a/resources/lib/oojs-ui/i18n/kn.json +++ b/resources/lib/oojs-ui/i18n/kn.json @@ -6,6 +6,8 @@ ] }, "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": "à²§à³à²¡à²ªà²¡à²¿à²¸à³", diff --git a/resources/lib/oojs-ui/images/indicators/alert.svg b/resources/lib/oojs-ui/images/indicators/alert.svg index 8ce4b25928..e549b178bc 100644 --- a/resources/lib/oojs-ui/images/indicators/alert.svg +++ b/resources/lib/oojs-ui/images/indicators/alert.svg @@ -1,8 +1,9 @@ - this is easy + rel = { + 'top': eld.rect.top, + 'bottom': $win.innerHeight() - eld.rect.bottom, + 'left': eld.rect.left, + 'right': $win.innerWidth() - eld.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 }; + } if ( !config.direction || config.direction === 'y' ) { if ( rel.top < 0 ) { @@ -606,6 +620,7 @@ OO.ui.Element.prototype.scrollElementIntoView = function ( config ) { /** * Bind a handler for an event on this.$element * + * @deprecated Use jQuery#on instead. * @param {string} event * @param {Function} callback */ @@ -616,6 +631,7 @@ OO.ui.Element.prototype.onDOMEvent = function ( event, callback ) { /** * Unbind a handler bound with #offDOMEvent * + * @deprecated Use jQuery#off instead. * @param {string} event * @param {Function} callback */ @@ -624,105 +640,33 @@ OO.ui.Element.prototype.offDOMEvent = function ( event, callback ) { }; ( function () { - // Static - - // jQuery 1.8.3 has a bug with handling focusin/focusout events inside iframes. - // Firefox doesn't support focusin/focusout at all, so we listen for 'focus'/'blur' on the - // document, and simulate a 'focusin'/'focusout' event on the target element and make - // it bubble from there. - // - // - http://jsfiddle.net/sw3hr/ - // - http://bugs.jquery.com/ticket/14180 - // - https://github.com/jquery/jquery/commit/1cecf64e5aa4153 - function specialEvent( simulatedName, realName ) { - function handler( e ) { - jQuery.event.simulate( - simulatedName, - e.target, - jQuery.event.fix( e ), - /* bubble = */ true - ); - } - - return { - setup: function () { - var doc = this.ownerDocument || this, - attaches = $.data( doc, 'ooui-' + simulatedName + '-attaches' ); - if ( !attaches ) { - doc.addEventListener( realName, handler, true ); - } - $.data( doc, 'ooui-' + simulatedName + '-attaches', ( attaches || 0 ) + 1 ); - }, - teardown: function () { - var doc = this.ownerDocument || this, - attaches = $.data( doc, 'ooui-' + simulatedName + '-attaches' ) - 1; - if ( !attaches ) { - doc.removeEventListener( realName, handler, true ); - $.removeData( doc, 'ooui-' + simulatedName + '-attaches' ); - } else { - $.data( doc, 'ooui-' + simulatedName + '-attaches', attaches ); - } - } - }; - } - - var hasOwn = Object.prototype.hasOwnProperty, - specialEvents = { - focusin: specialEvent( 'focusin', 'focus' ), - focusout: specialEvent( 'focusout', 'blur' ) - }; - /** * Bind a handler for an event on a DOM element. * - * Uses jQuery internally for everything except for events which are - * known to have issues in the browser or in jQuery. This method - * should become obsolete eventually. + * Used to be for working around a jQuery bug (jqbug.com/14180), + * but obsolete as of jQuery 1.11.0. * * @static + * @deprecated Use jQuery#on instead. * @param {HTMLElement|jQuery} el DOM element * @param {string} event Event to bind * @param {Function} callback Callback to call when the event fires */ OO.ui.Element.onDOMEvent = function ( el, event, callback ) { - var orig; - - if ( hasOwn.call( specialEvents, event ) ) { - // Replace jQuery's override with our own - orig = $.event.special[event]; - $.event.special[event] = specialEvents[event]; - - $( el ).on( event, callback ); - - // Restore - $.event.special[event] = orig; - } else { - $( el ).on( event, callback ); - } + $( el ).on( event, callback ); }; /** * Unbind a handler bound with #static-method-onDOMEvent. * + * @deprecated Use jQuery#off instead. * @static * @param {HTMLElement|jQuery} el DOM element * @param {string} event Event to unbind * @param {Function} [callback] Callback to unbind */ OO.ui.Element.offDOMEvent = function ( el, event, callback ) { - var orig; - if ( hasOwn.call( specialEvents, event ) ) { - // Replace jQuery's override with our own - orig = $.event.special[event]; - $.event.special[event] = specialEvents[event]; - - $( el ).off( event, callback ); - - // Restore - $.event.special[event] = orig; - } else { - $( el ).off( event, callback ); - } + $( el ).off( event, callback ); }; }() ); /** @@ -1341,6 +1285,10 @@ OO.ui.Window.prototype.open = function ( data ) { // Open the window this.opening = $.Deferred(); + + // So we can restore focus on closing + this.$prevFocus = $( document.activeElement ); + this.frame.load().done( OO.ui.bind( function () { this.$element.show(); this.visible = true; @@ -1404,6 +1352,11 @@ OO.ui.Window.prototype.close = function ( data ) { this.opened.resolve(); } this.$element.hide(); + // Restore focus to whatever was focused before opening + if ( this.$prevFocus ) { + this.$prevFocus.focus(); + this.$prevFocus = undefined; + } this.visible = false; this.closing.resolve(); // Now that we are totally done closing, it's safe to allow opening @@ -1608,7 +1561,7 @@ OO.ui.Dialog = function OoUiDialog( config ) { this.$element.on( 'mousedown', false ); // Initialization - this.$element.addClass( 'oo-ui-dialog' ); + this.$element.addClass( 'oo-ui-dialog' ).attr( 'role', 'dialog' ); this.setSize( config.size ); }; diff --git a/resources/lib/oojs-ui/oojs-ui.svg.css b/resources/lib/oojs-ui/oojs-ui.svg.css index aa4d42e7b3..76feb5d656 100644 --- a/resources/lib/oojs-ui/oojs-ui.svg.css +++ b/resources/lib/oojs-ui/oojs-ui.svg.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (c5ae888f67) + * OOjs UI v0.1.0-pre (7a0e222a75) * 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: Wed Jun 11 2014 18:10:09 GMT-0700 (PDT) + * Date: Wed Jun 18 2014 16:19:15 GMT-0700 (PDT) */ /* Textures */ -- 2.20.1