sunrize 1.2.0 → 1.2.2

package/src/Editors/OutlineRouteGraph.js

@@ -1,21 +1,21 @@
-"use strict"
+"use strict";
 
 const
 	$           = require ("jquery"),
    X3D         = require ("../X3D"),
-	OutlineView = require ("./OutlineView")
+	OutlineView = require ("./OutlineView");
 
 const
 	routeColor         = "#000000",
-	routeSelectedColor = "rgb(255, 69, 58)"
+	routeSelectedColor = "rgb(255, 69, 58)";
 
 module .exports = class OutlineRouteGraph extends OutlineView
 {
    constructor (element)
    {
-      super (element)
+      super (element);
 
-		this .selectedRoutes = new Set ()
+		this .selectedRoutes = new Set ();
    }
 
 	selectRoutes (type, event)
@@ -24,13 +24,13 @@ module .exports = class OutlineRouteGraph extends OutlineView
 
 		const
 			element = $(event .currentTarget) .closest (".field", this .sceneGraph),
-			field   = this .getField (element)
+			field   = this .getField (element);
 
 		// Block default href.
-		event .preventDefault ()
-		event .stopImmediatePropagation ()
+		event .preventDefault ();
+		event .stopImmediatePropagation ();
 
-		this .selectedRoutes .clear ()
+		this .selectedRoutes .clear ();
 
 		switch (type)
 		{
@@ -38,25 +38,25 @@ module .exports = class OutlineRouteGraph extends OutlineView
 			{
 				for (const route of field .getInputRoutes ())
 				{
-					this .selectedRoutes .add (route .getId ())
-					this .expandTo (route .getSourceNode ())
+					this .selectedRoutes .add (route .getId ());
+					this .expandTo (route .getSourceNode ());
 				}
 
-				break
+				break;
 			}
 			case "output":
 			{
 				for (const route of field .getOutputRoutes ())
 				{
-					this .selectedRoutes .add (route .getId ())
-					this .expandTo (route .getDestinationNode ())
+					this .selectedRoutes .add (route .getId ());
+					this .expandTo (route .getDestinationNode ());
 				}
 
-				break
+				break;
 			}
 		}
 
-		this .updateRouteGraph ()
+		this .updateRouteGraph ();
 	}
 
 	selectSingleRoute (type, event)
@@ -65,74 +65,65 @@ module .exports = class OutlineRouteGraph extends OutlineView
 
 		const
 			element = $(event .currentTarget) .closest (".route", this .sceneGraph),
-			field   = this .getField (element)
+			field   = this .getField (element);
 
 		// Block default href.
-		event .preventDefault ()
-		event .stopImmediatePropagation ()
+		event .preventDefault ();
+		event .stopImmediatePropagation ();
 
-		this .selectedRoutes .clear ()
+		this .selectedRoutes .clear ();
 
 		switch (type)
 		{
 			case "input":
 			{
-				const route = this .getRoute (element, field .getInputRoutes ())
+				const route = this .getRoute (element, field .getInputRoutes ());
 
-				this .selectedRoutes .add (route .getId ())
-				this .expandTo (route .getSourceNode ())
-				break
+				this .selectedRoutes .add (route .getId ());
+				this .expandTo (route .getSourceNode ());
+				break;
 			}
 			case "output":
 			{
-				const route = this .getRoute (element, field .getOutputRoutes ())
+				const route = this .getRoute (element, field .getOutputRoutes ());
 
-				this .selectedRoutes .add (route .getId ())
-				this .expandTo (route .getDestinationNode ())
-				break
+				this .selectedRoutes .add (route .getId ());
+				this .expandTo (route .getDestinationNode ());
+				break;
 			}
 		}
 
