From c301a73e38c74a566451427d7e4e37fc8aa5abf5 Mon Sep 17 00:00:00 2001 From: rolux Date: Fri, 22 Jun 2012 09:22:04 +0200 Subject: [PATCH] TreeList: load in expanded state if options.expanded is true --- source/Ox.UI/js/List/TreeList.js | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/source/Ox.UI/js/List/TreeList.js b/source/Ox.UI/js/List/TreeList.js index a72abc52..cbb57873 100644 --- a/source/Ox.UI/js/List/TreeList.js +++ b/source/Ox.UI/js/List/TreeList.js @@ -209,16 +209,14 @@ Ox.TreeList = function(options, self) { items = items || self.options.items; level = level || 0; items.forEach(function(item, i) { - var item_ = Ox.extend({ - level: level - }, item, item.items - ? { - items: item.expanded - ? parseItems(item.items, level + 1) - : [] - } - : {} - ); + if (item.items && self.options.expanded) { + item.expanded = true; + } + var item_ = Ox.extend({level: level}, item, item.items ? { + items: item.expanded + ? parseItems(item.items, level + 1) + : [] + } : {}); ret.push(item_); if (item.items) { ret = ret.concat(item_.items); @@ -255,13 +253,15 @@ Ox.TreeList = function(options, self) { $img.attr({ src: getIcon(item.id, expanded).attr('src') }); - expanded - ? that.$element.addItems( + if (expanded) { + that.$element.addItems( pos + 1, parseItems(item.items, item.level + 1) - ) - : that.$element.removeItems( + ); + } else { + that.$element.removeItems( pos + 1, parseItems(item.items, item.level + 1).length ); + } } function toggleItems(data) {