From e32403a75f55564088c2a70663eed01f8affbbd7 Mon Sep 17 00:00:00 2001
From: Shivam Dave <sdave@ucsc.edu>
Date: Tue, 28 Jul 2015 10:56:29 -0700
Subject: [PATCH] [Mobile] Clean-Up

Cleaned the unused code for the
backArrow and long touch gestures.
Commented out functions for later use
Currently shows the back arrow, however,
only will print to console on press.
Edited tests where mobile checks were breaking
and fixed.
---
 .../browse/res/templates/back-arrow.html      |  1 +
 .../browse/res/templates/browse-object.html   |  2 +-
 .../commonUI/browse/src/BrowseController.js   | 23 ++-------
 .../browse/test/BrowseControllerSpec.js       | 10 +++-
 platform/commonUI/general/bundle.json         |  2 +-
 .../general/res/css/theme-espresso.css        |  8 ++--
 .../general/res/sass/mobile/_layout.scss      |  1 +
 .../src/controllers/TreeNodeController.js     |  2 +-
 .../general/src/services/UrlService.js        | 35 ++++----------
 .../controllers/TreeNodeControllerSpec.js     |  4 +-
 .../inspect/src/gestures/InfoGesture.js       | 47 +++++++++----------
 11 files changed, 57 insertions(+), 78 deletions(-)

diff --git a/platform/commonUI/browse/res/templates/back-arrow.html b/platform/commonUI/browse/res/templates/back-arrow.html
index 69b8320734..5e54b06185 100644
--- a/platform/commonUI/browse/res/templates/back-arrow.html
+++ b/platform/commonUI/browse/res/templates/back-arrow.html
@@ -20,6 +20,7 @@
  at runtime from the About dialog for additional information.
 -->
 
+<!-- Back Arrow Icon used on mobile-->
 <span ng-controller="BrowseController"
       ng-click="backArrow()">
     <a class='icon ui-symbol mobile-back-arrow'>&lt;</a>
diff --git a/platform/commonUI/browse/res/templates/browse-object.html b/platform/commonUI/browse/res/templates/browse-object.html
index 7a5bd09470..1f69f45b0a 100644
--- a/platform/commonUI/browse/res/templates/browse-object.html
+++ b/platform/commonUI/browse/res/templates/browse-object.html
@@ -25,7 +25,7 @@
             <mct-representation key="'object-header'" mct-object="domainObject">
             </mct-representation>
         </div>
-        <!-- For now, on mobile the button bar is hidden-->
+        <!-- Temporarily, on mobile, the button bar is hidden-->
         <div class="btn-bar right abs mobile-hide">
             <mct-representation key="'action-group'"
                                 mct-object="domainObject"
diff --git a/platform/commonUI/browse/src/BrowseController.js b/platform/commonUI/browse/src/BrowseController.js
index eb8d5cceb2..21dad21744 100644
--- a/platform/commonUI/browse/src/BrowseController.js
+++ b/platform/commonUI/browse/src/BrowseController.js
@@ -64,23 +64,6 @@ define(
                 // domainObject
                 $location.path(urlService.urlForLocation("browse", domainObject));
             }
-            
-            function backArr() {
-                var priorRoute = $route.current,
-                    // Act as if params HADN'T changed to avoid page reload
-                    unlisten;
-
-                unlisten = $scope.$on('$locationChangeSuccess', function () {
-                    // Checks path to make sure /browse/ is at front
-                    // if so, change $route.current                    
-                    if ($location.path().indexOf("/browse/") === 0) {
-                        $route.current = priorRoute;
-                    }
-                    unlisten();
-                });
-                console.log(urlService.urlForBack("browse", $scope.navigatedObject));
-                $location.path(urlService.urlForBack("browse", $scope.navigatedObject));
-            }
 
             // Callback for updating the in-scope reference to the object
             // that is currently navigated-to.