-		this .updateRouteGraph ()
+		this .updateRouteGraph ();
 	}
 
 	updateRouteGraph ()
 	{
-		const canvases = this .sceneGraph .find (".route-curves canvas")
+		const canvases = this .sceneGraph .find (".route-curves canvas");
 
 		// Determine visible fields.
 
-		const fields = new Set ()
+		const fields = new Set ();
 
-		canvases .each (function (i, canvas)
+		canvases .each ((i, canvas) =>
 		{
 			const element = $(canvas)
-				.closest ("li[node-id][field-id]", this .sceneGraph)
+				.closest ("li[node-id][field-id]", this .sceneGraph);
 
 			if (!element .length)
-				return
+				return;
 
-			fields .add (this .getField (element))
-		}
-		.bind (this))
+			fields .add (this .getField (element));
+		})
 
 		this .sceneGraph
 			.find ("canvas.field-routes")
-			.each (function (i, canvas)
-			{
-				this .updateFieldRoutes ($(canvas), fields)
-			}
-			.bind (this))
+			.each ((i, canvas) => this .updateFieldRoutes ($(canvas), fields));
 
 		this .sceneGraph
 			.find ("canvas.single-route")
-			.each (function (i, canvas)
-			{
-				this .updateSingleRoute ($(canvas), fields)
-			}
-			.bind (this))
+			.each ((i, canvas) => this .updateSingleRoute ($(canvas), fields));
 
-		this .updateRouteCurves (canvases, fields)
+		this .updateRouteCurves (canvases, fields);
 	}
 
 	updateFieldRoutes ($canvas, fields)
@@ -144,20 +135,20 @@ module .exports = class OutlineRouteGraph extends OutlineView
 			field   = this .getField (element),
 			parent  = $canvas .parent (),
 			canvas  = $canvas .get (0),
-			context = canvas .getContext ("2d")
+			context = canvas .getContext ("2d");
 
-		$canvas .height (Math .ceil (parent .height ()))
+		$canvas .height (Math .ceil (parent .height ()));
 
-		canvas .width  = $canvas .width ()
-		canvas .height = $canvas .height ()
+		canvas .width  = $canvas .width ();
+		canvas .height = $canvas .height ();
 
-		context .clearRect (0, 0, canvas .width, canvas .height)
+		context .clearRect (0, 0, canvas .width, canvas .height);
 
 		switch (field .getAccessType ())
 		{
 			case X3D .X3DConstants .initializeOnly:
 			{
-				break
+				break;
 			}
 			case X3D .X3DConstants .inputOnly:
 			{
@@ -165,12 +156,12 @@ module .exports = class OutlineRouteGraph extends OutlineView
 				{
 					if (this .hasSourceField (fields, field))
 					{
-						context .strokeStyle = this .haveSelectedRoute (field .getInputRoutes ()) ? routeSelectedColor : routeColor
+						context .strokeStyle = this .haveSelectedRoute (field .getInputRoutes ()) ? routeSelectedColor : routeColor;
 
-						context .beginPath ()
-						context .moveTo (26, 3.5)
-						context .lineTo (canvas .width + 1, 3.5)
-						context .stroke ()
+						context .beginPath ();
+						context .moveTo (26, 3.5);
+						context .lineTo (canvas .width + 1, 3.5);
+						context .stroke ();
 					}
 				}
 
@@ -182,12 +173,12 @@ module .exports = class OutlineRouteGraph extends OutlineView
 				{
 					if (this .hasDestinationField (fields, field))
 					{
-						context .strokeStyle = this .haveSelectedRoute (field .getOutputRoutes ()) ? routeSelectedColor : routeColor
+						context .strokeStyle = this .haveSelectedRoute (field .getOutputRoutes ()) ? routeSelectedColor : routeColor;
 
-						context .beginPath ()
-						context .moveTo (26, 8.5)
-						context .lineTo (canvas .width + 1, 8.5)
-						context .stroke ()
+						context .beginPath ();
+						context .moveTo (26, 8.5);
+						context .lineTo (canvas .width + 1, 8.5);
+						context .stroke ();
 					}
 				}
 
@@ -199,12 +190,12 @@ module .exports = class OutlineRouteGraph extends OutlineView
 				{
 					if (this .hasSourceField (fields, field))
 					{
-						context .strokeStyle = this .haveSelectedRoute (field .getInputRoutes ()) ? routeSelectedColor : routeColor
+						context .strokeStyle = this .haveSelectedRoute (field .getInputRoutes ()) ? routeSelectedColor : routeColor;
 
-						context .beginPath ()
-						context .moveTo (40, 3.5)
-						context .lineTo (canvas .width + 1, 3.5)
-						context .stroke ()
+						context .beginPath ();
+						context .moveTo (40, 3.5);
+						context .lineTo (canvas .width + 1, 3.5);
+						context .stroke ();
 					}
 				}
 
@@ -212,16 +203,16 @@ module .exports = class OutlineRouteGraph extends OutlineView
 				{
 					if (this .hasDestinationField (fields, field))
 					{
-						context .strokeStyle = this .haveSelectedRoute (field .getOutputRoutes ()) ? routeSelectedColor : routeColor
+						context .strokeStyle = this .haveSelectedRoute (field .getOutputRoutes ()) ? routeSelectedColor : routeColor;
 
-						context .beginPath ()
-						context .moveTo (field .getInputRoutes () .size ? 54 : 40, 8.5)
-						context .lineTo (canvas .width + 1, 8.5)
-						context .stroke ()
+						context .beginPath ();
+						context .moveTo (field .getInputRoutes () .size ? 54 : 40, 8.5);
+						context .lineTo (canvas .width + 1, 8.5);
+						context .stroke ();
 					}
 				}
 
-				break
+				break;
 			}
 		}
 	}
