alihan/openmct
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into persist-on-mutation-825

Browse Source 
Conflicts:
	platform/core/src/capabilities/PersistenceCapability.js
	platform/features/timeline/src/controllers/swimlane/TimelineSwimlaneDropHandler.js
This commit is contained in:
Victor Woeltjen
2016-05-19 11:41:08 -07:00
parent f85ac79b4a 5b4952d4c6
commit d3f2a24267
817 changed files with 1867 additions and 4586 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platform/entanglement/src/actions/AbstractComposeAction.js
View File

@@ -20,10 +20,8 @@
* at runtime from the About dialog for additional information.
*****************************************************************************/
/*global define */
define(
function () {
"use strict";
/**
* Common interface exposed by services which support move, copy,

2
platform/entanglement/src/actions/CopyAction.js
View File

@@ -20,11 +20,9 @@
* at runtime from the About dialog for additional information.
*****************************************************************************/
/*global define */
define(
['./AbstractComposeAction'],
function (AbstractComposeAction) {
"use strict";
/**
* The CopyAction is available from context menus and allows a user to

6
platform/entanglement/src/actions/GoToOriginalAction.js
View File

@@ -20,10 +20,8 @@
* at runtime from the About dialog for additional information.
*****************************************************************************/
/*global define */
define(
function () {
"use strict";
/**
* Implements the "Go To Original" action, which follows a link back
@@ -52,8 +50,8 @@ define(
GoToOriginalAction.appliesTo = function (context) {
var domainObject = context.domainObject;
return domainObject && domainObject.hasCapability("location")
&& domainObject.getCapability("location").isLink();
return domainObject && domainObject.hasCapability("location") &&
domainObject.getCapability("location").isLink();
};
return GoToOriginalAction;

2
platform/entanglement/src/actions/LinkAction.js
View File

@@ -20,11 +20,9 @@
* at runtime from the About dialog for additional information.
*****************************************************************************/
/*global define */
define(
['./AbstractComposeAction'],
function (AbstractComposeAction) {
"use strict";
/**
* The LinkAction is available from context menus and allows a user to

2
platform/entanglement/src/actions/MoveAction.js
View File

@@ -20,11 +20,9 @@
* at runtime from the About dialog for additional information.
*****************************************************************************/
/*global define */
define(
['./AbstractComposeAction'],
function (AbstractComposeAction) {
"use strict";
/**
* The MoveAction is available from context menus and allows a user to

6
platform/entanglement/src/actions/SetPrimaryLocationAction.js
View File

@@ -20,10 +20,8 @@
* at runtime from the About dialog for additional information.
*****************************************************************************/
/*global define */
define(
function () {
"use strict";
/**
* Implements the "Set Primary Location" action, which sets a
@@ -50,8 +48,8 @@ define(
SetPrimaryLocationAction.appliesTo = function (context) {
var domainObject = context.domainObject;
return domainObject && domainObject.hasCapability("location")
&& (domainObject.getModel().location === undefined);
return domainObject && domainObject.hasCapability("location") &&
(domainObject.getModel().location === undefined);
};
return SetPrimaryLocationAction;

2
platform/entanglement/src/capabilities/LocationCapability.js
View File

@@ -20,11 +20,9 @@
* at runtime from the About dialog for additional information.
*****************************************************************************/
/*global define */
define(
function () {
"use strict";
/**
* The location capability allows a domain object to know its current

2
platform/entanglement/src/policies/CopyPolicy.js
View File

@@ -20,9 +20,7 @@
* at runtime from the About dialog for additional information.
*****************************************************************************/
/*global define */
define([], function () {
'use strict';
/**
* Disallow duplication when the object to be duplicated is not

5
platform/entanglement/src/policies/CrossSpacePolicy.js
View File

@@ -20,11 +20,9 @@
* at runtime from the About dialog for additional information.
*****************************************************************************/
/*global define */
define(
[],
function () {
'use strict';
var DISALLOWED_ACTIONS = [
"move",
@@ -50,8 +48,7 @@ define(
function isCrossSpace(context) {
var domainObject = context.domainObject,
selectedObject = context.selectedObject,
spaces = [ domainObject, selectedObject ].map(lookupSpace);
selectedObject = context.selectedObject;
return selectedObject !== undefined &&
domainObject !== undefined &&
lookupSpace(domainObject) !== lookupSpace(selectedObject);

2
platform/entanglement/src/policies/MovePolicy.js
View File

@@ -20,9 +20,7 @@
* at runtime from the About dialog for additional information.
*****************************************************************************/
/*global define */
define([], function () {
'use strict';
/**
* Disallow moves when either the parent or the child are not

2
platform/entanglement/src/services/CopyService.js
View File

@@ -20,12 +20,10 @@
* at runtime from the About dialog for additional information.
*****************************************************************************/
/*global define */
define(
[ "./CopyTask" ],
function (CopyTask) {
"use strict";
/**
* CopyService provides an interface for deep copying objects from one

2
platform/entanglement/src/services/CopyTask.js
View File

@@ -20,12 +20,10 @@
* at runtime from the About dialog for additional information.
*****************************************************************************/
/*global define */
define(
[],
function () {
"use strict";
/**
* This class encapsulates the process of copying a domain object

2
platform/entanglement/src/services/LinkService.js
View File

@@ -20,11 +20,9 @@
* at runtime from the About dialog for additional information.
*****************************************************************************/
/*global define */
define(
function () {
"use strict";
/**
* LinkService provides an interface for linking objects to additional

2
platform/entanglement/src/services/LocatingCreationDecorator.js
View File

@@ -20,11 +20,9 @@
* at runtime from the About dialog for additional information.
*****************************************************************************/
/*global define */
define(
function () {
"use strict";
/**
* Adds a `location` property to newly-created domain objects.

2
platform/entanglement/src/services/LocatingObjectDecorator.js
View File

@@ -20,11 +20,9 @@
* at runtime from the About dialog for additional information.
*****************************************************************************/
/*global define */
define(
function () {
"use strict";
/**
* Ensures that domain objects are loaded with a context capability

2
platform/entanglement/src/services/LocationService.js
View File

@@ -20,7 +20,6 @@
* at runtime from the About dialog for additional information.
*****************************************************************************/
/*global define */
/**
* This bundle implements actions which control the location of objects
@@ -29,7 +28,6 @@
*/
define(
function () {
"use strict";
/**
* The LocationService allows for easily prompting the user for a

2
platform/entanglement/src/services/MoveService.js
View File

@@ -20,11 +20,9 @@
* at runtime from the About dialog for additional information.
*****************************************************************************/
/*global define */
define(
function () {
"use strict";
/**
* MoveService provides an interface for moving objects from one
* location to another. It also provides a method for determining if