Merge remote-tracking branch 'github/master' into open245b

...in preparation to complete merge nasa/openmctweb#257

Conflicts:
	platform/entanglement/src/actions/CopyAction.js
	platform/entanglement/src/actions/LinkAction.js
	platform/entanglement/src/actions/MoveAction.js

platform/entanglement/src/actions/AbstractComposeAction.js

@@ -146,6 +146,14 @@ define(
             });
         };
 
+        AbstractComposeAction.appliesTo = function (context) {
+            var applicableObject =
+                context.selectedObject || context.domainObject;
+
+            return !!(applicableObject &&
+                applicableObject.hasCapability('context'));
+        };
+
         return AbstractComposeAction;
     }
 );

platform/entanglement/src/actions/CopyAction.js

@@ -60,6 +60,8 @@ define(
             );
         }
 
+        CopyAction.prototype = Object.create(AbstractComposeAction.prototype);
+
         /**
          * Updates user about progress of copy. Should not be invoked by
          * client code under any circumstances.
@@ -145,6 +147,9 @@ define(
             return AbstractComposeAction.prototype.perform.call(this)
                 .then(success, error, notification);
         };
+
+        CopyAction.appliesTo = AbstractComposeAction.appliesTo;
+
         return CopyAction;
     }
 );

platform/entanglement/src/actions/LinkAction.js

@@ -35,15 +35,15 @@ define(
          * @memberof platform/entanglement
          */
         function LinkAction(policyService, locationService, linkService, context) {
-            return new AbstractComposeAction(
-                policyService,
-                locationService,
-                linkService,
-                context,
-                "Link"
+            AbstractComposeAction.apply(
+                this,
+                [policyService, locationService, linkService, context, "Link"]
             );
         }
 
+        LinkAction.prototype = Object.create(AbstractComposeAction.prototype);
+        LinkAction.appliesTo = AbstractComposeAction.appliesTo;
+
         return LinkAction;
     }
 );

platform/entanglement/src/actions/MoveAction.js

@@ -35,15 +35,15 @@ define(
          * @memberof platform/entanglement
          */
         function MoveAction(policyService, locationService, moveService, context) {
-            return new AbstractComposeAction(
-                policyService,
-                locationService,
-                moveService,
-                context,
-                "Move"
+            AbstractComposeAction.apply(
+                this,
+                [policyService, locationService, moveService, context, "Move"]
             );
         }
 
+        MoveAction.prototype = Object.create(AbstractComposeAction.prototype);
+        MoveAction.appliesTo = AbstractComposeAction.appliesTo;
+
         return MoveAction;
     }
 );