Skip to content
This repository has been archived by the owner on Feb 12, 2022. It is now read-only.

add itemSelect option and associated test cases to tree.js #1012

Merged
merged 1 commit into from
Jan 30, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions js/tree.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,10 @@
this.$element = $(element);
this.options = $.extend({}, $.fn.tree.defaults, options);

this.$element.on('click.fu.tree', '.tree-item', $.proxy( function(ev) { this.selectItem(ev.currentTarget); } ,this));
if( this.options.itemSelect ){
this.$element.on('click.fu.tree', '.tree-item', $.proxy( function(ev) { this.selectItem(ev.currentTarget); } ,this));
}

this.$element.on('click.fu.tree', '.tree-branch-name', $.proxy( function(ev) { this.openFolder(ev.currentTarget); }, this));

if( this.options.folderSelect ){
Expand Down Expand Up @@ -147,6 +150,8 @@
},

selectItem: function (el) {
if(!this.options.itemSelect) return;

var $el = $(el);
var selData = $el.data();
var $all = this.$element.find('.tree-selected');
Expand Down Expand Up @@ -249,6 +254,8 @@
},

selectFolder: function (clickedElement) {
if(!this.options.folderSelect) return;

var $clickedElement = $(clickedElement);
var $clickedBranch = $clickedElement.closest('.tree-branch');
var $selectedBranch = this.$element.find('.tree-branch.tree-selected');
Expand Down Expand Up @@ -349,7 +356,8 @@
dataSource: function(options, callback){},
multiSelect: false,
cacheItems: true,
folderSelect: true
folderSelect: true,
itemSelect: true
};

$.fn.tree.Constructor = Tree;
Expand Down
24 changes: 24 additions & 0 deletions test/tree-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,30 @@ define(function(require){
equal($tree.tree('selectedItems').length, 1, 'Return single selected value');
});

test("should not allow selecting items if disabled", function() {
var $tree = $(html).find('#MyTree');

$tree.tree({
dataSource: this.dataSource,
itemSelect: false
});

$tree.tree('selectItem', $tree.find('.tree-item:eq(1)'));
equal($tree.tree('selectedItems').length, 0, 'Return no value');
});

test("should not allow selecting folders if disabled", function() {
var $tree = $(html).find('#MyTree');

$tree.tree({
dataSource: this.dataSource,
folderSelect: false
});

$tree.tree('selectFolder', $tree.find('.tree-branch-name:eq(1)'));
equal($tree.tree('selectedItems').length, 0, 'Return no value');
});

test("should destroy control", function () {
var $tree = $(html).find('#MyTree');

Expand Down