softvis-research
diff --git a/‎ui/aframe.html‎
Lines changed: 11 additions & 3 deletions b/‎ui/aframe.html‎
Lines changed: 11 additions & 3 deletions
diff --git a/‎ui/scripts/AframeActionController.js‎
Lines changed: 7 additions & 2 deletions b/‎ui/scripts/AframeActionController.js‎
Lines changed: 7 additions & 2 deletions
diff --git a/‎ui/scripts/CanvasHover/AframeCanvasHoverController.js‎
Lines changed: 0 additions & 225 deletions b/‎ui/scripts/CanvasHover/AframeCanvasHoverController.js‎
Lines changed: 0 additions & 225 deletions
@@ -44,14 +44,22 @@
     <script type="text/javascript" src="libs/jqwidgets/jqxnotification.js"></script>
     <script type="text/javascript" src="libs/jqwidgets/jqxtextarea.js"></script>
     <script type="text/javascript" src="libs/jqwidgets/jqxswitchbutton.js"></script>
+    <script type="text/javascript" src="libs/jqwidgets/jqxprogressbar.js"></script>
 
     <link rel="stylesheet" href="libs/jqwidgets/styles/jqx.base.css" type="text/css" />
     <link rel="stylesheet" href="libs/jqwidgets/styles/jqx.metro.css" type="text/css" />
 
+    <!-- ztree -->
+    <script type="text/javascript" src="libs/zTree_v3/js/jquery.ztree.core.js"></script>
+    <script type="text/javascript" src="libs/zTree_v3/js/jquery.ztree.exhide.js"></script>
+    <script type="text/javascript" src="libs/zTree_v3/js/jquery.ztree.excheck.js"></script>
+    <link rel="stylesheet" href="libs/zTree_v3/css/zTreeStyle/zTreeStyle.css" type="text/css">
+    <link rel="stylesheet" href="scripts/PackageExplorer/zt.css" type="text/css">
+
     <script type="text/javascript" src="scripts/CanvasFilter/CanvasFilterController.js"></script>
-    <script type="text/javascript" src="scripts/CanvasMark/AframeCanvasMarkController.js"></script>
+    <script type="text/javascript" src="scripts/CanvasMark/CanvasMarkController.js"></script>
     <script type="text/javascript" src="scripts/CanvasFlyTo/CanvasFlyToController.js"></script>
-    <script type="text/javascript" src="scripts/CanvasHover/AframeCanvasHoverController.js"></script>
+    <script type="text/javascript" src="scripts/CanvasHover/CanvasHoverController.js"></script>
     <script type="text/javascript" src="scripts/CanvasSelect/CanvasSelectController.js"></script>
     <script type="text/javascript" src="scripts/CanvasResetView/CanvasResetViewController.js"></script>
     <script type="text/javascript" src="scripts/CanvasGrid/CanvasGridController.js"></script>
@@ -79,7 +87,7 @@
     <link rel="stylesheet" href="Style.css" type="text/css" />
 
     <!--setup-->
-    <script type="text/javascript" src="setups/test/blank.js"></script>
+    <script type="text/javascript" src="setups/test/aframe.js"></script>
 
 </head>
 <body>
 
@@ -136,7 +136,9 @@ var actionController = (function () {
                     if (component != null) {
                         hoveredEntity = component;
                     }
-                    hoverAction(actions.mouse, eventObject);
+                    if(eventObject.target.id != canvasId) {
+                        hoverAction(actions.mouse, eventObject);
+                    }
 
                     if (actions.mouse.bubbles) {
                         return true;
@@ -147,7 +149,10 @@ var actionController = (function () {
                     return false;
                 });
                 this.el.addEventListener("mouseleave", function (eventObject) {
-                    unhoverAction(actions.mouse, eventObject);
+                    if(eventObject.target.id != canvasId) {
+                        unhoverAction(actions.mouse, eventObject);
+                    }
+                    hoveredEntity = canvas;
 
                     if (actions.mouse.bubbles) {
                         return true;