@@ -235,14 +226,14 @@ module .exports = class OutlineRouteGraph extends OutlineView
 			type    = element .attr ("route-type"),
 			parent  = $canvas .parent (),
 			canvas  = $canvas .get (0),
-			context = canvas .getContext ("2d")
+			context = canvas .getContext ("2d");
 
-		$canvas .height (Math .ceil (parent .height ()))
+		$canvas .height (Math .ceil (parent .height ()));
 
-		canvas .width  = $canvas .width ()
-		canvas .height = $canvas .height ()
+		canvas .width  = $canvas .width ();
+		canvas .height = $canvas .height ();
 
-		context .clearRect (0, 0, canvas .width, canvas .height)
+		context .clearRect (0, 0, canvas .width, canvas .height);
 
 		switch (type)
 		{
@@ -250,41 +241,41 @@ module .exports = class OutlineRouteGraph extends OutlineView
 			{
 				const
 					field = this .getField (element),
-					route = this .getRoute (element, field .getInputRoutes ())
+					route = this .getRoute (element, field .getInputRoutes ());
 
 				if (!route)
-					break
+					break;
 
 				if (!fields .has (route .getSourceNode () .getField (route .sourceField)))
-					break
+					break;
 
-				context .strokeStyle = this .selectedRoutes .has (route .getId ()) ? routeSelectedColor : routeColor
+				context .strokeStyle = this .selectedRoutes .has (route .getId ()) ? routeSelectedColor : routeColor;
 
-				context .beginPath ()
-				context .moveTo (26, 3.5)
-				context .lineTo (canvas .width + 1, 3.5)
-				context .stroke ()
-				break
+				context .beginPath ();
+				context .moveTo (26, 3.5);
+				context .lineTo (canvas .width + 1, 3.5);
+				context .stroke ();
+				break;
 			}
 			case "output":
 			{
 				const
 					field = this .getField (element),
-					route = this .getRoute (element, field .getOutputRoutes ())
+					route = this .getRoute (element, field .getOutputRoutes ());
 
 				if (!route)
-					break
+					break;
 
 				if (!fields .has (route .getDestinationNode () .getField (route .destinationField)))
-					break
+					break;
 
-				context .strokeStyle = this .selectedRoutes .has (route .getId ()) ? routeSelectedColor : routeColor
+				context .strokeStyle = this .selectedRoutes .has (route .getId ()) ? routeSelectedColor : routeColor;
 
-				context .beginPath ()
-				context .moveTo (26, 8.5)
-				context .lineTo (canvas .width + 1, 8.5)
-				context .stroke ()
-				break
+				context .beginPath ();
+				context .moveTo (26, 8.5);
+				context .lineTo (canvas .width + 1, 8.5);
+				context .stroke ();
+				break;
 			}
 		}
 	}
