From 670c06103f10b635b3128b66346e62b84610da2b Mon Sep 17 00:00:00 2001
From: Henry <akhenry@gmail.com>
Date: Wed, 2 Mar 2016 11:45:15 -0800
Subject: [PATCH] [Edit Mode] Rebased over master

---
 platform/commonUI/browse/bundle.js                     | 10 +---------
 platform/commonUI/browse/src/BrowseController.js       |  4 +---
 platform/commonUI/browse/src/BrowseObjectController.js |  2 +-
 platform/commonUI/edit/bundle.js                       |  5 +----
 .../commonUI/edit/src/policies/EditNavigationPolicy.js |  3 +--
 5 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/platform/commonUI/browse/bundle.js b/platform/commonUI/browse/bundle.js
index 9b6e37fbe9..7fd785a7f5 100644
--- a/platform/commonUI/browse/bundle.js
+++ b/platform/commonUI/browse/bundle.js
@@ -135,9 +135,7 @@ define([
                     "depends": [
                         "$scope",
                         "$location",
-                        "$route",
-                        "$q",
-                        "navigationService"
+                        "$route"
                     ]
                 },
                 {
@@ -248,12 +246,6 @@ define([
                     "implementation": NavigationService
                 }
             ],
-            "services": [
-                {
-                    "key": "navigationService",
-                    "implementation": NavigationService
-                }
-            ],
             "policies": [
                 {
                     "implementation": CreationPolicy,
diff --git a/platform/commonUI/browse/src/BrowseController.js b/platform/commonUI/browse/src/BrowseController.js
index 54a230682c..db7d9182cb 100644
--- a/platform/commonUI/browse/src/BrowseController.js
+++ b/platform/commonUI/browse/src/BrowseController.js
@@ -32,9 +32,7 @@ define(
     function (GestureConstants) {
         "use strict";
 
-        var ROOT_ID = "ROOT",
-            DEFAULT_PATH = "mine",
-            CONFIRM_MSG = "Unsaved changes will be lost if you leave this page.";
+        var ROOT_ID = "ROOT";
 
         /**
          * The BrowseController is used to populate the initial scope in Browse
diff --git a/platform/commonUI/browse/src/BrowseObjectController.js b/platform/commonUI/browse/src/BrowseObjectController.js
index daf157e2c3..71345d6f1b 100644
--- a/platform/commonUI/browse/src/BrowseObjectController.js
+++ b/platform/commonUI/browse/src/BrowseObjectController.js
@@ -32,7 +32,7 @@ define(
          * @memberof platform/commonUI/browse
          * @constructor
          */
-        function BrowseObjectController($scope, $location, $route, $q, navigationService) {
+        function BrowseObjectController($scope, $location, $route) {
             var navigatedObject;
             function setViewForDomainObject(domainObject) {
                 
diff --git a/platform/commonUI/edit/bundle.js b/platform/commonUI/edit/bundle.js
index 7fbc5e7f31..80a98a6927 100644
--- a/platform/commonUI/edit/bundle.js
+++ b/platform/commonUI/edit/bundle.js
@@ -190,10 +190,7 @@ define([
                 {
                     "category": "navigation",
                     "message": "There are unsaved changes.",
-                    "implementation": EditNavigationPolicy,
-                    "depends": [
-                        "$window"
-                    ]
+                    "implementation": EditNavigationPolicy
                 }
 
             ],
diff --git a/platform/commonUI/edit/src/policies/EditNavigationPolicy.js b/platform/commonUI/edit/src/policies/EditNavigationPolicy.js
index 625f040a66..882e64935e 100644
--- a/platform/commonUI/edit/src/policies/EditNavigationPolicy.js
+++ b/platform/commonUI/edit/src/policies/EditNavigationPolicy.js
@@ -33,8 +33,7 @@ define(
          * @constructor
          * @implements {Policy.<Action, ActionContext>}
          */
-        function EditNavigationPolicy($window, policyService) {
-            this.window = $window;
+        function EditNavigationPolicy(policyService) {
             this.policyService = policyService;
         }