@@ -142,6 +125,10 @@ define(
                     navigateTo(domainObject);
                 }
             }
+            
+            function updateRouteBackArrow() {
+                console.log("Back Arrow");
+            }
 
             // Load the root object, put it in the scope.
             // Also, load its immediate children, and (possibly)
@@ -172,7 +159,7 @@ define(
                 navigationService.removeListener(setNavigation);
             });
             
-            $scope.backArrow = backArr;
+            $scope.backArrow = updateRouteBackArrow;
 
         }
 
diff --git a/platform/commonUI/browse/test/BrowseControllerSpec.js b/platform/commonUI/browse/test/BrowseControllerSpec.js
index b61a856d41..339eb7febd 100644
--- a/platform/commonUI/browse/test/BrowseControllerSpec.js
+++ b/platform/commonUI/browse/test/BrowseControllerSpec.js
@@ -52,7 +52,7 @@ define(
             beforeEach(function () {
                 mockScope = jasmine.createSpyObj(
                     "$scope",
-                    [ "$on", "$watch", "treeSlide" ]
+                    [ "$on", "$watch", "treeSlide", "backArrow" ]
                 );
                 mockRoute = { current: { params: {} } };
                 mockLocation = jasmine.createSpyObj(
@@ -244,7 +244,13 @@ define(
                     mockUrlService.urlForLocation(mockMode, mockNextObject)
                 );
             });
-
+            
+            // Mocks the back arrow call that
+            // lets the html code know the back
+            // arrow navigation needs to be done
+            it("calls the backArrow function", function () {
+                mockScope.backArrow();
+            });
         });
     }
 );