@@ -299,95 +290,104 @@ module .exports = class OutlineRouteGraph extends OutlineView
 				canvas1 = $(canvases [i]),
 				canvas2 = $(canvases [i + 1]),
 				rect1   = canvas1 [0] .getBoundingClientRect (),
-				rect2   = canvas2 [0] .getBoundingClientRect ()
+				rect2   = canvas2 [0] .getBoundingClientRect ();
 
-			canvas1 .height (Math .ceil (rect2 .y - rect1 .y))
+			canvas1 .height (Math .ceil (rect2 .y - rect1 .y));
 
-			canvas1 [0] .width  = canvas1 .width ()
-			canvas1 [0] .height = canvas1 .height ()
+			canvas1 [0] .width  = canvas1 .width ();
+			canvas1 [0] .height = canvas1 .height ();
 		}
 
 		// Draw arcs or vertical lines.
 
-		const routes = new Set ()
+		const routes = new Set ();
 
-		canvases .each (function (i, canvas)
+		canvases .each ((i, canvas) =>
 		{
 			const
 				element = $(canvas) .closest ("li", this .sceneGraph),
-				context = canvas .getContext ("2d")
+				context = canvas .getContext ("2d");
 
 			// Clear canvases.
 
-			context .clearRect (0, 0, canvas .width, canvas .height)
+			context .clearRect (0, 0, canvas .width, canvas .height);
 
-			const selectedRoutes = new Set (routes)
+			const selectedRoutes = new Set (routes);
 
 			if (element .length && (element .hasClass ("field") && !element .data ("full-expanded")) || element .hasClass ("route"))
 			{
 				const
-					field                = this .getField (element),
-					routeId              = element .attr ("route-id") !== undefined ? parseInt (element .attr ("route-id")) : undefined,
-					selectedInputRoutes  = this .haveSelectedRoute (field .getInputRoutes (), routeId),
-					selectedOutputRoutes = this .haveSelectedRoute (field .getOutputRoutes (), routeId)
+					field   = this .getField (element),
+					routeId = element .attr ("route-id") !== undefined ? parseInt (element .attr ("route-id")) : undefined;
 
 				let
-					inputAdds            = 0,
-					inputDeletes         = 0,
-					outputAdds           = 0,
-					outputDeletes        = 0
-
-				field .getInputRoutes () .forEach (function (route)
+					inputAdds                = 0,
+					inputDeletes             = 0,
+					outputAdds               = 0,
+					outputDeletes            = 0,
+					selectedInputRoutesUp    = false,
+					selectedInputRoutesDown  = false,
+					selectedOutputRoutesUp   = false,
+					selectedOutputRoutesDown = false;
+
+				field .getInputRoutes () .forEach (route =>
 				{
 					if (routeId !== undefined && route .getId () !== routeId)
-						return
+						return;
 
 					if (!fields .has (route .getSourceNode () .getField (route .sourceField)))
-						return
+						return;
 
 					if (routes .has (route))
 					{
-						++ inputDeletes
-						routes .delete (route)
-						selectedRoutes .delete (route)
+						++ inputDeletes;
+						selectedInputRoutesUp = this .selectedRoutes .has (route .getId ());
+
+						routes         .delete (route);
+						selectedRoutes .delete (route);
 					}
 					else
 					{
-						++ inputAdds
-						routes .add (route)
+						++ inputAdds;
+						selectedInputRoutesDown = this .selectedRoutes .has (route .getId ());
+
+						routes .add (route);
 					}
 				},
 				this)
 
-				field .getOutputRoutes () .forEach (function (route)
+				field .getOutputRoutes () .forEach (route =>
 				{
 					if (routeId !== undefined && route .getId () !== routeId)
-						return
+						return;
 
 					if (!fields .has (route .getDestinationNode () .getField (route .destinationField)))
-						return
+						return;
 
 					if (routes .has (route))
 					{
-						++ outputDeletes
-						routes .delete (route)
-						selectedRoutes .delete (route)
+						++ outputDeletes;
+						selectedOutputRoutesUp = this .selectedRoutes .has (route .getId ());
+
+						routes         .delete (route);
+						selectedRoutes .delete (route);
 					}
 					else
 					{
-						++ outputAdds
-						routes .add (route)
+						++ outputAdds;
+						selectedOutputRoutesDown = this .selectedRoutes .has (route .getId ());
+
+						routes .add (route);
 					}
-				},
-				this)
+				});
 
 				// Determine vertical selected lines.
 
-				const verticalSelectedRoute = this .haveSelectedRoute (selectedRoutes)
+				const verticalSelectedRoute = this .haveSelectedRoute (selectedRoutes);
 
 				function draw (state, selected) { return (state === "normal" && !selected) || (state === "selected" && selected) }
 
-				["normal", "selected"] .forEach (function (state)
+				["normal", "selected"] .forEach (state =>
 				{
 					// Draw curve up.
 
@@ -395,14 +395,14 @@ module .exports = class OutlineRouteGraph extends OutlineView
 					{
 						// Input curve up.
 
-						if (draw (state, selectedInputRoutes))
+						if (draw (state, selectedInputRoutesUp))
 						{
-							context .strokeStyle = selectedInputRoutes ? routeSelectedColor : routeColor
+							context .strokeStyle = selectedInputRoutesUp ? routeSelectedColor : routeColor;
 
-							context .beginPath ()
-							context .arc (0, 0, 9.5, 1/2 * Math .PI, 2 * Math .PI, true)
-							context .lineTo (9.5, 0)
-							context .stroke ()
+							context .beginPath ();
+							context .arc (0, 0, 9.5, 1/2 * Math .PI, 2 * Math .PI, true);
+							context .lineTo (9.5, 0);
+							context .stroke ();
 						}
 					}
 
@@ -410,14 +410,14 @@ module .exports = class OutlineRouteGraph extends OutlineView
 					{
 						// Output curve up.
 
-						if (draw (state, selectedOutputRoutes))
+						if (draw (state, selectedOutputRoutesUp))
 						{
-							context .strokeStyle = selectedOutputRoutes ? routeSelectedColor : routeColor
+							context .strokeStyle = selectedOutputRoutesUp ? routeSelectedColor : routeColor;
 
-							context .beginPath ()
-							context .arc (0, 5, 9.5, 1/2 * Math .PI, 2 * Math .PI, true)
-							context .lineTo (9.5, 0)
-							context .stroke ()
+							context .beginPath ();
+							context .arc (0, 5, 9.5, 1/2 * Math .PI, 2 * Math .PI, true);
+							context .lineTo (9.5, 0);
+							context .stroke ();
 						}
 					}
 
@@ -427,14 +427,14 @@ module .exports = class OutlineRouteGraph extends OutlineView
 					{
 						// Input curve down.
 
-						if (draw (state, selectedInputRoutes))
+						if (draw (state, selectedInputRoutesDown))
 						{
-							context .strokeStyle = selectedInputRoutes ? routeSelectedColor : routeColor
+							context .strokeStyle = selectedInputRoutesDown ? routeSelectedColor : routeColor;
 
-							context .beginPath ()
-							context .arc (0, 19, 9.5, 3/2 * Math .PI, 2 * Math .PI)
-							context .lineTo (9.5, canvas .height + 1)
-							context .stroke ()
+							context .beginPath ();
+							context .arc (0, 19, 9.5, 3/2 * Math .PI, 2 * Math .PI);
+							context .lineTo (9.5, canvas .height + 1);
+							context .stroke ();
 						}
 					}
 
@@ -442,14 +442,14 @@ module .exports = class OutlineRouteGraph extends OutlineView
 					{
 						// Output curve down.
 
-						if (draw (state, selectedOutputRoutes))
+						if (draw (state, selectedOutputRoutesDown))
 						{
-							context .strokeStyle = selectedOutputRoutes ? routeSelectedColor : routeColor
+							context .strokeStyle = selectedOutputRoutesDown ? routeSelectedColor : routeColor;
 
-							context .beginPath ()
-							context .arc (0, 24, 9.5, 3/2 * Math .PI, 2 * Math .PI)
-							context .lineTo (9.5, canvas .height + 1)
-							context .stroke ()
+							context .beginPath ();
+							context .arc (0, 24, 9.5, 3/2 * Math .PI, 2 * Math .PI);
+							context .lineTo (9.5, canvas .height + 1);
+							context .stroke ();
 						}
 					}
 
@@ -459,16 +459,15 @@ module .exports = class OutlineRouteGraph extends OutlineView
 					{
 						if (draw (state, verticalSelectedRoute))
 						{
-							context .strokeStyle = verticalSelectedRoute ? routeSelectedColor : routeColor
+							context .strokeStyle = verticalSelectedRoute ? routeSelectedColor : routeColor;
 
-							context .beginPath ()
-							context .moveTo (9.5, 0)
-							context .lineTo (9.5, canvas .height + 1)
-							context .stroke ()
+							context .beginPath ();
+							context .moveTo (9.5, 0);
+							context .lineTo (9.5, canvas .height + 1);
+							context .stroke ();
 						}
 					}
-				},
-				this)
+				})
 			}
 			else
 			{
@@ -476,16 +475,15 @@ module .exports = class OutlineRouteGraph extends OutlineView
 
 				if (routes .size)
 				{
-					context .strokeStyle = this .haveSelectedRoute (routes) ? routeSelectedColor : routeColor
+					context .strokeStyle = this .haveSelectedRoute (routes) ? routeSelectedColor : routeColor;
 
-					context .beginPath ()
-					context .moveTo (9.5, 0)
-					context .lineTo (9.5, canvas .height + 1)
-					context .stroke ()
+					context .beginPath ();
+					context .moveTo (9.5, 0);
+					context .lineTo (9.5, canvas .height + 1);
+					context .stroke ();
 				}
 			}
-		}
-		.bind (this))
+		})
 	}
 
 	hasSourceField (fields, field)
@@ -493,10 +491,10 @@ module .exports = class OutlineRouteGraph extends OutlineView
 		for (const route of field .getInputRoutes ())
 		{
 			if (fields .has (route .getSourceNode () .getField (route .sourceField)))
-				return true
+				return true;
 		}
 
-		return false
+		return false;
 	}
 
 	hasDestinationField (fields, field)
@@ -504,27 +502,20 @@ module .exports = class OutlineRouteGraph extends OutlineView
 		for (const route of field .getOutputRoutes ())
 		{
 			if (fields .has (route .getDestinationNode () .getField (route .destinationField)))
-				return true
+				return true;
 		}
 
-		return false
+		return false;
 	}
 
-	haveSelectedRoute (routes, routeId)
+	haveSelectedRoute (routes)
 	{
-		if (routeId === undefined)
-		{
-			for (const route of routes)
-			{
-				if (this .selectedRoutes .has (route .getId ()))
-					return true
-			}
-		}
-		else
+		for (const route of routes)
 		{
-			return this .selectedRoutes .has (routeId)
+			if (this .selectedRoutes .has (route .getId ()))
+				return true;
 		}
 
-		return false
+		return false;
 	}
-}
+};