Merge pull request #196 from studycloud/treeConstructorActions

ciennG · web-flow · commit 18c600ce7b43 · 2020-05-02T21:33:15.000-05:00
Tree constructor actions
diff --git a/public/js/Tree.js b/public/js/Tree.js
@@ -1,4 +1,4 @@
-function Tree(type, frame_id, server, node_id = "t0", action = "open")
+function Tree(type, frame_id, server, node_id = "t0", action = "none")
 {		
 	//Creates a tree visualization with a type of <type> inside the DOM element <frame_id>
 	
@@ -80,7 +80,7 @@ function Tree(type, frame_id, server, node_id = "t0", action = "open")
 	self.menuContextNodeCreate();
 
 
-	if(action !== "open" && node_id.charAt(0) !== 'r')
+	if(action !== "none" && node_id.charAt(0) !== 'r')
 	{
 		throw "Tree constructor attempting to edit/add non-resource node " + node_id;
 	}
@@ -97,7 +97,7 @@ function Tree(type, frame_id, server, node_id = "t0", action = "open")
 	{
 		self.centerAndAdd(node_id);
 	}
-	else
+	else if(action !== "none")
 	{
 		throw "Invalid action passed to tree constructor: " + action;
 	}
@@ -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);
@@ -1029,8 +1037,7 @@ Tree.prototype.nodeClicked = function(node)
 	}
 	else
 	{
-		alert("Clicked resource: " + node.__data__.name);
-		//TODO: call the resource viewer on this node.
+		self.centerAndOpen(node_ID);
 	}
 
 };