diff --git a/platform/commonUI/general/bundle.json b/platform/commonUI/general/bundle.json
index 157c8c834b..53486c3f0e 100644
--- a/platform/commonUI/general/bundle.json
+++ b/platform/commonUI/general/bundle.json
@@ -65,7 +65,7 @@
             {
                 "key": "TreeNodeController",
                 "implementation": "controllers/TreeNodeController.js",
-                "depends": [ "$scope", "$timeout", "$rootScope", "queryService" ]
+                "depends": [ "$scope", "$timeout", "queryService" ]
             },
             {
                 "key": "ActionGroupController",
diff --git a/platform/commonUI/general/res/css/theme-espresso.css b/platform/commonUI/general/res/css/theme-espresso.css
index f9a59ef071..4cb2a1336b 100644
--- a/platform/commonUI/general/res/css/theme-espresso.css
+++ b/platform/commonUI/general/res/css/theme-espresso.css
@@ -891,22 +891,22 @@ mct-container {
       opacity: 1 !important; } }
 
 @media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) {
-  /* line 175, ../sass/mobile/_layout.scss */
+  /* line 176, ../sass/mobile/_layout.scss */
   .desktop-hide {
     display: none; } }
 
 @media screen and (orientation: portrait) and (max-width: 514px) and (max-height: 740px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (max-height: 514px) and (max-width: 740px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (max-height: 514px) and (max-width: 740px) and (max-device-width: 1024px) and (max-device-height: 799px), screen and (orientation: portrait) and (min-width: 515px) and (max-width: 799px) and (min-height: 741px) and (max-height: 1024px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (min-height: 515px) and (max-height: 799px) and (min-width: 741px) and (max-width: 1024px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (min-height: 515px) and (max-height: 799px) and (min-width: 741px) and (max-width: 1024px) and (max-device-width: 1024px) and (max-device-height: 799px) {
-  /* line 182, ../sass/mobile/_layout.scss */
+  /* line 183, ../sass/mobile/_layout.scss */
   .mobile-hide {
     display: none; } }
 
 @media screen and (orientation: portrait) and (max-width: 514px) and (max-height: 740px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (max-height: 514px) and (max-width: 740px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (max-height: 514px) and (max-width: 740px) and (max-device-width: 1024px) and (max-device-height: 799px) {
-  /* line 189, ../sass/mobile/_layout.scss */
+  /* line 190, ../sass/mobile/_layout.scss */
   .phone-hide {
     display: none; } }
 
 @media screen and (orientation: portrait) and (max-width: 514px) and (max-height: 740px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (max-height: 514px) and (max-width: 740px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (max-height: 514px) and (max-width: 740px) and (max-device-width: 1024px) and (max-device-height: 799px), screen and (orientation: portrait) and (min-width: 515px) and (max-width: 799px) and (min-height: 741px) and (max-height: 1024px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (min-height: 515px) and (max-height: 799px) and (min-width: 741px) and (max-width: 1024px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (min-height: 515px) and (max-height: 799px) and (min-width: 741px) and (max-width: 1024px) and (max-device-width: 1024px) and (max-device-height: 799px) {
-  /* line 195, ../sass/mobile/_layout.scss */
+  /* line 196, ../sass/mobile/_layout.scss */
   .tree-holder {
     overflow-x: hidden !important; } }
 
diff --git a/platform/commonUI/general/res/sass/mobile/_layout.scss b/platform/commonUI/general/res/sass/mobile/_layout.scss
index f1d7c306b3..b7704681e7 100644
--- a/platform/commonUI/general/res/sass/mobile/_layout.scss
+++ b/platform/commonUI/general/res/sass/mobile/_layout.scss
@@ -168,6 +168,7 @@
 }
 
 .mobile-back-arrow {
+//    display: none !important;
 //    font-size: 0.8em;
 }
 
diff --git a/platform/commonUI/general/src/controllers/TreeNodeController.js b/platform/commonUI/general/src/controllers/TreeNodeController.js
index 70d38d9b77..27ef3bfd49 100644
--- a/platform/commonUI/general/src/controllers/TreeNodeController.js
+++ b/platform/commonUI/general/src/controllers/TreeNodeController.js
@@ -50,7 +50,7 @@ define(
          * expand-to-show-navigated-object behavior.)
          * @constructor
          */
-        function TreeNodeController($scope, $timeout, $rootScope, queryService) {
+        function TreeNodeController($scope, $timeout, queryService) {
             var selectedObject = ($scope.ngModel || {}).selectedObject,
                 isSelected = false,
                 hasBeenExpanded = false;
diff --git a/platform/commonUI/general/src/services/UrlService.js b/platform/commonUI/general/src/services/UrlService.js
index a700f288d4..3363dc1d49 100644
--- a/platform/commonUI/general/src/services/UrlService.js
+++ b/platform/commonUI/general/src/services/UrlService.js
@@ -55,22 +55,13 @@ define(
                 return path;
             }
             
-            function urlForLastLocation(mode, domainObject) {
-                var context = domainObject &&
-                        domainObject.getCapability('context'),
-                    objectPath = context ? context.getPath() : [],
-                    editedPath = (objectPath.length > 1) ? objectPath.slice(0, -1) : objectPath,
-                    ids = editedPath.map(function (domainObject) {
-                        return domainObject.getId();
-                    }),
-                    // Parses the path together. Starts with the 
-                    // default index.html file, then the mode passed
-                    // into the service, followed by ids in the url
-                    // joined by '/', and lastly the view path from
-                    // the current location
-                    path = mode + "/" + ids.slice(1).join("/");
-                return path;
-            }
+//            function idForLevelArrow(domainObject) {
+//                var context = domainObject &&
+//                        domainObject.getCapability('context'),
+//                    objectPath = context ? context.getPath() : [],
+//                    id = objectPath[objectPath.length - 2];
+//                return id;
+//            }
             
             // Uses the Url for the current location
             // from the urlForLocation function and
@@ -81,13 +72,7 @@ define(
                         "index.html#" + urlForLocation(mode, domainObject) + viewPath;
                 return newTabPath;
             }
-            
-            function urlForBack(mode, domainObject) {
-                var newTabPath =
-                        "index.html#/" + urlForLastLocation(mode, domainObject);
-                return newTabPath;
-            }
-                        
+             
             return {
                /**
                  * Returns the Url path for a specific domain object
@@ -107,9 +92,9 @@ define(
                  * @param {DomainObject} value of the domain object 
                  *        to get the path of
                  */
-                urlForLocation: urlForLocation,
+                urlForLocation: urlForLocation
                 
-                urlForBack: urlForBack
+//                idForLevelArrow: idForLevelArrow
             };
         }
 
diff --git a/platform/commonUI/general/test/controllers/TreeNodeControllerSpec.js b/platform/commonUI/general/test/controllers/TreeNodeControllerSpec.js
index 394d71b88a..2ce5c9f9fc 100644
--- a/platform/commonUI/general/test/controllers/TreeNodeControllerSpec.js
+++ b/platform/commonUI/general/test/controllers/TreeNodeControllerSpec.js
@@ -187,7 +187,9 @@ define(
             });
             
             it("check if tree node is in a mobile device", function () {
-                controller.checkMobile();
+                if (controller) {
+                    controller.checkMobile();
+                }
             });
         });
     }
diff --git a/platform/commonUI/inspect/src/gestures/InfoGesture.js b/platform/commonUI/inspect/src/gestures/InfoGesture.js
index 4cac0ff98a..3634042212 100644
--- a/platform/commonUI/inspect/src/gestures/InfoGesture.js
+++ b/platform/commonUI/inspect/src/gestures/InfoGesture.js
@@ -52,12 +52,12 @@ define(
                 mousePosition = [ event.clientX, event.clientY ];
             }
             
-            function trackTouchPosition(event) {
-                var tEvent = event.changedTouches[0];
-                // Record mouse position, so bubble can be shown at latest
-                // mouse position (not just where the mouse entered)
-                touchPosition = [ tEvent.clientX + 44, tEvent.clientY ];
-            }
+//            function trackTouchPosition(event) {
+//                var tEvent = event.changedTouches[0];
+//                // Record mouse position, so bubble can be shown at latest
+//                // mouse position (not just where the mouse entered)
+//                touchPosition = [ tEvent.clientX + 44, tEvent.clientY ];
+//            }
 
             function hideBubble() {
                 // If a bubble is showing, dismiss it
@@ -102,22 +102,22 @@ define(
                 element.on('mouseleave', hideBubble);
             }
             
-            function showTouchBubble(event) {
-                // Makes sure user is only touching one place
-                if (event.touches.length < 2) {
-                    trackTouchPosition(event);
-                    pendingBubble = $timeout(function () {
-                        dismissBubble = infoService.display(
-                            "info-table",
-                            domainObject.getModel().name,
-                            domainObject.useCapability('metadata'),
-                            touchPosition
-                        );
-                    }, touchDELAY);
-
-                    element.on('touchend', hideBubble);
-                }
-            }
+//            function showTouchBubble(event) {
+//                // Makes sure user is only touching one place
+//                if (event.touches.length < 2) {
+//                    trackTouchPosition(event);
+//                    pendingBubble = $timeout(function () {
+//                        dismissBubble = infoService.display(
+//                            "info-table",
+//                            domainObject.getModel().name,
+//                            domainObject.useCapability('metadata'),
+//                            touchPosition
+//                        );
+//                    }, touchDELAY);
+//
+//                    element.on('touchend', hideBubble);
+//                }
+//            }
             
             // Checks if you are on a mobile device, if the device is
             // not mobile (queryService.isMobile() = false), then
@@ -126,9 +126,6 @@ define(
                 // Show bubble (on a timeout) on mouse over
                 element.on('mouseenter', showBubble);
             }
-//            else if (queryService.isMobile(navigator.userAgent)) {
-//                element.on('touchstart', showTouchBubble);
-//            }
 
             // Also make sure we dismiss bubble if representation is destroyed
             // before the mouse actually leaves it