From b7551623ef67e9eb51033943a2f8b8c581024acc Mon Sep 17 00:00:00 2001 From: "James D. Forrester" Date: Wed, 15 Oct 2014 15:39:38 -0700 Subject: [PATCH] Update OOjs UI to v0.1.0-pre (98cecf304d) New changes: 98cecf3 Support MenuWidget's config.widget being in a different document Change-Id: Ifc30790e67926bbdda0a8d5ec9464e7046f984ea --- resources/lib/oojs-ui/oojs-ui-apex.css | 4 ++-- resources/lib/oojs-ui/oojs-ui-apex.js | 4 ++-- resources/lib/oojs-ui/oojs-ui-apex.svg.css | 4 ++-- resources/lib/oojs-ui/oojs-ui-mediawiki.css | 4 ++-- resources/lib/oojs-ui/oojs-ui-mediawiki.js | 4 ++-- .../lib/oojs-ui/oojs-ui-mediawiki.svg.css | 4 ++-- resources/lib/oojs-ui/oojs-ui-minerva.css | 4 ++-- resources/lib/oojs-ui/oojs-ui-minerva.js | 4 ++-- resources/lib/oojs-ui/oojs-ui-minerva.svg.css | 4 ++-- resources/lib/oojs-ui/oojs-ui.js | 24 +++++++++++++++---- 10 files changed, 37 insertions(+), 23 deletions(-) diff --git a/resources/lib/oojs-ui/oojs-ui-apex.css b/resources/lib/oojs-ui/oojs-ui-apex.css index 42e6699fd6..ae09ca127c 100644 --- a/resources/lib/oojs-ui/oojs-ui-apex.css +++ b/resources/lib/oojs-ui/oojs-ui-apex.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (d74a46ca6a) + * OOjs UI v0.1.0-pre (98cecf304d) * 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-10-15T00:40:28Z + * Date: 2014-10-15T22:39:34Z */ /* @noflip */ .oo-ui-rtl { diff --git a/resources/lib/oojs-ui/oojs-ui-apex.js b/resources/lib/oojs-ui/oojs-ui-apex.js index ba1ef86f0f..9f68e759dd 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.1.0-pre (d74a46ca6a) + * OOjs UI v0.1.0-pre (98cecf304d) * 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-10-15T00:40:17Z + * Date: 2014-10-15T22:39:24Z */ /* Instantiation */ diff --git a/resources/lib/oojs-ui/oojs-ui-apex.svg.css b/resources/lib/oojs-ui/oojs-ui-apex.svg.css index 06880ff740..8ee3096c08 100644 --- a/resources/lib/oojs-ui/oojs-ui-apex.svg.css +++ b/resources/lib/oojs-ui/oojs-ui-apex.svg.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (d74a46ca6a) + * OOjs UI v0.1.0-pre (98cecf304d) * 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-10-15T00:40:28Z + * Date: 2014-10-15T22:39:34Z */ /* @noflip */ .oo-ui-rtl { diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki.css b/resources/lib/oojs-ui/oojs-ui-mediawiki.css index 7fbd762b07..2890807d55 100644 --- a/resources/lib/oojs-ui/oojs-ui-mediawiki.css +++ b/resources/lib/oojs-ui/oojs-ui-mediawiki.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (d74a46ca6a) + * OOjs UI v0.1.0-pre (98cecf304d) * 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-10-15T00:40:28Z + * Date: 2014-10-15T22:39:34Z */ /* @noflip */ .oo-ui-rtl { diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki.js b/resources/lib/oojs-ui/oojs-ui-mediawiki.js index 8fed98381d..5524abe3ee 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.1.0-pre (d74a46ca6a) + * OOjs UI v0.1.0-pre (98cecf304d) * 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-10-15T00:40:17Z + * Date: 2014-10-15T22:39:24Z */ /** * @class diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki.svg.css b/resources/lib/oojs-ui/oojs-ui-mediawiki.svg.css index 266d714a02..d0a455acd6 100644 --- a/resources/lib/oojs-ui/oojs-ui-mediawiki.svg.css +++ b/resources/lib/oojs-ui/oojs-ui-mediawiki.svg.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (d74a46ca6a) + * OOjs UI v0.1.0-pre (98cecf304d) * 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-10-15T00:40:28Z + * Date: 2014-10-15T22:39:34Z */ /* @noflip */ .oo-ui-rtl { diff --git a/resources/lib/oojs-ui/oojs-ui-minerva.css b/resources/lib/oojs-ui/oojs-ui-minerva.css index 8feccb9472..030a207555 100644 --- a/resources/lib/oojs-ui/oojs-ui-minerva.css +++ b/resources/lib/oojs-ui/oojs-ui-minerva.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (d74a46ca6a) + * OOjs UI v0.1.0-pre (98cecf304d) * 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-10-15T00:40:28Z + * Date: 2014-10-15T22:39:34Z */ /* @noflip */ .oo-ui-rtl { diff --git a/resources/lib/oojs-ui/oojs-ui-minerva.js b/resources/lib/oojs-ui/oojs-ui-minerva.js index ba1ef86f0f..9f68e759dd 100644 --- a/resources/lib/oojs-ui/oojs-ui-minerva.js +++ b/resources/lib/oojs-ui/oojs-ui-minerva.js @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (d74a46ca6a) + * OOjs UI v0.1.0-pre (98cecf304d) * 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-10-15T00:40:17Z + * Date: 2014-10-15T22:39:24Z */ /* Instantiation */ diff --git a/resources/lib/oojs-ui/oojs-ui-minerva.svg.css b/resources/lib/oojs-ui/oojs-ui-minerva.svg.css index ad1316cc92..45d32e81e5 100644 --- a/resources/lib/oojs-ui/oojs-ui-minerva.svg.css +++ b/resources/lib/oojs-ui/oojs-ui-minerva.svg.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (d74a46ca6a) + * OOjs UI v0.1.0-pre (98cecf304d) * 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-10-15T00:40:28Z + * Date: 2014-10-15T22:39:34Z */ /* @noflip */ .oo-ui-rtl { diff --git a/resources/lib/oojs-ui/oojs-ui.js b/resources/lib/oojs-ui/oojs-ui.js index 50f69f3f5f..925585c5f2 100644 --- a/resources/lib/oojs-ui/oojs-ui.js +++ b/resources/lib/oojs-ui/oojs-ui.js @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (d74a46ca6a) + * OOjs UI v0.1.0-pre (98cecf304d) * 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-10-15T00:40:17Z + * Date: 2014-10-15T22:39:24Z */ ( function ( OO ) { @@ -11181,7 +11181,9 @@ OO.ui.MenuWidget.prototype.toggle = function ( visible ) { visible = ( visible === undefined ? !this.visible : !!visible ) && !!this.items.length; var i, len, - change = visible !== this.isVisible(); + change = visible !== this.isVisible(), + elementDoc = this.getElementDocument(), + widgetDoc = this.$widget ? this.$widget[0].ownerDocument : null; // Parent method OO.ui.MenuWidget.super.prototype.toggle.call( this, visible ); @@ -11205,9 +11207,15 @@ OO.ui.MenuWidget.prototype.toggle = function ( visible ) { // Auto-hide if ( this.autoHide ) { - this.getElementDocument().addEventListener( + elementDoc.addEventListener( 'mousedown', this.onDocumentMouseDownHandler, true ); + // Support $widget being in a different document + if ( widgetDoc && widgetDoc !== elementDoc ) { + widgetDoc.addEventListener( + 'mousedown', this.onDocumentMouseDownHandler, true + ); + } } } else { this.unbindKeyDownListener(); @@ -11215,9 +11223,15 @@ OO.ui.MenuWidget.prototype.toggle = function ( visible ) { this.$previousFocus[0].focus(); this.$previousFocus = null; } - this.getElementDocument().removeEventListener( + elementDoc.removeEventListener( 'mousedown', this.onDocumentMouseDownHandler, true ); + // Support $widget being in a different document + if ( widgetDoc && widgetDoc !== elementDoc ) { + widgetDoc.removeEventListener( + 'mousedown', this.onDocumentMouseDownHandler, true + ); + } this.toggleClipping( false ); } } -- 2.20.1