[Edit Mode] Rebased over master

This commit is contained in:
Henry 2016-03-02 11:45:15 -08:00
parent 7b5218c5ba
commit 670c06103f
5 changed files with 5 additions and 19 deletions

View File

@ -135,9 +135,7 @@ define([
"depends": [ "depends": [
"$scope", "$scope",
"$location", "$location",
"$route", "$route"
"$q",
"navigationService"
] ]
}, },
{ {
@ -248,12 +246,6 @@ define([
"implementation": NavigationService "implementation": NavigationService
} }
], ],
"services": [
{
"key": "navigationService",
"implementation": NavigationService
}
],
"policies": [ "policies": [
{ {
"implementation": CreationPolicy, "implementation": CreationPolicy,

View File

@ -32,9 +32,7 @@ define(
function (GestureConstants) { function (GestureConstants) {
"use strict"; "use strict";
var ROOT_ID = "ROOT", var ROOT_ID = "ROOT";
DEFAULT_PATH = "mine",
CONFIRM_MSG = "Unsaved changes will be lost if you leave this page.";
/** /**
* The BrowseController is used to populate the initial scope in Browse * The BrowseController is used to populate the initial scope in Browse

View File

@ -32,7 +32,7 @@ define(
* @memberof platform/commonUI/browse * @memberof platform/commonUI/browse
* @constructor * @constructor
*/ */
function BrowseObjectController($scope, $location, $route, $q, navigationService) { function BrowseObjectController($scope, $location, $route) {
var navigatedObject; var navigatedObject;
function setViewForDomainObject(domainObject) { function setViewForDomainObject(domainObject) {

View File

@ -190,10 +190,7 @@ define([
{ {
"category": "navigation", "category": "navigation",
"message": "There are unsaved changes.", "message": "There are unsaved changes.",
"implementation": EditNavigationPolicy, "implementation": EditNavigationPolicy
"depends": [
"$window"
]
} }
], ],

View File

@ -33,8 +33,7 @@ define(
* @constructor * @constructor
* @implements {Policy.<Action, ActionContext>} * @implements {Policy.<Action, ActionContext>}
*/ */
function EditNavigationPolicy($window, policyService) { function EditNavigationPolicy(policyService) {
this.window = $window;
this.policyService = policyService; this.policyService = policyService;
} }