From: James D. Forrester Date: Wed, 26 Feb 2014 20:12:16 +0000 (-0800) Subject: Update OOjs UI to v0.1.0-pre (064484f9af) X-Git-Tag: 1.31.0-rc.0~16812^2 X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_aide%28?a=commitdiff_plain;h=40529e611b447ed0d6c1222e296a80320d4bb7dc;p=lhc%2Fweb%2Fwiklou.git Update OOjs UI to v0.1.0-pre (064484f9af) New changes: 2ebcd42 Localisation updates from https://translatewiki.net. 064484f Only pay attention to left mouse button events in PopupToolGroup Change-Id: I56f6b6e5022a5651ea27b1eb73f53218b0fedf0d --- diff --git a/resources/oojs-ui/i18n/ka.json b/resources/oojs-ui/i18n/ka.json index 78180af918..c9d2774362 100644 --- a/resources/oojs-ui/i18n/ka.json +++ b/resources/oojs-ui/i18n/ka.json @@ -7,10 +7,12 @@ "ITshnik", "MIKHEIL", "NoiX180", - "Pras" + "Pras", + "Tokoko" ] }, "ooui-dialog-action-close": "დახურვა", "ooui-outline-control-move-down": "ელემენტის ქვემოთ გადატანა", - "ooui-outline-control-move-up": "ელემენტის ზემოთ გადატანა" + "ooui-outline-control-move-up": "ელემენტის ზემოთ გადატანა", + "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 6f0b35437e..dcffbbde09 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 (ddcf828854) + * OOjs UI v0.1.0-pre (064484f9af) * 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 21 2014 19:44:50 GMT-0800 (PST) + * Date: Wed Feb 26 2014 12:12:11 GMT-0800 (PST) */ ( function () { @@ -4497,17 +4497,12 @@ OO.ui.PopupToolGroup.prototype.onBlur = function ( e ) { * @inheritdoc */ OO.ui.PopupToolGroup.prototype.onMouseUp = function ( e ) { - this.setActive( false ); + if ( !this.disabled && e.which === 1 ) { + this.setActive( false ); + } return OO.ui.ToolGroup.prototype.onMouseUp.call( this, e ); }; -/** - * @inheritdoc - */ -OO.ui.PopupToolGroup.prototype.onMouseDown = function ( e ) { - return OO.ui.ToolGroup.prototype.onMouseDown.call( this, e ); -}; - /** * Handle mouse up events. * diff --git a/resources/oojs-ui/oojs-ui.svg.css b/resources/oojs-ui/oojs-ui.svg.css index e140423aaf..ad435b3985 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-svg (ddcf828854) + * OOjs UI v0.1.0-pre-svg (064484f9af) * 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 21 2014 19:44:50 GMT-0800 (PST) + * Date: Wed Feb 26 2014 12:12:11 GMT-0800 (PST) */ /*csslint vendor-prefix:false */