jenkins-bot has submitted this change and it was merged. Change subject: Update OOjs UI to v0.1.0-pre (0e50d2e336) ......................................................................
Update OOjs UI to v0.1.0-pre (0e50d2e336) New changes: 1283a33 Localisation updates from https://translatewiki.net. 0e50d2e Initialise dir property and use a getter Change-Id: Ieb469d38e881cf7de284a987301626a2f945d2df --- M resources/lib/oojs-ui/i18n/zh-hans.json M resources/lib/oojs-ui/oojs-ui-agora.css M resources/lib/oojs-ui/oojs-ui-apex.css M resources/lib/oojs-ui/oojs-ui.js M resources/lib/oojs-ui/oojs-ui.svg.css 5 files changed, 23 insertions(+), 12 deletions(-) Approvals: Amire80: Looks good to me, approved jenkins-bot: Verified diff --git a/resources/lib/oojs-ui/i18n/zh-hans.json b/resources/lib/oojs-ui/i18n/zh-hans.json index 50df67a..02bdafa 100644 --- a/resources/lib/oojs-ui/i18n/zh-hans.json +++ b/resources/lib/oojs-ui/i18n/zh-hans.json @@ -15,14 +15,15 @@ "Xiaomingyan", "Yfdyh000", "Zhangjintao", - "乌拉跨氪" + "乌拉跨氪", + "Great Brightstar" ] }, "ooui-outline-control-move-down": "下移项", "ooui-outline-control-move-up": "上移项", "ooui-outline-control-remove": "删除项", "ooui-toolbar-more": "更多", - "ooui-dialog-message-accept": "好", + "ooui-dialog-message-accept": "确定", "ooui-dialog-message-reject": "取消", "ooui-dialog-process-error": "发生一些错误", "ooui-dialog-process-dismiss": "解除", diff --git a/resources/lib/oojs-ui/oojs-ui-agora.css b/resources/lib/oojs-ui/oojs-ui-agora.css index 525304c..22c3079 100644 --- a/resources/lib/oojs-ui/oojs-ui-agora.css +++ b/resources/lib/oojs-ui/oojs-ui-agora.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (dd294dc785) + * OOjs UI v0.1.0-pre (0e50d2e336) * 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-07-30T23:10:53Z + * Date: 2014-08-06T12:56:55Z */ .oo-ui-dialog-content > .oo-ui-window-head, .oo-ui-dialog-content > .oo-ui-window-body, diff --git a/resources/lib/oojs-ui/oojs-ui-apex.css b/resources/lib/oojs-ui/oojs-ui-apex.css index 1267a3c..c53772e 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 (dd294dc785) + * OOjs UI v0.1.0-pre (0e50d2e336) * 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-07-30T23:10:53Z + * Date: 2014-08-06T12:56:55Z */ .oo-ui-dialog-content > .oo-ui-window-head, .oo-ui-dialog-content > .oo-ui-window-body, diff --git a/resources/lib/oojs-ui/oojs-ui.js b/resources/lib/oojs-ui/oojs-ui.js index 737113e..6f63575 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 (dd294dc785) + * OOjs UI v0.1.0-pre (0e50d2e336) * 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-07-30T23:10:53Z + * Date: 2014-08-06T12:56:55Z */ ( function ( OO ) { @@ -1114,6 +1114,7 @@ // Properties this.loading = null; this.config = config; + this.dir = null; // Initialize this.$element @@ -1287,7 +1288,7 @@ win = this.$element.prop( 'contentWindow' ); doc = win.document; - // Figure out directionality: + // Cache directionality this.dir = OO.ui.Element.getDir( this.$element ) || 'ltr'; // Initialize contents @@ -1298,7 +1299,7 @@ doc.write( '<!doctype html>' + '<html>' + - '<body class="oo-ui-frame-content oo-ui-' + this.dir + '" dir="' + this.dir + '">' + + '<body class="oo-ui-frame-content oo-ui-' + this.getDir() + '" dir="' + this.getDir() + '">' + '</body>' + '</html>' ); @@ -1332,6 +1333,15 @@ }; /** + * Get the directionality of the frame + * + * @return {string} Directionality, 'ltr' or 'rtl' + */ +OO.ui.Frame.prototype.getDir = function () { + return this.dir; +}; + +/** * Container for elements. * * @abstract diff --git a/resources/lib/oojs-ui/oojs-ui.svg.css b/resources/lib/oojs-ui/oojs-ui.svg.css index bffc230..aa5e6ac 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 (dd294dc785) + * OOjs UI v0.1.0-pre (0e50d2e336) * 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-07-30T23:10:53Z + * Date: 2014-08-06T12:56:55Z */ /* Textures */ -- To view, visit https://gerrit.wikimedia.org/r/152055 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ieb469d38e881cf7de284a987301626a2f945d2df Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Catrope <roan.katt...@gmail.com> Gerrit-Reviewer: Amire80 <amir.ahar...@mail.huji.ac.il> Gerrit-Reviewer: Jack Phoenix <j...@countervandalism.net> Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org> Gerrit-Reviewer: Krinkle <krinklem...@gmail.com> Gerrit-Reviewer: Siebrand <siebr...@kitano.nl> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
