From 3b63e426abf0f7085cb1e63d63a6a93deb9dbe49 Mon Sep 17 00:00:00 2001 From: "James D. Forrester" Date: Thu, 13 Feb 2014 18:43:07 -0800 Subject: [PATCH] Update OOjs UI to v0.1.0-pre (7d3223b8f4) 6c3e183 Add icons demo f285a06 build: Concatenation task should not include 'default' in a variant 7d3223b Fix for clearing items in a group element Change-Id: I8f1b59806b25f5d6a1431e77d654259385245b91 --- resources/oojs-ui/oojs-ui.js | 11 ++++++----- resources/oojs-ui/oojs-ui.svg.css | 4 ++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/resources/oojs-ui/oojs-ui.js b/resources/oojs-ui/oojs-ui.js index 07bb2a84f0..7412270060 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 (7788dc6700) + * OOjs UI v0.1.0-pre (7d3223b8f4) * 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: Thu Feb 13 2014 13:56:07 GMT-0800 (PST) + * Date: Thu Feb 13 2014 18:36:08 GMT-0800 (PST) */ ( function () { @@ -2163,12 +2163,13 @@ OO.ui.GroupElement.prototype.clearItems = function () { var i, len, item; // Remove all items - if ( this.aggregate ) { - for ( i = 0, len = this.items.length; i < len; i++ ) { + for ( i = 0, len = this.items.length; i < len; i++ ) { + item = this.items[i]; + if ( this.aggregate ) { item.disconnect( this ); } + item.setElementGroup( null ); } - item.setElementGroup( null ); this.items = []; this.$items.detach(); this.$items = this.$( [] ); diff --git a/resources/oojs-ui/oojs-ui.svg.css b/resources/oojs-ui/oojs-ui.svg.css index be512dd721..24c6a1ae4c 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 (7788dc6700) + * OOjs UI v0.1.0-pre-svg (7d3223b8f4) * 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: Thu Feb 13 2014 13:56:07 GMT-0800 (PST) + * Date: Thu Feb 13 2014 18:36:08 GMT-0800 (PST) */ /*csslint vendor-prefix:false */ -- 2.20.1