From 8e84e892604ae7e5d513e927f04fda221113be7f Mon Sep 17 00:00:00 2001 From: "James D. Forrester" Date: Thu, 13 Mar 2014 17:11:17 -0700 Subject: [PATCH] Update OOjs UI to v0.1.0-pre (ac0cc69508) New changes: 5c41645 Localisation updates from https://translatewiki.net. c4651d5 readme: Use
instead of
to satisfy gitblit's Markdown parser 5345806 Make it possible to configure LabeledElement to not use autoEllipsis ac0cc69 Use boolean instead of bool in LabeledElement docs Change-Id: I0e8bf836035402bc893c4dc58cb9d5441b7bd330 --- resources/oojs-ui/i18n/cs.json | 1 + resources/oojs-ui/oojs-ui.js | 8 +++++--- resources/oojs-ui/oojs-ui.svg.css | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/resources/oojs-ui/i18n/cs.json b/resources/oojs-ui/i18n/cs.json index 9661ec6fb0..670073f9c6 100644 --- a/resources/oojs-ui/i18n/cs.json +++ b/resources/oojs-ui/i18n/cs.json @@ -16,5 +16,6 @@ "ooui-dialog-action-close": "Zavřít", "ooui-outline-control-move-down": "Přesunout položku dolů", "ooui-outline-control-move-up": "Přesunout položku nahoru", + "ooui-outline-control-remove": "Odstranit položku", "ooui-toolbar-more": "Další" } \ No newline at end of file diff --git a/resources/oojs-ui/oojs-ui.js b/resources/oojs-ui/oojs-ui.js index 7878219785..a27c53ece2 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 (46ccd5b3a7) + * OOjs UI v0.1.0-pre (ac0cc69508) * 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 Mar 12 2014 17:44:18 GMT-0700 (PDT) + * Date: Thu Mar 13 2014 17:11:12 GMT-0700 (PDT) */ ( function () { @@ -2459,6 +2459,7 @@ OO.ui.IndicatedElement.prototype.getIndicatorTitle = function () { * @param {jQuery} $label Label node, assigned to #$label * @param {Object} [config] Configuration options * @cfg {jQuery|string|Function} [label] Label nodes, text or a function that returns nodes or text + * @cfg {boolean} [autoFitLabel=true] Whether to fit the label or not. */ OO.ui.LabeledElement = function OoUiLabeledElement( $label, config ) { // Config intialization @@ -2471,6 +2472,7 @@ OO.ui.LabeledElement = function OoUiLabeledElement( $label, config ) { // Initialization this.$label.addClass( 'oo-ui-labeledElement-label' ); this.setLabel( config.label || this.constructor.static.label ); + this.autoFitLabel = config.autoFitLabel === undefined || !!config.autoFitLabel; }; /* Static Properties */ @@ -2541,7 +2543,7 @@ OO.ui.LabeledElement.prototype.getLabel = function () { * @chainable */ OO.ui.LabeledElement.prototype.fitLabel = function () { - if ( this.$label.autoEllipsis ) { + if ( this.$label.autoEllipsis && this.autoFitLabel ) { this.$label.autoEllipsis( { 'hasSpan': false, 'tooltip': true } ); } return this; diff --git a/resources/oojs-ui/oojs-ui.svg.css b/resources/oojs-ui/oojs-ui.svg.css index 59e3f4e970..2a6fab2f99 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 (46ccd5b3a7) + * OOjs UI v0.1.0-pre (ac0cc69508) * 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 Mar 12 2014 17:44:18 GMT-0700 (PDT) + * Date: Thu Mar 13 2014 17:11:12 GMT-0700 (PDT) */ /* Textures */ -- 2.20.1