Skip to content
This repository was archived by the owner on Oct 22, 2020. It is now read-only.

Added direct attribute and used $parse for event handling #2

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Added direct attribute and used $parse for event handling #2

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
717e7b6
removed trailing slashes
Mar 20, 2013
a8a7ebb
added `direct` attribute as an addition to `multiple` to prevent the …
Mar 20, 2013
4fc633e
use parse to call the event handler, $scope is passed as a local vari…
Mar 20, 2013
e2edd73
send event along as local variable to the selected handler
Mar 20, 2013
a95b96c
do not allow $scope as local variable to the listener, only $event, t…
Mar 20, 2013
d5a9e9c
refactored getting and setting $selected property of a scope
Mar 20, 2013
2b2c51a
moved selectProperty method to tree
Mar 20, 2013
1928c80
use $parse to get and set the $selection property on the scope
Mar 20, 2013
4c7b722
use the expression on the `selected` attribute of the list item templ…
Mar 20, 2013
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
46 changes: 29 additions & 17 deletions angular.tree.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@

childNode.appendChild(wrapperEl);
}

var ulEl = document.createElement('UL');
ulEl.className = treeElem.className;
childNode.appendChild(ulEl);
Expand Down Expand Up @@ -87,14 +87,14 @@
});
}

function initTree (treeElem, attributes, $compile, $document) {
function initTree (treeElem, attributes, $compile, $document, $parse) {
var itemTemplate = getItemTemplate($document[0], treeElem[0]);
var treeModelExpr = attributes.src || attributes.ngTree;
var eachIter = itemTemplate[0].getAttribute('each');
var contextName = 'item';
var collectionExpr = 'item.children';
var selectExpr = itemTemplate.attr('select');
var selectedName = itemTemplate.attr('selected');
var selectedExpr = itemTemplate[0].getAttribute('selected')||'$selected';

if (eachIter) {
var match = /^\s*(\w+)\s+in\s+(.*?)\s*$/.exec(eachIter);
Expand All @@ -111,6 +111,7 @@

var tree = {
multiple: 'multiple' in attributes,
direct: 'direct' in attributes,
rootElem: treeElem,
treeModelExpr: treeModelExpr,
itemTemplate: $compile(itemTemplate),
Expand All @@ -130,14 +131,25 @@

trackSelection: !!selectExpr,

selected: function (scope, value) {
selected: function (scope, value, evt) {
if (this.trackSelection) {
scope.$selected = value;
this.selectedProperty(scope,value);

if (selectExpr) {
scope.$eval(selectExpr);
var f = $parse(selectExpr);
f(scope, {
'$event': evt
});
}
}
},

selectedProperty: function(scope,value) {
if (arguments.length > 1) {
$parse(selectedExpr).assign(scope,value);
} else {
return $parse(selectedExpr)(scope);
}
}
};

Expand All @@ -146,28 +158,28 @@
var selectedItemElem = findParentListItem(evt.target);
var selectedItemScope = selectedItemElem ? selectedItemElem.scope() : null;

if (evt[multiSelectKey] && tree.multiple) {
if ((evt[multiSelectKey] || tree.direct) && tree.multiple) {
if (selectedItemScope) {
selectedItemScope.$apply(function () {
tree.selected(selectedItemScope, ! selectedItemScope.$selected);
tree.selected(selectedItemScope, ! tree.selectedProperty(selectedItemScope), evt);
});
}
} else {
descendNodes(treeElem, function (listElem, itemElem) {
if (! selectedItemElem || itemElem[0] !== selectedItemElem[0]) {
var itemScope = itemElem.scope();

if (itemScope.$selected) {
if (tree.selectedProperty(itemScope)) {
itemScope.$apply(function () {
tree.selected(itemScope, false);
tree.selected(itemScope, false, evt);
});
}
}
});

if (selectedItemScope && ! selectedItemScope.$selected) {
if (selectedItemScope && ! tree.selectedProperty(selectedItemScope)) {
selectedItemScope.$apply(function () {
tree.selected(selectedItemScope, true);
tree.selected(selectedItemScope, true, evt);
});
}
}
Expand All @@ -184,7 +196,7 @@
var itemElem = tree.itemTemplate(itemScope, angular.noop);

if (tree.trackSelection) {
itemScope.$selected = false;
tree.selectedProperty(itemScope,false);
}

insertListItem(listElem, itemElem, index);
Expand Down Expand Up @@ -238,20 +250,20 @@
while (listElem.children().length > newList.length) {
var removeElem = listElem.children().eq(newList.length);

if (removeElem.scope().$selected) {
if (tree.selectedProperty(removeElem.scope())) {
tree.selected(removeElem.scope(), false);
}

removeElem.remove();
}
}, true);
}

angular.module('angularTree', []).
directive('ngTree', ['$compile', '$document', function ($compile, $document) {
directive('ngTree', ['$compile', '$document', '$parse', function ($compile, $document, $parse) {
return {
compile: function (elem, attrs) {
var tree = initTree(elem, attrs, $compile, $document);
var tree = initTree(elem, attrs, $compile, $document, $parse);

return function (scope, elem, attrs) {
loadTree(scope, tree, elem, tree.treeModelWatch);
Expand Down