Skip to content

Tree constructor actions #196

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

Merged
ciennG merged 2 commits into from
May 3, 2020
Merged

Tree constructor actions #196

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8fc0f1c
integrated resource editor, viewer, creator into tree (with bugs)
ciennG May 3, 2020
762648b
Finished tree integration with resource ditor, viewer, creator.
ciennG May 3, 2020
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
Prev Previous commit
Finished tree integration with resource ditor, viewer, creator.
  • Loading branch information
@ciennG
ciennG committed May 3, 2020
commit 762648ba963f6c5fa0779118d770381f23b4f4e5
26 changes: 16 additions & 10 deletions public/js/Tree.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -929,9 +929,17 @@ Tree.prototype.centerOnNode = function(node)
{
var style = self.locals.style.get(this);

isResource = this.__data__.id.charAt(0) === 'r';

switch (style.level)
{

case -1:
case 0:
if(isResource){
self.nodeClicked(this);
break;
}
case 1:
case 2:
self.nodeClicked(this);
Expand Down Expand Up @@ -1166,9 +1174,13 @@ Tree.prototype.menuContextNodeOpen = function(node, data, index)

if(data.id.charAt(0) !== 'r')
{
menu_context_items.add.enabled = false;
menu_context_items.edit.enabled = false;
}

if(data.id.charAt(0) !== 't')
{
menu_context_items.add.enabled = false;
}

if (self.user_active_id === 0)
{
Expand Down Expand Up @@ -1421,39 +1433,33 @@ Tree.prototype.centerAndAdd = function(node_id)
{
var self = this;

console.log("node_id= " + node_id)
var node = self.nodes.filter(function(d,i){
console.log(d.id);
return d.id === node_id;
});
self.centerOnNode(node.nodes()[0]);//kinda not really d3-ish, but whatever
openResourceCreator(node_id);
openResourceCreator(node_id.substr(1));
};

Tree.prototype.centerAndEdit = function(node_id)
{
var self = this;

console.log("node_id= " + node_id)
var node = self.nodes.filter(function(d,i){
console.log(d.id);
return d.id === node_id;
});
self.centerOnNode(node.nodes()[0]);//kinda not really d3-ish, but whatever
openResourceEditor(node_id);
openResourceEditor(node_id.substr(1));
};

Tree.prototype.centerAndOpen = function(node_id)
{
var self = this;

console.log("node_id= " + node_id)
var node = self.nodes.filter(function(d,i){
console.log(d.id);
return d.id === node_id;
});
self.centerOnNode(node.nodes()[0]);//kinda not really d3-ish, but whatever
openResourceViewer(node_id);
openResourceViewer(node_id.substr(1));
};

//wrapper for centerAndAdd to be called from context menu
Expand Down