@@ -1167,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)
 	{
@@ -1421,16 +1432,34 @@ Tree.prototype.nodeUncapture = function(node, data, index)
 Tree.prototype.centerAndAdd = function(node_id)
 {
 	var self = this;
+
+	var node = self.nodes.filter(function(d,i){
+		return d.id === node_id;
+	});
+	self.centerOnNode(node.nodes()[0]);//kinda not really d3-ish, but whatever
+	openResourceCreator(node_id.substr(1));
 };
 
 Tree.prototype.centerAndEdit = function(node_id)
 {
 	var self = this;
+
+	var node = self.nodes.filter(function(d,i){
+		return d.id === node_id;
+	});
+	self.centerOnNode(node.nodes()[0]);//kinda not really d3-ish, but whatever
+	openResourceEditor(node_id.substr(1));
 };
 
 Tree.prototype.centerAndOpen = function(node_id)
 {
 	var self = this;
+
+	var node = self.nodes.filter(function(d,i){
+		return d.id === node_id;
+	});
+	self.centerOnNode(node.nodes()[0]);//kinda not really d3-ish, but whatever
+	openResourceViewer(node_id.substr(1));
 };
 
 //wrapper for centerAndAdd to be called from context menu

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-function Tree(type, frame_id, server, node_id = "t0", action = "open")`
	`1`	`+function Tree(type, frame_id, server, node_id = "t0", action = "none")`
`2`	`2`	`{`
`3`	`3`	`//Creates a tree visualization with a type of <type> inside the DOM element <frame_id>`
`4`	`4`
`@@ -80,7 +80,7 @@ function Tree(type, frame_id, server, node_id = "t0", action = "open")`
`80`	`80`	`self.menuContextNodeCreate();`
`81`	`81`
`82`	`82`
`83`		`- if(action !== "open" && node_id.charAt(0) !== 'r')`
	`83`	`+ if(action !== "none" && node_id.charAt(0) !== 'r')`
`84`	`84`	`{`
`85`	`85`	`throw "Tree constructor attempting to edit/add non-resource node " + node_id;`
`86`	`86`	`}`
`@@ -97,7 +97,7 @@ function Tree(type, frame_id, server, node_id = "t0", action = "open")`
`97`	`97`	`{`
`98`	`98`	`self.centerAndAdd(node_id);`
`99`	`99`	`}`
`100`		`- else`
	`100`	`+ else if(action !== "none")`
`101`	`101`	`{`
`102`	`102`	`throw "Invalid action passed to tree constructor: " + action;`
`103`	`103`	`}`
`@@ -929,9 +929,17 @@ Tree.prototype.centerOnNode = function(node)`
`929`	`929`	`{`
`930`	`930`	`var style = self.locals.style.get(this);`
`931`	`931`
	`932`	`+ isResource = this.__data__.id.charAt(0) === 'r';`
	`933`	`+`
`932`	`934`	`switch (style.level)`
`933`	`935`	`{`
	`936`	`+`
`934`	`937`	`case -1:`
	`938`	`+ case 0:`
	`939`	`+ if(isResource){`
	`940`	`+ self.nodeClicked(this);`
	`941`	`+ break;`
	`942`	`+ }`
`935`	`943`	`case 1:`
`936`	`944`	`case 2:`
`937`	`945`	`self.nodeClicked(this);`
`@@ -1029,8 +1037,7 @@ Tree.prototype.nodeClicked = function(node)`
`1029`	`1037`	`}`
`1030`	`1038`	`else`
`1031`	`1039`	`{`
`1032`		`- alert("Clicked resource: " + node.__data__.name);`
`1033`		`- //TODO: call the resource viewer on this node.`
	`1040`	`+ self.centerAndOpen(node_ID);`
`1034`	`1041`	`}`
`1035`	`1042`
`1036`	`1043`	`};`
`@@ -1167,9 +1174,13 @@ Tree.prototype.menuContextNodeOpen = function(node, data, index)`
`1167`	`1174`
`1168`	`1175`	`if(data.id.charAt(0) !== 'r')`
`1169`	`1176`	`{`
`1170`		`- menu_context_items.add.enabled = false;`
`1171`	`1177`	`menu_context_items.edit.enabled = false;`
`1172`	`1178`	`}`
	`1179`	`+`
	`1180`	`+ if(data.id.charAt(0) !== 't')`
	`1181`	`+ {`
	`1182`	`+ menu_context_items.add.enabled = false;`
	`1183`	`+ }`
`1173`	`1184`
`1174`	`1185`	`if (self.user_active_id === 0)`
`1175`	`1186`	`{`
`@@ -1421,16 +1432,34 @@ Tree.prototype.nodeUncapture = function(node, data, index)`
`1421`	`1432`	`Tree.prototype.centerAndAdd = function(node_id)`
`1422`	`1433`	`{`
`1423`	`1434`	`var self = this;`
	`1435`	`+`
	`1436`	`+ var node = self.nodes.filter(function(d,i){`
	`1437`	`+ return d.id === node_id;`
	`1438`	`+ });`
	`1439`	`+ self.centerOnNode(node.nodes()[0]);//kinda not really d3-ish, but whatever`
	`1440`	`+ openResourceCreator(node_id.substr(1));`
`1424`	`1441`	`};`
`1425`	`1442`
`1426`	`1443`	`Tree.prototype.centerAndEdit = function(node_id)`
`1427`	`1444`	`{`
`1428`	`1445`	`var self = this;`
	`1446`	`+`
	`1447`	`+ var node = self.nodes.filter(function(d,i){`
	`1448`	`+ return d.id === node_id;`
	`1449`	`+ });`
	`1450`	`+ self.centerOnNode(node.nodes()[0]);//kinda not really d3-ish, but whatever`
	`1451`	`+ openResourceEditor(node_id.substr(1));`
`1429`	`1452`	`};`
`1430`	`1453`
`1431`	`1454`	`Tree.prototype.centerAndOpen = function(node_id)`
`1432`	`1455`	`{`
`1433`	`1456`	`var self = this;`
	`1457`	`+`
	`1458`	`+ var node = self.nodes.filter(function(d,i){`
	`1459`	`+ return d.id === node_id;`
	`1460`	`+ });`
	`1461`	`+ self.centerOnNode(node.nodes()[0]);//kinda not really d3-ish, but whatever`
	`1462`	`+ openResourceViewer(node_id.substr(1));`
`1434`	`1463`	`};`
`1435`	`1464`
`1436`	`1465`	`//wrapper for centerAndAdd to be called from context menu`