Removed unused Aframe Controller

also:
- fixed a bug where multiple hoverEvents were emitted
- aframe.js updated
- jqxProgressbar added to aframe.html

Author: Aaron Sillus

ui/aframe.html

@@ -44,6 +44,7 @@
     <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" />
@@ -55,11 +56,11 @@
     <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/AframeCanvasFilterController.js"></script>
-    <script type="text/javascript" src="scripts/CanvasMark/AframeCanvasMarkController.js"></script>
+    <script type="text/javascript" src="scripts/CanvasFilter/CanvasFilterController.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/CanvasSelect/AframeCanvasSelectController.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>
     <script type="text/javascript" src="scripts/RelationConnector/RelationConnectorController.js"></script>

ui/scripts/AframeActionController.js

@@ -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;