From 2a347f15968e98372c89d65a377bd5ae9b643580 Mon Sep 17 00:00:00 2001
From: Shivam Dave <sdave@ucsc.edu>
Date: Thu, 25 Jun 2015 14:53:52 -0700
Subject: [PATCH] [Windowing] urlService

Removed the urlService from the edit
and browse bundles. Added the urlService
to the general bundle. WTD 23.
---
 platform/commonUI/browse/bundle.json  | 7 +------
 platform/commonUI/edit/bundle.json    | 9 +--------
 platform/commonUI/general/bundle.json | 7 +++++++
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/platform/commonUI/browse/bundle.json b/platform/commonUI/browse/bundle.json
index 30bae3cf00..845edff2f7 100644
--- a/platform/commonUI/browse/bundle.json
+++ b/platform/commonUI/browse/bundle.json
@@ -77,12 +77,7 @@
             {
                 "key": "navigationService",
                 "implementation": "navigation/NavigationService.js"
-            },
-            {
-                "key": "urlService",
-                "implementation": "../../general/src/services/UrlService.js",
-                "depends": [ "$location" ]
-            },            
+            },        
             {
                 "key": "creationService",
                 "implementation": "creation/CreationService.js",
diff --git a/platform/commonUI/edit/bundle.json b/platform/commonUI/edit/bundle.json
index 2c5aec2e06..2aed41c2ee 100644
--- a/platform/commonUI/edit/bundle.json
+++ b/platform/commonUI/edit/bundle.json
@@ -116,14 +116,7 @@
                 "key": "topbar-edit",
                 "templateUrl": "templates/topbar-edit.html"
             }
-        ],
-        "services": [
-            {
-                "key": "urlService",
-                "implementation": "../../general/src/services/UrlService.js",
-                "depends": [ "$location" ]
-            }    
-        ],        
+        ],     
         "representers": [
             {
                 "implementation": "representers/EditRepresenter.js",
diff --git a/platform/commonUI/general/bundle.json b/platform/commonUI/general/bundle.json
index ead610c963..fdac965863 100644
--- a/platform/commonUI/general/bundle.json
+++ b/platform/commonUI/general/bundle.json
@@ -3,6 +3,13 @@
     "description": "General UI elements, meant to be reused across modes",
     "resources": "res",
     "extensions": {
+        "services": [
+            {
+                "key": "urlService",
+                "implementation": "/services/UrlService.js",
+                "depends": [ "$location" ]
+            }    
+        ],        
         "runs": [
             {
                 "implementation": "StyleSheetLoader.js",