Skip to content

add model #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
developer-cmsspin wants to merge 1 commit into
base: master
Choose a base branch
from
Open

add model #40

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 34 additions & 4 deletions jsTree.directive.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@
*/

var ngJSTree = angular.module('jsTree.directive', []);
ngJSTree.directive('jsTree', ['$http', function($http) {
ngJSTree.directive('jsTree', ['$http','$parse', function($http,$parse) {

var treeDir = {
restrict: 'EA',
scope: true,
fetchResource: function(url, cb) {
return $http.get(url).then(function(data) {
if (cb) cb(data.data);
Expand Down Expand Up @@ -51,7 +52,17 @@ ngJSTree.directive('jsTree', ['$http', function($http) {

if (config.plugins.indexOf('contextmenu') >= 0) {
if (a.treeContextmenu) {
config.contextmenu = s[a.treeContextmenu];
config.contextmenu = config.contextmenu || {};

if (a.treeContextmenuaction != undefined) {
config.contextmenu.items = function(e) {
return s.$eval(a.treeContextmenuaction)(e);
}
} else {
config.contextmenu.items = function() {
return s[a.treeContextmenu];
}
}
}
}

Expand Down Expand Up @@ -97,6 +108,17 @@ ngJSTree.directive('jsTree', ['$http', function($http) {
config.core = $.extend(config.core, s[a.treeCore]);
}

//Add model by ng-model or tree-model
var model = null;
if(a.ngModel == undefined){
model = $parse(a.treeModel);
}else{
model = $parse(a.ngModel);
}

//get value model
var valueModel = model(s);

// clean Case
a.treeData = a.treeData ? a.treeData.toLowerCase() : '';
a.treeSrc = a.treeSrc ? a.treeSrc.toLowerCase() : '';
Expand All @@ -112,9 +134,17 @@ ngJSTree.directive('jsTree', ['$http', function($http) {
treeDir.init(s, e, a, config);
});
} else if (a.treeData == 'scope') {
s.$watch(a.treeModel, function(n, o) {

//if valueModel not is undefined
if(valueModel){
config.core.data = valueModel;
treeDir.init(s, e, a, config);
}

//if value change execute rebuild tree
s.$watch(valueModel, function(n, o) {
if (n) {
config.core.data = s[a.treeModel];
config.core.data = valueModel;
$(e).jstree('destroy');
treeDir.init(s, e, a, config);
}
Expand Down