Merge branch 'master' into orphan-navigation-765

.jscsrc

@@ -1,3 +1,5 @@
 {
-    "preset": "crockford"
+    "preset": "crockford",
+    "requireMultipleVarDecl": false,
+    "requireVarDeclFirst": false
 }

.jshintrc

@@ -5,7 +5,7 @@
     "eqeqeq": true,
     "forin": true,
     "freeze": true,
-    "funcscope": true,
+    "funcscope": false,
     "futurehostile": true,
     "latedef": true,
     "noarg": true,
@@ -16,6 +16,7 @@
         "define",
         "Promise"
     ],
+    "shadow": "outer",
     "strict": "implied",
     "undef": true,
     "unused": "vars"

build-docs.sh

@@ -22,17 +22,19 @@
 #* at runtime from the About dialog for additional information.
 #*****************************************************************************
 
-# Script to build and deploy docs to github pages.
+# Script to build and deploy docs.
 
 OUTPUT_DIRECTORY="target/docs"
-REPOSITORY_URL="git@github.com:nasa/openmctweb.git"
+# Docs, once built, are pushed to the private website repo
+REPOSITORY_URL="git@github.com:nasa/openmct-website.git"
+WEBSITE_DIRECTORY="website"
 
-BUILD_SHA=`git rev-parse head`
+BUILD_SHA=`git rev-parse HEAD`
 
 # A remote will be created for the git repository we are pushing to.
 # Don't worry, as this entire directory will get trashed inbetween builds.
 REMOTE_NAME="documentation"
-WEBSITE_BRANCH="gh-pages"
+WEBSITE_BRANCH="master"
 
 # Clean output directory, JSDOC will recreate
 if [ -d $OUTPUT_DIRECTORY ]; then
@@ -40,23 +42,21 @@ if [ -d $OUTPUT_DIRECTORY ]; then
 fi
 
 npm run docs
-cd $OUTPUT_DIRECTORY || exit 1
 
-echo "git init"
+echo "git clone $REPOSITORY_URL website"
-git init
+git clone $REPOSITORY_URL website || exit 1
+echo "cp -r $OUTPUT_DIRECTORY $WEBSITE_DIRECTORY/docs"
+cp -r $OUTPUT_DIRECTORY $WEBSITE_DIRECTORY/docs
+echo "cd $WEBSITE_DIRECTORY"
+cd $WEBSITE_DIRECTORY || exit 1
 
 # Configure github for CircleCI user.
 git config user.email "buildbot@circleci.com"
 git config user.name "BuildBot"
 
-echo "git remote add $REMOTE_NAME $REPOSITORY_URL"
-git remote add $REMOTE_NAME $REPOSITORY_URL
 echo "git add ."
 git add .
-echo "git commit -m \"Generate docs from build $BUILD_SHA\""
+echo "git commit -m \"Docs updated from build $BUILD_SHA\""
-git commit -m "Generate docs from build $BUILD_SHA"
+git commit -m "Docs updated from build $BUILD_SHA"
-
+# Push to the website repo
-echo "git push $REMOTE_NAME HEAD:$WEBSITE_BRANCH -f"
+git push
-git push $REMOTE_NAME HEAD:$WEBSITE_BRANCH -f
-
-echo "Documentation pushed to gh-pages branch."

circle.yml

@@ -1,8 +1,11 @@
 deployment:
   production:
     branch: master
-    heroku:
+    commands:
-      appname: openmctweb-demo
+        - npm install canvas nomnoml
+        - ./build-docs.sh
+        - git fetch --unshallow
+        - git push git@heroku.com:openmctweb-demo.git $CIRCLE_SHA1:refs/heads/master
   openmct-demo:
     branch: live_demo
     heroku:
@@ -14,3 +17,9 @@ deployment:
 test:
   post:
     - gulp lint
+    - gulp checkstyle
+
+general:
+  branches:
+    ignore:
+      - gh-pages

example/msl/src/RemsTelemetryModelProvider.js

@@ -45,11 +45,12 @@ define(
             function buildTaxonomy(dictionary){
                 var models = {};
 
-                function addMeasurement(measurement){
+                function addMeasurement(measurement, parent){
                     var format = FORMAT_MAPPINGS[measurement.type];
                     models[makeId(measurement)] = {
                         type: "msl.measurement",
                         name: measurement.name,
+                        location: parent,
                         telemetry: {
                             key: measurement.identifier,
                             ranges: [{
@@ -62,17 +63,24 @@ define(
                     };
                 }
 
-                function addInstrument(subsystem) {
+                function addInstrument(subsystem, spacecraftId) {
-                    var measurements = (subsystem.measurements || []);
+                    var measurements = (subsystem.measurements || []),
-                    models[makeId(subsystem)] = {
+                        instrumentId = makeId(subsystem);
+
+                    models[instrumentId] = {
                         type: "msl.instrument",
                         name: subsystem.name,
+                        location: spacecraftId,
                         composition: measurements.map(makeId)
                     };
-                    measurements.forEach(addMeasurement);
+                    measurements.forEach(function(measurement) {
+                        addMeasurement(measurement, instrumentId);
+                    });
                 }
 
-                (dictionary.instruments || []).forEach(addInstrument);
+                (dictionary.instruments || []).forEach(function(instrument) {
+                    addInstrument(instrument, "msl:curiosity");
+                });
                 return models;
             }
 

gulpfile.js

@@ -147,6 +147,6 @@ gulp.task('develop', ['serve', 'stylesheets', 'watch']);
 
 gulp.task('install', [ 'static', 'scripts' ]);
 
-gulp.task('verify', [ 'lint', 'test' ]);
+gulp.task('verify', [ 'lint', 'test', 'checkstyle' ]);
 
 gulp.task('build', [ 'verify', 'install' ]);

main.js

@@ -41,10 +41,10 @@ requirejs.config({
             "exports": "angular"
         },
         "angular-route": {
-            "deps": [ "angular" ]
+            "deps": ["angular"]
         },
         "moment-duration-format": {
-            "deps": [ "moment" ]
+            "deps": ["moment"]
         },
         "screenfull": {
             "exports": "screenfull"

platform/commonUI/browse/bundle.js

@@ -24,24 +24,15 @@ define([
     "./src/BrowseController",
     "./src/PaneController",
     "./src/BrowseObjectController",
-    "./src/creation/CreateMenuController",
-    "./src/creation/LocatorController",
     "./src/MenuArrowController",
     "./src/navigation/NavigationService",
-    "./src/creation/CreationPolicy",
     "./src/navigation/NavigateAction",
     "./src/navigation/OrphanNavigationHandler",
     "./src/windowing/NewTabAction",
     "./src/windowing/FullscreenAction",
-    "./src/creation/CreateActionProvider",
-    "./src/creation/AddActionProvider",
-    "./src/creation/CreationService",
     "./src/windowing/WindowTitler",
     "text!./res/templates/browse.html",
-    "text!./res/templates/create/locator.html",
     "text!./res/templates/browse-object.html",
-    "text!./res/templates/create/create-button.html",
-    "text!./res/templates/create/create-menu.html",
     "text!./res/templates/items/grid-item.html",
     "text!./res/templates/browse/object-header.html",
     "text!./res/templates/menu-arrow.html",
@@ -54,24 +45,15 @@ define([
     BrowseController,
     PaneController,
     BrowseObjectController,
-    CreateMenuController,
-    LocatorController,
     MenuArrowController,
     NavigationService,
-    CreationPolicy,
     NavigateAction,
     OrphanNavigationHandler,
     NewTabAction,
     FullscreenAction,
-    CreateActionProvider,
-    AddActionProvider,
-    CreationService,
     WindowTitler,
     browseTemplate,
-    locatorTemplate,
     browseObjectTemplate,
-    createButtonTemplate,
-    createMenuTemplate,
     gridItemTemplate,
     objectHeaderTemplate,
     menuArrowTemplate,
@@ -138,22 +120,6 @@ define([
                         "$route"
                     ]
                 },
-                {
-                    "key": "CreateMenuController",
-                    "implementation": CreateMenuController,
-                    "depends": [
-                        "$scope"
-                    ]
-                },
-                {
-                    "key": "LocatorController",
-                    "implementation": LocatorController,
-                    "depends": [
-                        "$scope",
-                        "$timeout",
-                        "objectService"
-                    ]
-                },
                 {
                     "key": "MenuArrowController",
                     "implementation": MenuArrowController,
@@ -162,12 +128,6 @@ define([
                     ]
                 }
             ],
-            "controls": [
-                {
-                    "key": "locator",
-                    "template": locatorTemplate
-                }
-            ],
             "representations": [
                 {
                     "key": "view-object",
@@ -183,17 +143,6 @@ define([
                         "view"
                     ]
                 },
-                {
-                    "key": "create-button",
-                    "template": createButtonTemplate
-                },
-                {
-                    "key": "create-menu",
-                    "template": createMenuTemplate,
-                    "uses": [
-                        "action"
-                    ]
-                },
                 {
                     "key": "grid-item",
                     "template": gridItemTemplate,
@@ -246,12 +195,6 @@ define([
                     "implementation": NavigationService
                 }
             ],
-            "policies": [
-                {
-                    "implementation": CreationPolicy,
-                    "category": "creation"
-                }
-            ],
             "actions": [
                 {
                     "key": "navigate",
@@ -304,42 +247,6 @@ define([
                     "editable": false
                 }
             ],
-            "components": [
-                {
-                    "key": "CreateActionProvider",
-                    "provides": "actionService",
-                    "type": "provider",
-                    "implementation": CreateActionProvider,
-                    "depends": [
-                        "$q",
-                        "typeService",
-                        "navigationService",
-                        "policyService"
-                    ]
-                },
-                {
-                    "key": "AddActionProvider",
-                    "provides": "actionService",
-                    "type": "provider",
-                    "implementation": AddActionProvider,
-                    "depends": [
-                        "$q",
-                        "typeService",
-                        "dialogService",
-                        "policyService"
-                    ]
-                },
-                {
-                    "key": "CreationService",
-                    "provides": "creationService",
-                    "type": "provider",
-                    "implementation": CreationService,
-                    "depends": [
-                        "$q",
-                        "$log"
-                    ]
-                }
-            ],
             "runs": [
                 {
                     "implementation": WindowTitler,

platform/commonUI/browse/src/BrowseController.js

@@ -80,12 +80,12 @@ define(
             function setNavigation(domainObject) {
                 var navigationAllowed = true;
 
-                if (domainObject === $scope.navigatedObject){
+                if (domainObject === $scope.navigatedObject) {
                     //do nothing;
                     return;
                 }
 
-                policyService.allow("navigation", $scope.navigatedObject, domainObject, function(message){
+                policyService.allow("navigation", $scope.navigatedObject, domainObject, function (message) {
                     navigationAllowed = $window.confirm(message + "\r\n\r\n" +
                         " Are you sure you want to continue?");
                 });

platform/commonUI/browse/src/BrowseObjectController.js

@@ -70,7 +70,7 @@ define(
             $scope.$watch('domainObject', setViewForDomainObject);
             $scope.$watch('representation.selected.key', updateQueryParam);
 
-            $scope.doAction = function (action){
+            $scope.doAction = function (action) {
                 return $scope[action] && $scope[action]();
             };
 

platform/commonUI/browse/src/InspectorRegion.js

@@ -45,7 +45,7 @@ define(
         /**
          * @private
          */
-        InspectorRegion.prototype.buildRegion = function() {
+        InspectorRegion.prototype.buildRegion = function () {
             var metadataRegion = {
                 name: 'metadata',
                 title: 'Metadata Region',

platform/commonUI/browse/test/BrowseControllerSpec.js

@@ -78,12 +78,12 @@ define(
 
                 mockScope = jasmine.createSpyObj(
                     "$scope",
-                    [ "$on", "$watch" ]
+                    ["$on", "$watch"]
                 );
                 mockRoute = { current: { params: {} } };
                 mockLocation = jasmine.createSpyObj(
                     "$location",
-                    [ "path" ]
+                    ["path"]
                 );
                 mockUrlService = jasmine.createSpyObj(
                     "urlService",
@@ -91,7 +91,7 @@ define(
                 );
                 mockObjectService = jasmine.createSpyObj(
                     "objectService",
-                    [ "getObjects" ]
+                    ["getObjects"]
                 );
                 mockNavigationService = jasmine.createSpyObj(
                     "navigationService",
@@ -104,15 +104,15 @@ define(
                 );
                 mockRootObject = jasmine.createSpyObj(
                     "domainObject",
-                    [ "getId", "getCapability", "getModel", "useCapability" ]
+                    ["getId", "getCapability", "getModel", "useCapability"]
                 );
                 mockDomainObject = jasmine.createSpyObj(
                     "domainObject",
-                    [ "getId", "getCapability", "getModel", "useCapability" ]
+                    ["getId", "getCapability", "getModel", "useCapability"]
                 );
                 mockNextObject = jasmine.createSpyObj(
                     "nextObject",
-                    [ "getId", "getCapability", "getModel", "useCapability" ]
+                    ["getId", "getCapability", "getModel", "useCapability"]
                 );
 
                 mockObjectService.getObjects.andReturn(mockPromise({
@@ -255,7 +255,7 @@ define(
                 " object", function () {
                 mockScope.navigatedObject = mockDomainObject;
                 mockWindow.confirm.andReturn(false);
-                mockPolicyService.allow.andCallFake(function(category, object, context, callback){
+                mockPolicyService.allow.andCallFake(function (category, object, context, callback) {
                     callback("unsaved changes");
                     return false;
                 });

platform/commonUI/browse/test/BrowseObjectControllerSpec.js

@@ -44,12 +44,12 @@ define(
             beforeEach(function () {
                 mockScope = jasmine.createSpyObj(
                     "$scope",
-                    [ "$on", "$watch" ]
+                    ["$on", "$watch"]
                 );
                 mockRoute = { current: { params: {} } };
                 mockLocation = jasmine.createSpyObj(
                     "$location",
-                    [ "path", "search" ]
+                    ["path", "search"]
                 );
                 mockUnlisten = jasmine.createSpy("unlisten");
 

platform/commonUI/browse/test/MenuArrowControllerSpec.js

@@ -38,23 +38,23 @@ define(
             beforeEach(function () {
                 mockScope = jasmine.createSpyObj(
                     "$scope",
-                    [ "" ]
+                    [""]
                 );
                 mockDomainObject = jasmine.createSpyObj(
                     "domainObject",
-                    [ "getCapability" ]
+                    ["getCapability"]
                 );
                 mockEvent = jasmine.createSpyObj(
                     "event",
-                    [ "preventDefault" ]
+                    ["preventDefault"]
                 );
                 mockContextMenuAction = jasmine.createSpyObj(
                     "action",
-                    [ "perform", "getActions" ]
+                    ["perform", "getActions"]
                 );
                 mockActionContext = jasmine.createSpyObj(
                     "actionContext",
-                    [ "" ]
+                    [""]
                 );
 
                 mockActionContext.domainObject = mockDomainObject;

platform/commonUI/browse/test/PaneControllerSpec.js

@@ -42,11 +42,11 @@ define(
             }
 
             beforeEach(function () {
-                mockScope = jasmine.createSpyObj("$scope", [ "$on" ]);
+                mockScope = jasmine.createSpyObj("$scope", ["$on"]);
                 mockDomainObjects = ['a', 'b'].map(function (id) {
                     var mockDomainObject = jasmine.createSpyObj(
                         'domainObject-' + id,
-                        [ 'getId', 'getModel', 'getCapability' ]
+                        ['getId', 'getModel', 'getCapability']
                     );
 
                     mockDomainObject.getId.andReturn(id);
@@ -56,7 +56,7 @@ define(
                 });
                 mockAgentService = jasmine.createSpyObj(
                     "agentService",
-                    [ "isMobile", "isPhone", "isTablet", "isPortrait", "isLandscape" ]
+                    ["isMobile", "isPhone", "isTablet", "isPortrait", "isLandscape"]
                 );
                 mockWindow = jasmine.createSpyObj("$window", ["open"]);
             });

platform/commonUI/browse/test/creation/CreateActionSpec.js

@@ -1,130 +0,0 @@
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT Web includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-/**
- * MCTRepresentationSpec. Created by vwoeltje on 11/6/14.
- */
-define(
-    ["../../src/creation/CreateAction"],
-    function (CreateAction) {
-
-        describe("The create action", function () {
-            var mockType,
-                mockParent,
-                mockContext,
-                mockDialogService,
-                mockCreationService,
-                action;
-
-            function mockPromise(value) {
-                return {
-                    then: function (callback) {
-                        return mockPromise(callback(value));
-                    }
-                };
-            }
-
-            beforeEach(function () {
-                mockType = jasmine.createSpyObj(
-                    "type",
-                    [
-                        "getKey",
-                        "getGlyph",
-                        "getName",
-                        "getDescription",
-                        "getProperties",
-                        "getInitialModel"
-                    ]
-                );
-                mockParent = jasmine.createSpyObj(
-                    "domainObject",
-                    [
-                        "getId",
-                        "getModel",
-                        "getCapability"
-                    ]
-                );
-                mockContext = {
-                    domainObject: mockParent
-                };
-                mockDialogService = jasmine.createSpyObj(
-                    "dialogService",
-                    [ "getUserInput" ]
-                );
-                mockCreationService = jasmine.createSpyObj(
-                    "creationService",
-                    [ "createObject" ]
-                );
-
-                mockType.getKey.andReturn("test");
-                mockType.getGlyph.andReturn("T");
-                mockType.getDescription.andReturn("a test type");
-                mockType.getName.andReturn("Test");
-                mockType.getProperties.andReturn([]);
-                mockType.getInitialModel.andReturn({});
-
-                mockDialogService.getUserInput.andReturn(mockPromise({}));
-
-                action = new CreateAction(
-                    mockType,
-                    mockParent,
-                    mockContext,
-                    mockDialogService,
-                    mockCreationService
-                );
-            });
-
-            it("exposes type-appropriate metadata", function () {
-                var metadata = action.getMetadata();
-
-                expect(metadata.name).toEqual("Test");
-                expect(metadata.description).toEqual("a test type");
-                expect(metadata.glyph).toEqual("T");
-            });
-
-            //TODO: Disabled for NEM Beta
-            xit("invokes the creation service when performed", function () {
-                action.perform();
-                expect(mockCreationService.createObject).toHaveBeenCalledWith(
-                    { type: "test" },
-                    mockParent
-                );
-            });
-
-            //TODO: Disabled for NEM Beta
-            xit("does not create an object if the user cancels", function () {
-                mockDialogService.getUserInput.andReturn({
-                    then: function (callback, fail) {
-                        fail();
-                    }
-                });
-
-                action.perform();
-
-                expect(mockCreationService.createObject)
-                    .not.toHaveBeenCalled();
-
-            });
-
-        });
-    }
-);

platform/commonUI/browse/test/navigation/NavigateActionSpec.js

@@ -44,12 +44,12 @@ define(
             beforeEach(function () {
                 mockNavigationService = jasmine.createSpyObj(
                     "navigationService",
-                    [ "setNavigation" ]
+                    ["setNavigation"]
                 );
                 mockQ = { when: mockPromise };
                 mockDomainObject = jasmine.createSpyObj(
                     "domainObject",
-                    [ "getId", "getModel", "getCapability" ]
+                    ["getId", "getModel", "getCapability"]
                 );
 
                 action = new NavigateAction(

platform/commonUI/browse/test/windowing/WindowTitlerSpec.js

@@ -37,11 +37,11 @@ define(
             beforeEach(function () {
                 mockNavigationService = jasmine.createSpyObj(
                     'navigationService',
-                    [ 'getNavigation' ]
+                    ['getNavigation']
                 );
                 mockRootScope = jasmine.createSpyObj(
                     '$rootScope',
-                    [ '$watch' ]
+                    ['$watch']
                 );
                 mockDomainObject = jasmine.createSpyObj(
                     'domainObject',

platform/commonUI/dialog/src/DialogService.js

@@ -155,8 +155,8 @@ define(
          * @returns {boolean} true if dialog is currently visible, false
          * otherwise
          */
-        DialogService.prototype.canShowDialog = function(dialogModel){
+        DialogService.prototype.canShowDialog = function (dialogModel) {
-            if (this.dialogVisible){
+            if (this.dialogVisible) {
                 // Only one dialog should be shown at a time.
                 // The application design should be such that
                 // we never even try to do this.
@@ -224,7 +224,7 @@ define(
          * @param {typeClass} string tells overlayService that this overlay should use appropriate CSS class
          * @returns {boolean}
          */
-        DialogService.prototype.showBlockingMessage = function(dialogModel) {
+        DialogService.prototype.showBlockingMessage = function (dialogModel) {
             if (this.canShowDialog(dialogModel)) {
                 // Add the overlay using the OverlayService, which
                 // will handle actual insertion into the DOM

platform/commonUI/dialog/test/DialogServiceSpec.js

@@ -38,23 +38,23 @@ define(
             beforeEach(function () {
                 mockOverlayService = jasmine.createSpyObj(
                     "overlayService",
-                    [ "createOverlay" ]
+                    ["createOverlay"]
                 );
                 mockQ = jasmine.createSpyObj(
                     "$q",
-                    [ "defer" ]
+                    ["defer"]
                 );
                 mockLog = jasmine.createSpyObj(
                     "$log",
-                    [ "warn", "info", "debug" ]
+                    ["warn", "info", "debug"]
                 );
                 mockOverlay = jasmine.createSpyObj(
                     "overlay",
-                    [ "dismiss" ]
+                    ["dismiss"]
                 );
                 mockDeferred = jasmine.createSpyObj(
                     "deferred",
-                    [ "resolve", "reject"]
+                    ["resolve", "reject"]
                 );
                 mockDeferred.promise = "mock promise";
 
@@ -120,7 +120,7 @@ define(
             });
 
             it("invokes the overlay service with the correct parameters when" +
-                " a blocking dialog is requested", function() {
+                " a blocking dialog is requested", function () {
                 var dialogModel = {};
                 expect(dialogService.showBlockingMessage(dialogModel)).toBe(true);
                 expect(mockOverlayService.createOverlay).toHaveBeenCalledWith(

platform/commonUI/dialog/test/OverlayServiceSpec.js

@@ -38,13 +38,13 @@ define(
                 overlayService;
 
             beforeEach(function () {
-                mockDocument = jasmine.createSpyObj("$document", [ "find" ]);
+                mockDocument = jasmine.createSpyObj("$document", ["find"]);
                 mockCompile = jasmine.createSpy("$compile");
-                mockRootScope = jasmine.createSpyObj("$rootScope", [ "$new" ]);
+                mockRootScope = jasmine.createSpyObj("$rootScope", ["$new"]);
-                mockBody = jasmine.createSpyObj("body", [ "prepend" ]);
+                mockBody = jasmine.createSpyObj("body", ["prepend"]);
                 mockTemplate = jasmine.createSpy("template");
-                mockElement = jasmine.createSpyObj("element", [ "remove" ]);
+                mockElement = jasmine.createSpyObj("element", ["remove"]);
-                mockScope = jasmine.createSpyObj("scope", [ "$destroy" ]);
+                mockScope = jasmine.createSpyObj("scope", ["$destroy"]);
 
                 mockDocument.find.andReturn(mockBody);
                 mockCompile.andReturn(mockTemplate);

platform/commonUI/edit/bundle.js

@@ -26,7 +26,7 @@ define([
     "./src/controllers/ElementsController",
     "./src/controllers/EditObjectController",
     "./src/directives/MCTBeforeUnload",
-    "./src/actions/LinkAction",
+    "./src/actions/EditAndComposeAction",
     "./src/actions/EditAction",
     "./src/actions/PropertiesAction",
     "./src/actions/RemoveAction",
@@ -43,6 +43,15 @@ define([
     "./src/capabilities/EditorCapability",
     "./src/capabilities/TransactionCapabilityDecorator",
     "./src/services/TransactionService",
+    "./src/creation/CreateMenuController",
+    "./src/creation/LocatorController",
+    "./src/creation/CreationPolicy",
+    "./src/creation/CreateActionProvider",
+    "./src/creation/AddActionProvider",
+    "./src/creation/CreationService",
+    "text!./res/templates/create/locator.html",
+    "text!./res/templates/create/create-button.html",
+    "text!./res/templates/create/create-menu.html",
     "text!./res/templates/library.html",
     "text!./res/templates/edit-object.html",
     "text!./res/templates/edit-action-buttons.html",
@@ -55,7 +64,7 @@ define([
     ElementsController,
     EditObjectController,
     MCTBeforeUnload,
-    LinkAction,
+    EditAndComposeAction,
     EditAction,
     PropertiesAction,
     RemoveAction,
@@ -72,6 +81,15 @@ define([
     EditorCapability,
     TransactionCapabilityDecorator,
     TransactionService,
+    CreateMenuController,
+    LocatorController,
+    CreationPolicy,
+    CreateActionProvider,
+    AddActionProvider,
+    CreationService,
+    locatorTemplate,
+    createButtonTemplate,
+    createMenuTemplate,
     libraryTemplate,
     editObjectTemplate,
     editActionButtonsTemplate,
@@ -112,6 +130,22 @@ define([
                         "$location",
                         "policyService"
                     ]
+                },
+                {
+                    "key": "CreateMenuController",
+                    "implementation": CreateMenuController,
+                    "depends": [
+                        "$scope"
+                    ]
+                },
+                {
+                    "key": "LocatorController",
+                    "implementation": LocatorController,
+                    "depends": [
+                        "$scope",
+                        "$timeout",
+                        "objectService"
+                    ]
                 }
             ],
             "directives": [
@@ -126,7 +160,7 @@ define([
             "actions": [
                 {
                     "key": "compose",
-                    "implementation": LinkAction
+                    "implementation": EditAndComposeAction
                 },
                 {
                     "key": "edit",
@@ -221,8 +255,11 @@ define([
                     "category": "navigation",
                     "message": "There are unsaved changes.",
                     "implementation": EditNavigationPolicy
+                },
+                {
+                    "implementation": CreationPolicy,
+                    "category": "creation"
                 }
-
             ],
             "templates": [
                 {
@@ -261,6 +298,17 @@ define([
                 {
                     "key": "topbar-edit",
                     "template": topbarEditTemplate
+                },
+                {
+                    "key": "create-button",
+                    "template": createButtonTemplate
+                },
+                {
+                    "key": "create-menu",
+                    "template": createMenuTemplate,
+                    "uses": [
+                        "action"
+                    ]
                 }
             ],
             "components": [
@@ -282,7 +330,40 @@ define([
                         "$q",
                         "$log"
                     ]
+                },
+                {
+                    "key": "CreateActionProvider",
+                    "provides": "actionService",
+                    "type": "provider",
+                    "implementation": CreateActionProvider,
+                    "depends": [
+                        "typeService",
+                        "policyService"
+                    ]
+                },
+                {
+                    "key": "AddActionProvider",
+                    "provides": "actionService",
+                    "type": "provider",
+                    "implementation": AddActionProvider,
+                    "depends": [
+                        "$q",
+                        "typeService",
+                        "dialogService",
+                        "policyService"
+                    ]
+                },
+                {
+                    "key": "CreationService",
+                    "provides": "creationService",
+                    "type": "provider",
+                    "implementation": CreationService,
+                    "depends": [
+                        "$q",
+                        "$log"
+                    ]
                 }
+
             ],
             "representers": [
                 {
@@ -298,7 +379,7 @@ define([
             ],
             "constants": [
                 {
-                    "key":"editModeBlacklist",
+                    "key": "editModeBlacklist",
                     "value": ["copy", "follow", "window", "link", "locate"]
                 },
                 {
@@ -317,6 +398,12 @@ define([
                     ]
                 }
             ],
+            "controls": [
+                {
+                    "key": "locator",
+                    "template": locatorTemplate
+                }
+            ]
         }
     });
 });

platform/commonUI/edit/src/actions/CancelAction.js

@@ -44,7 +44,7 @@ define(
         CancelAction.prototype.perform = function () {
             var domainObject = this.domainObject;
 
-            function returnToBrowse () {
+            function returnToBrowse() {
                 var parent;
 
                 //If the object existed already, navigate to refresh view

platform/commonUI/edit/src/actions/EditAction.js

@@ -70,10 +70,16 @@ define(
          */
         EditAction.prototype.perform = function () {
             var self = this;
-            function cancelEditing(){
+            function cancelEditing() {
                 self.domainObject.getCapability('editor').cancel();
                 self.navigationService.removeListener(cancelEditing);
             }
+            //If this is not the currently navigated object, then navigate
+            // to it.
+            if (this.navigationService.getNavigation() !== this.domainObject) {
+                this.navigationService.setNavigation(this.domainObject);
+            }
+
             this.navigationService.addListener(cancelEditing);
             this.domainObject.useCapability("editor");
         };

platform/commonUI/edit/src/actions/EditAndComposeAction.js

@@ -31,13 +31,14 @@ define(
          * @memberof platform/commonUI/edit
          * @implements {Action}
          */
-        function LinkAction(context) {
+        function EditAndComposeAction(context) {
             this.domainObject = (context || {}).domainObject;
             this.selectedObject = (context || {}).selectedObject;
         }
 
-        LinkAction.prototype.perform = function () {
+        EditAndComposeAction.prototype.perform = function () {
-            var self = this;
+            var self = this,
+                editAction = this.domainObject.getCapability('action').getActions("edit")[0];
 
             // Persist changes to the domain object
             function doPersist() {
@@ -54,9 +55,13 @@ define(
                         .then(doPersist);
             }
 
+            if (editAction) {
+                editAction.perform();
+            }
+
             return this.selectedObject && doLink();
         };
 
-        return LinkAction;
+        return EditAndComposeAction;
     }
 );

platform/commonUI/edit/src/actions/PropertiesAction.js

@@ -63,10 +63,10 @@ define(
                 });
             }
 
-            function showDialog(type) {
+            function showDialog(objType) {
                 // Create a dialog object to generate the form structure, etc.
                 var dialog =
-                    new PropertiesDialog(type, domainObject.getModel());
+                    new PropertiesDialog(objType, domainObject.getModel());
 
                 // Show the dialog
                 return dialogService.getUserInput(

platform/commonUI/edit/src/actions/RemoveAction.js

@@ -75,8 +75,8 @@ define(
              * Invoke persistence on a domain object. This will be called upon
              * the removed object's parent (as its composition will have changed.)
              */
-            function doPersist(domainObject) {
+            function doPersist(domainObj) {
-                var persistence = domainObject.getCapability('persistence');
+                var persistence = domainObj.getCapability('persistence');
                 return persistence && persistence.persist();
             }
 

platform/commonUI/edit/src/actions/SaveAction.js

@@ -48,7 +48,7 @@ define(
         SaveAction.prototype.perform = function () {
             var domainObject = this.domainObject;
 
-            function resolveWith(object){
+            function resolveWith(object) {
                 return function () {
                     return object;
                 };

platform/commonUI/edit/src/actions/SaveAsAction.js

@@ -22,7 +22,7 @@
 
 
 define(
-    ['../../../browse/src/creation/CreateWizard'],
+    ['../creation/CreateWizard'],
     function (CreateWizard) {
 
         /**
@@ -42,7 +42,7 @@ define(
             context
         ) {
             this.domainObject = (context || {}).domainObject;
-            this.injectObjectService = function(){
+            this.injectObjectService = function () {
                 this.objectService = $injector.get("objectService");
             };
             this.policyService = policyService;
@@ -65,7 +65,7 @@ define(
         /**
          * @private
          */
-        SaveAsAction.prototype.getObjectService = function(){
+        SaveAsAction.prototype.getObjectService = function () {
             // Lazily acquire object service (avoids cyclical dependency)
             if (!this.objectService) {
                 this.injectObjectService();
@@ -73,7 +73,7 @@ define(
             return this.objectService;
         };
 
-        function resolveWith(object){
+        function resolveWith(object) {
             return function () {
                 return object;
             };
@@ -116,13 +116,13 @@ define(
                     ).then(wizard.populateObjectFromInput.bind(wizard));
             }
 
-            function fetchObject(objectId){
+            function fetchObject(objectId) {
-                return self.getObjectService().getObjects([objectId]).then(function(objects){
+                return self.getObjectService().getObjects([objectId]).then(function (objects) {
                     return objects[objectId];
                 });
             }
 
-            function getParent(object){
+            function getParent(object) {
                 return fetchObject(object.getModel().location);
             }
 

platform/commonUI/edit/src/capabilities/EditorCapability.js

@@ -52,11 +52,11 @@ define(
             this.domainObject.getCapability('status').set('editing', true);
         };
 
-        function isEditContextRoot (domainObject) {
+        function isEditContextRoot(domainObject) {
             return domainObject.getCapability('status').get('editing');
         }
 
-        function isEditing (domainObject) {
+        function isEditing(domainObject) {
             return isEditContextRoot(domainObject) ||
                 domainObject.hasCapability('context') &&
                 isEditing(domainObject.getCapability('context').getParent());
@@ -87,7 +87,7 @@ define(
          */
         EditorCapability.prototype.save = function () {
             var domainObject = this.domainObject;
-            return this.transactionService.commit().then(function() {
+            return this.transactionService.commit().then(function () {
                 domainObject.getCapability('status').set('editing', false);
             });
         };
@@ -101,7 +101,7 @@ define(
          */
         EditorCapability.prototype.cancel = function () {
             var domainObject = this.domainObject;
-            return this.transactionService.cancel().then(function(){
+            return this.transactionService.cancel().then(function () {
                 domainObject.getCapability("status").set("editing", false);
                 return domainObject;
             });

platform/commonUI/edit/src/capabilities/TransactionalPersistenceCapability.js

@@ -60,14 +60,14 @@ define(
             var self = this;
 
             function onCommit() {
-                return self.persistenceCapability.persist().then(function(result) {
+                return self.persistenceCapability.persist().then(function (result) {
                     self.persistPending = false;
                     return result;
                 });
             }
 
             function onCancel() {
-                return self.persistenceCapability.refresh().then(function(result) {
+                return self.persistenceCapability.refresh().then(function (result) {
                     self.persistPending = false;
                     return result;
                 });

platform/commonUI/edit/src/controllers/EditObjectController.js

@@ -59,7 +59,7 @@ define(
 
             $scope.$watch('domainObject', setViewForDomainObject);
 
-            $scope.doAction = function (action){
+            $scope.doAction = function (action) {
                 return $scope[action] && $scope[action]();
             };
         }
@@ -74,7 +74,7 @@ define(
             var navigatedObject = this.scope.domainObject,
                 policyMessage;
 
-            this.policyService.allow("navigation", navigatedObject, undefined, function(message) {
+            this.policyService.allow("navigation", navigatedObject, undefined, function (message) {
                 policyMessage = message;
             });
 

platform/commonUI/edit/src/controllers/ElementsController.js

@@ -30,7 +30,7 @@ define(
          * @constructor
          */
         function ElementsController($scope) {
-            function filterBy(text){
+            function filterBy(text) {
                 if (typeof text === 'undefined') {
                     return $scope.searchText;
                 } else {

platform/commonUI/edit/src/creation/AddAction.js

@@ -81,13 +81,13 @@ define(
 
             newModel.type = this.type.getKey();
             newObject = parentObject.getCapability('instantiation').instantiate(newModel);
-            newObject.useCapability('mutation', function(model){
+            newObject.useCapability('mutation', function (model) {
                 model.location = parentObject.getId();
             });
 
             wizard = new CreateWizard(newObject, this.parent, this.policyService);
 
-            function populateObjectFromInput (formValue) {
+            function populateObjectFromInput(formValue) {
                 return wizard.populateObjectFromInput(formValue, newObject);
             }
 
@@ -99,7 +99,7 @@ define(
                     });
             }
 
-            function addToParent (populatedObject) {
+            function addToParent(populatedObject) {
                 parentObject.getCapability('composition').add(populatedObject);
                 return persistAndReturn(parentObject);
             }

platform/commonUI/edit/src/creation/CreateAction.js

@@ -43,11 +43,8 @@ define(
          *        override this)
          * @param {ActionContext} context the context in which the
          *        action is being performed
-         * @param {NavigationService} navigationService the navigation service,
-         *        which handles changes in navigation. It allows the object
-         *        being browsed/edited to be set.
          */
-        function CreateAction(type, parent, context, $q, navigationService) {
+        function CreateAction(type, parent, context) {
             this.metadata = {
                 key: 'create',
                 glyph: type.getGlyph(),
@@ -56,24 +53,8 @@ define(
                 description: type.getDescription(),
                 context: context
             };
-
             this.type = type;
             this.parent = parent;
-            this.navigationService = navigationService;
-            this.$q = $q;
-        }
-
-        // Get a count of views which are not flagged as non-editable.
-        function countEditableViews(domainObject) {
-            var views = domainObject && domainObject.useCapability('view'),
-                count = 0;
-
-            // A view is editable unless explicitly flagged as not
-            (views || []).forEach(function (view) {
-                count += (view.editable !== false) ? 1 : 0;
-            });
-
-            return count;
         }
 
         /**
@@ -82,26 +63,31 @@ define(
          */
         CreateAction.prototype.perform = function () {
             var newModel = this.type.getInitialModel(),
-                parentObject = this.navigationService.getNavigation(),
+                newObject,
-                editorCapability,
+                editAction,
-                newObject;
+                editorCapability;
+
+            function onSave() {
+                return editorCapability.save();
+            }
+
+            function onCancel() {
+                return editorCapability.cancel();
+            }
 
             newModel.type = this.type.getKey();
-            newModel.location = parentObject.getId();
+            newModel.location = this.parent.getId();
-            newObject = parentObject.useCapability('instantiation', newModel);
+            newObject = this.parent.useCapability('instantiation', newModel);
+            editorCapability = newObject.hasCapability('editor') && newObject.getCapability("editor");
 
-            editorCapability = newObject.getCapability("editor");
+            editAction = newObject.getCapability("action").getActions("edit")[0];
-
+            //If an edit action is available, perform it
-            if (countEditableViews(newObject) > 0 && newObject.hasCapability('composition')) {
+            if (editAction) {
-                this.navigationService.setNavigation(newObject);
+                return editAction.perform();
-                return newObject.getCapability("action").perform("edit");
+            } else if (editorCapability) {
-            } else {
+                //otherwise, use the save action
                 editorCapability.edit();
-                return newObject.useCapability("action").perform("save").then(function () {
+                return newObject.getCapability("action").perform("save").then(onSave, onCancel);
-                        return editorCapability.save();
-                    }, function () {
-                        return editorCapability.cancel();
-                });
             }
         };
 

platform/commonUI/edit/src/creation/CreateActionProvider.js

@@ -44,10 +44,8 @@ define(
          *        introduced in this bundle), responsible for handling actual
          *        object creation.
          */
-        function CreateActionProvider($q, typeService, navigationService, policyService) {
+        function CreateActionProvider(typeService, policyService) {
             this.typeService = typeService;
-            this.navigationService = navigationService;
-            this.$q = $q;
             this.policyService = policyService;
         }
 
@@ -72,9 +70,7 @@ define(
                 return new CreateAction(
                     type,
                     destination,
-                    context,
+                    context
-                    self.$q,
-                    self.navigationService
                 );
             });
         };

platform/commonUI/edit/src/creation/CreateWizard.js

@@ -111,12 +111,12 @@ define(
          * @param formValue
          * @returns {DomainObject}
          */
-        CreateWizard.prototype.populateObjectFromInput = function(formValue) {
+        CreateWizard.prototype.populateObjectFromInput = function (formValue) {
             var parent = this.getLocation(formValue),
                 formModel = this.createModel(formValue);
 
             formModel.location = parent.getId();
-            this.domainObject.useCapability("mutation", function(){
+            this.domainObject.useCapability("mutation", function () {
                 return formModel;
             });
             return this.domainObject;

platform/commonUI/edit/src/creation/LocatorController.js

@@ -50,14 +50,14 @@ define(
                         $scope.rootObject =
                             (context && context.getRoot()) || $scope.rootObject;
                     }, 0);
-                } else if (!contextRoot){
+                } else if (!contextRoot) {
                     //If no context root is available, default to the root
                     // object
                     $scope.rootObject = undefined;
                     // Update the displayed tree on a timeout to avoid
                     // an infinite digest exception.
                     objectService.getObjects(['ROOT'])
-                        .then(function(objects){
+                        .then(function (objects) {
                             $timeout(function () {
                                 $scope.rootObject = objects.ROOT;
                             }, 0);

platform/commonUI/edit/src/policies/EditActionPolicy.js

@@ -45,7 +45,7 @@ define(
                 count = 0,
                 type, views;
 
-            if (!domainObject){
+            if (!domainObject) {
                 return count;
             }
 
@@ -56,7 +56,10 @@ define(
             // A view is editable unless explicitly flagged as not
             (views || []).forEach(function (view) {
                 if (view.editable === true ||
-                    (view.key === 'plot' && type.getKey() === 'telemetry.panel')) {
+                    (view.key === 'plot' && type.getKey() === 'telemetry.panel') ||
+                    (view.key === 'table' && type.getKey() === 'table') ||
+                    (view.key === 'rt-table' && type.getKey() === 'rttable')
+                    ) {
                     count++;
                 }
             });
@@ -81,18 +84,15 @@ define(
             var key = action.getMetadata().key,
                 category = (context || {}).category;
 
-            // Only worry about actions in the view-control category
-            if (category === 'view-control') {
             // Restrict 'edit' to cases where there are editable
             // views (similarly, restrict 'properties' to when
             // the converse is true), and where the domain object is not
             // already being edited.
             if (key === 'edit') {
                 return this.countEditableViews(context) > 0 && !isEditing(context);
-                } else if (key === 'properties') {
+            } else if (key === 'properties' && category === 'view-control') {
                 return this.countEditableViews(context) < 1 && !isEditing(context);
             }
-            }
 
             // Like all policies, allow by default.
             return true;

platform/commonUI/edit/src/policies/EditContextualActionPolicy.js

@@ -56,7 +56,7 @@ define(
                 actionMetadata = action.getMetadata ? action.getMetadata() : {};
 
             if (navigatedObject.hasCapability("editor") && navigatedObject.getCapability("editor").isEditContextRoot()) {
-                if (selectedObject.hasCapability("editor") && selectedObject.getCapability("editor").inEditContext()){
+                if (selectedObject.hasCapability("editor") && selectedObject.getCapability("editor").inEditContext()) {
                     return this.editModeBlacklist.indexOf(actionMetadata.key) === -1;
                 } else {
                     //Target is in the context menu

platform/commonUI/edit/src/policies/EditNavigationPolicy.js

@@ -38,7 +38,7 @@ define(
         /**
          * @private
          */
-        EditNavigationPolicy.prototype.isDirty = function(domainObject) {
+        EditNavigationPolicy.prototype.isDirty = function (domainObject) {
             var navigatedObject = domainObject,
                 editorCapability = navigatedObject &&
                     navigatedObject.getCapability("editor");

platform/commonUI/edit/src/representers/EditRepresenter.js

@@ -91,14 +91,8 @@ define(
                 }
             }
 
-            function setEditable(editableDomainObject) {
-                self.domainObject = editableDomainObject;
-                scope.model = editableDomainObject.getModel();
-            }
-
             // Place the "commit" method in the scope
             scope.commit = commit;
-            scope.setEditable = setEditable;
 
             // Clean up when the scope is destroyed
             scope.$on("$destroy", function () {
@@ -119,7 +113,7 @@ define(
             // Ensure existing watches are released
             this.destroy();
 
-            function setEditing(){
+            function setEditing() {
                 scope.viewObjectTemplate = 'edit-object';
             }
 
@@ -128,15 +122,15 @@ define(
              * editable then change the view and inspector regions
              * object representation accordingly
              */
-            this.listenHandle = this.domainObject.getCapability('status').listen(function(statuses){
+            this.listenHandle = this.domainObject.getCapability('status').listen(function (statuses) {
-                if (statuses.indexOf('editing') !== -1){
+                if (statuses.indexOf('editing') !== -1) {
                     setEditing();
                 } else {
                     delete scope.viewObjectTemplate;
                 }
             });
 
-            if (representedObject.hasCapability('editor') && representedObject.getCapability('editor').isEditContextRoot()){
+            if (representedObject.hasCapability('editor') && representedObject.getCapability('editor').isEditContextRoot()) {
                 setEditing();
             }
         };

platform/commonUI/edit/src/representers/EditToolbar.js

@@ -24,8 +24,12 @@ define(
     function () {
 
         // Utility functions for reducing truth arrays
-        function and(a, b) { return a && b; }
+        function and(a, b) {
-        function or(a, b) { return a || b; }
+            return a && b;
+        }
+        function or(a, b) {
+            return a || b;
+        }
 
 
         /**
@@ -219,7 +223,7 @@ define(
 
             // Update value for this property in all elements of the
             // selection which have this property.
-            function updateProperties(property, value) {
+            function updateProperties(property, val) {
                 var changed = false;
 
                 // Update property in a selected element
@@ -229,12 +233,12 @@ define(
                         // Check if this is a setter, or just assignable
                         if (typeof selected[property] === 'function') {
                             changed =
-                                changed || (selected[property]() !== value);
+                                changed || (selected[property]() !== val);
-                            selected[property](value);
+                            selected[property](val);
                         } else {
                             changed =
-                                changed || (selected[property] !== value);
+                                changed || (selected[property] !== val);
-                            selected[property] = value;
+                            selected[property] = val;
                         }
                     }
                 }

platform/commonUI/edit/src/representers/EditToolbarRepresenter.js

@@ -133,11 +133,11 @@ define(
                 self = this;
 
             // Initialize toolbar (expose object to parent scope)
-            function initialize(definition) {
+            function initialize(def) {
                 // If we have been asked to expose toolbar state...
                 if (self.attrs.toolbar) {
                     // Initialize toolbar object
-                    self.toolbar = new EditToolbar(definition, self.commit);
+                    self.toolbar = new EditToolbar(def, self.commit);
                     // Ensure toolbar state is exposed
                     self.exposeToolbar();
                 }

platform/commonUI/edit/src/services/TransactionService.js

@@ -22,7 +22,7 @@
 /*global define*/
 define(
     [],
-    function() {
+    function () {
         /**
          * Implements an application-wide transaction state. Once a
          * transaction is started, calls to
@@ -103,7 +103,7 @@ define(
                     this.$log.error("Error committing transaction.");
                 }
             }
-            return this.$q.all(promises).then( function () {
+            return this.$q.all(promises).then(function () {
                 self.transaction = false;
 
                 self.onCommits = [];
@@ -145,4 +145,4 @@ define(
         };
 
         return TransactionService;
-});
+    });

platform/commonUI/edit/test/actions/CancelActionSpec.js

@@ -44,15 +44,15 @@ define(
             beforeEach(function () {
                 mockLocation = jasmine.createSpyObj(
                     "$location",
-                    [ "path" ]
+                    ["path"]
                 );
                 mockDomainObject = jasmine.createSpyObj(
                     "domainObject",
-                    [ "getCapability", "hasCapability" ]
+                    ["getCapability", "hasCapability"]
                 );
                 mockEditorCapability = jasmine.createSpyObj(
                     "editor",
-                    [ "save", "cancel" ]
+                    ["save", "cancel"]
                 );
                 mockUrlService = jasmine.createSpyObj(
                     "urlService",

platform/commonUI/edit/test/actions/EditActionSpec.js

@@ -38,23 +38,23 @@ define(
             beforeEach(function () {
                 mockLocation = jasmine.createSpyObj(
                     "$location",
-                    [ "path" ]
+                    ["path"]
                 );
                 mockNavigationService = jasmine.createSpyObj(
                     "navigationService",
-                    [ "setNavigation", "getNavigation", "addListener", "removeListener" ]
+                    ["setNavigation", "getNavigation", "addListener", "removeListener"]
                 );
                 mockLog = jasmine.createSpyObj(
                     "$log",
-                    [ "error", "warn", "info", "debug" ]
+                    ["error", "warn", "info", "debug"]
                 );
                 mockDomainObject = jasmine.createSpyObj(
                     "domainObject",
-                    [ "getId", "getModel", "getCapability", "hasCapability", "useCapability" ]
+                    ["getId", "getModel", "getCapability", "hasCapability", "useCapability"]
                 );
                 mockType = jasmine.createSpyObj(
                     "type",
-                    [ "hasFeature" ]
+                    ["hasFeature"]
                 );
                 mockEditor = jasmine.createSpyObj(
                     "editorCapability",
@@ -66,7 +66,7 @@ define(
                     editor: mockEditor
                 };
 
-                mockDomainObject.getCapability.andCallFake( function (name) {
+                mockDomainObject.getCapability.andCallFake(function (name) {
                     return capabilities[name];
                 });
                 mockDomainObject.hasCapability.andReturn(true);

platform/commonUI/edit/test/actions/EditAndComposeActionSpec.js

@@ -21,8 +21,8 @@
  *****************************************************************************/
 
 define(
-    ["../../src/actions/LinkAction"],
+    ["../../src/actions/EditAndComposeAction"],
-    function (LinkAction) {
+    function (EditAndComposeAction) {
 
         describe("The Link action", function () {
             var mockQ,
@@ -31,6 +31,8 @@ define(
                 mockContext,
                 mockComposition,
                 mockPersistence,
+                mockActionCapability,
+                mockEditAction,
                 mockType,
                 actionContext,
                 model,
@@ -50,7 +52,7 @@ define(
 
                 mockDomainObject = jasmine.createSpyObj(
                     "domainObject",
-                    [ "getId", "getCapability" ]
+                    ["getId", "getCapability"]
                 );
                 mockQ = { when: mockPromise };
                 mockParent = {
@@ -64,25 +66,30 @@ define(
                         return capabilities[k].invoke(v);
                     }
                 };
-                mockContext = jasmine.createSpyObj("context", [ "getParent" ]);
+                mockContext = jasmine.createSpyObj("context", ["getParent"]);
-                mockComposition = jasmine.createSpyObj("composition", [ "invoke", "add" ]);
+                mockComposition = jasmine.createSpyObj("composition", ["invoke", "add"]);
-                mockPersistence = jasmine.createSpyObj("persistence", [ "persist" ]);
+                mockPersistence = jasmine.createSpyObj("persistence", ["persist"]);
-                mockType = jasmine.createSpyObj("type", [ "hasFeature" ]);
+                mockType = jasmine.createSpyObj("type", ["hasFeature", "getKey"]);
+                mockActionCapability = jasmine.createSpyObj("actionCapability", ["getActions"]);
+                mockEditAction = jasmine.createSpyObj("editAction", ["perform"]);
 
                 mockDomainObject.getId.andReturn("test");
                 mockDomainObject.getCapability.andReturn(mockContext);
                 mockContext.getParent.andReturn(mockParent);
                 mockType.hasFeature.andReturn(true);
+                mockType.getKey.andReturn("layout");
                 mockComposition.invoke.andReturn(mockPromise(true));
                 mockComposition.add.andReturn(mockPromise(true));
+                mockActionCapability.getActions.andReturn([]);
 
                 capabilities = {
                     composition: mockComposition,
                     persistence: mockPersistence,
+                    action: mockActionCapability,
                     type: mockType
                 };
                 model = {
-                    composition: [ "a", "b", "c" ]
+                    composition: ["a", "b", "c"]
                 };
 
                 actionContext = {
@@ -90,7 +97,7 @@ define(
                     selectedObject: mockDomainObject
                 };
 
-                action = new LinkAction(actionContext);
+                action = new EditAndComposeAction(actionContext);
             });
 
 
@@ -105,6 +112,21 @@ define(
                 expect(mockPersistence.persist).toHaveBeenCalled();
             });
 
+            it("enables edit mode for objects that have an edit action", function () {
+                mockActionCapability.getActions.andReturn([mockEditAction]);
+                action.perform();
+                expect(mockEditAction.perform).toHaveBeenCalled();
+            });
+
+            it("Does not enable edit mode for objects that do not have an" +
+                " edit action", function () {
+                mockActionCapability.getActions.andReturn([]);
+                action.perform();
+                expect(mockEditAction.perform).not.toHaveBeenCalled();
+                expect(mockComposition.add)
+                    .toHaveBeenCalledWith(mockDomainObject);
+            });
+
         });
     }
 );

platform/commonUI/edit/test/actions/PropertiesActionSpec.js

@@ -38,7 +38,9 @@ define(
             beforeEach(function () {
                 capabilities = {
                     type: {
-                        getProperties: function () { return []; },
+                        getProperties: function () {
+                            return [];
+                        },
                         hasFeature: jasmine.createSpy('hasFeature')
                     },
                     persistence: jasmine.createSpyObj("persistence", ["persist"]),
@@ -47,11 +49,21 @@ define(
                 model = {};
                 input = {};
                 object = {
-                    getId: function () { return 'test-id'; },
+                    getId: function () {
-                    getCapability: function (k) { return capabilities[k]; },
+                        return 'test-id';
-                    getModel: function () { return model; },
+                    },
-                    useCapability: function (k, v) { return capabilities[k](v); },
+                    getCapability: function (k) {
-                    hasCapability: function () { return true; }
+                        return capabilities[k];
+                    },
+                    getModel: function () {
+                        return model;
+                    },
+                    useCapability: function (k, v) {
+                        return capabilities[k](v);
+                    },
+                    hasCapability: function () {
+                        return true;
+                    }
                 };
                 context = { someKey: "some value", domainObject: object };
                 dialogService = {

platform/commonUI/edit/test/actions/PropertiesDialogSpec.js

@@ -30,14 +30,22 @@ define(
 
             beforeEach(function () {
                 type = {
-                    getProperties: function () { return properties; }
+                    getProperties: function () {
+                        return properties;
+                    }
                 };
                 model = { x: "initial value" };
                 properties = ["x", "y", "z"].map(function (k) {
                     return {
-                        getValue: function (model) { return model[k]; },
+                        getValue: function (m) {
-                        setValue: function (model, v) { model[k] = v; },
+                            return m[k];
-                        getDefinition: function () { return { control: 'textfield '}; }
+                        },
+                        setValue: function (m, v) {
+                            m[k] = v;
+                        },
+                        getDefinition: function () {
+                            return { control: 'textfield '};
+                        }
                     };
                 });
 

platform/commonUI/edit/test/actions/RemoveActionSpec.js

@@ -57,19 +57,19 @@ define(
 
                 mockDomainObject = jasmine.createSpyObj(
                     "domainObject",
-                    [ "getId", "getCapability" ]
+                    ["getId", "getCapability"]
                 );
                 mockChildObject = jasmine.createSpyObj(
                     "domainObject",
-                    [ "getId", "getCapability" ]
+                    ["getId", "getCapability"]
                 );
                 mockGrandchildObject = jasmine.createSpyObj(
                     "domainObject",
-                    [ "getId", "getCapability" ]
+                    ["getId", "getCapability"]
                 );
                 mockRootObject = jasmine.createSpyObj(
                     "domainObject",
-                    [ "getId", "getCapability" ]
+                    ["getId", "getCapability"]
                 );
                 mockQ = { when: mockPromise };
                 mockParent = {
@@ -83,13 +83,13 @@ define(
                         return capabilities[k].invoke(v);
                     }
                 };
-                mockContext = jasmine.createSpyObj("context", [ "getParent" ]);
+                mockContext = jasmine.createSpyObj("context", ["getParent"]);
-                mockChildContext = jasmine.createSpyObj("context", [ "getParent" ]);
+                mockChildContext = jasmine.createSpyObj("context", ["getParent"]);
-                mockGrandchildContext = jasmine.createSpyObj("context", [ "getParent" ]);
+                mockGrandchildContext = jasmine.createSpyObj("context", ["getParent"]);
-                mockRootContext = jasmine.createSpyObj("context", [ "getParent" ]);
+                mockRootContext = jasmine.createSpyObj("context", ["getParent"]);
-                mockMutation = jasmine.createSpyObj("mutation", [ "invoke" ]);
+                mockMutation = jasmine.createSpyObj("mutation", ["invoke"]);
-                mockPersistence = jasmine.createSpyObj("persistence", [ "persist" ]);
+                mockPersistence = jasmine.createSpyObj("persistence", ["persist"]);
-                mockType = jasmine.createSpyObj("type", [ "hasFeature" ]);
+                mockType = jasmine.createSpyObj("type", ["hasFeature"]);
                 mockNavigationService = jasmine.createSpyObj(
                     "navigationService",
                     [
@@ -113,7 +113,7 @@ define(
                     type: mockType
                 };
                 model = {
-                    composition: [ "a", "test", "b" ]
+                    composition: ["a", "test", "b"]
                 };
 
                 actionContext = { domainObject: mockDomainObject };

platform/commonUI/edit/test/actions/SaveActionSpec.js

@@ -52,11 +52,11 @@ define(
                 );
                 mockEditorCapability = jasmine.createSpyObj(
                     "editor",
-                    [ "save", "cancel", "isEditContextRoot" ]
+                    ["save", "cancel", "isEditContextRoot"]
                 );
                 mockActionCapability = jasmine.createSpyObj(
                     "actionCapability",
-                    [ "perform"]
+                    ["perform"]
                 );
                 capabilities.editor = mockEditorCapability;
                 capabilities.action = mockActionCapability;

platform/commonUI/edit/test/actions/SaveAsActionSpec.js

@@ -38,7 +38,7 @@ define(
                 capabilities = {},
                 action;
 
-            function noop () {}
+            function noop() {}
 
             function mockPromise(value) {
                 return (value || {}).then ? value :
@@ -78,7 +78,7 @@ define(
 
                 mockEditorCapability = jasmine.createSpyObj(
                     "editor",
-                    [ "save", "cancel", "isEditContextRoot" ]
+                    ["save", "cancel", "isEditContextRoot"]
                 );
                 mockEditorCapability.cancel.andReturn(mockPromise(undefined));
                 mockEditorCapability.save.andReturn(mockPromise(true));
@@ -130,7 +130,7 @@ define(
                 action.createWizard.andReturn({
                     getFormStructure: noop,
                     getInitialFormValue: noop,
-                    populateObjectFromInput: function() {
+                    populateObjectFromInput: function () {
                         return mockDomainObject;
                     }
                 });

platform/commonUI/edit/test/capabilities/EditorCapabilitySpec.js

@@ -82,7 +82,7 @@ define(
                     status: mockStatusCapability
                 };
 
-                mockDomainObject.hasCapability.andCallFake(function(name) {
+                mockDomainObject.hasCapability.andCallFake(function (name) {
                     return capabilities[name] !== undefined;
                 });
 
@@ -126,8 +126,8 @@ define(
                 expect(capability.inEditContext()).toBe(true);
             });
 
-            describe("save", function() {
+            describe("save", function () {
-                beforeEach(function() {
+                beforeEach(function () {
                     capability.edit();
                     capability.save();
                 });
@@ -139,8 +139,8 @@ define(
                 });
             });
 
-            describe("cancel", function() {
+            describe("cancel", function () {
-                beforeEach(function() {
+                beforeEach(function () {
                     capability.edit();
                     capability.cancel();
                 });
@@ -152,10 +152,10 @@ define(
                 });
             });
 
-            describe("dirty", function() {
+            describe("dirty", function () {
                 var model = {};
 
-                beforeEach(function() {
+                beforeEach(function () {
                     mockDomainObject.getModel.andReturn(model);
                     capability.edit();
                     capability.cancel();

platform/commonUI/edit/test/capabilities/TransactionCapabilityDecoratorSpec.js

@@ -33,18 +33,18 @@ define(
                 mockCapabilityService,
                 provider;
 
-            beforeEach(function() {
+            beforeEach(function () {
                 mockQ = {};
                 mockTransactionService = {};
                 mockCapabilityService = jasmine.createSpyObj("capabilityService", ["getCapabilities"]);
                 mockCapabilityService.getCapabilities.andReturn({
-                    persistence: function() {}
+                    persistence: function () {}
                 });
 
                 provider = new TransactionCapabilityDecorator(mockQ, mockTransactionService, mockCapabilityService);
 
             });
-            it("decorates the persistence capability", function() {
+            it("decorates the persistence capability", function () {
                 var capabilities = provider.getCapabilities();
                 expect(capabilities.persistence({}) instanceof TransactionalPersistenceCapability).toBe(true);
             });

platform/commonUI/edit/test/capabilities/TransactionalPersistenceCapabilitySpec.js

@@ -29,7 +29,7 @@ define(
 
         function fastPromise(val) {
             return {
-                then: function(callback) {
+                then: function (callback) {
                     return callback(val);
                 }
             };
@@ -42,7 +42,7 @@ define(
                 mockDomainObject,
                 capability;
 
-            beforeEach(function() {
+            beforeEach(function () {
                 mockQ = jasmine.createSpyObj("$q", ["when"]);
                 mockQ.when.andCallFake(function (val) {
                     return fastPromise(val);
@@ -61,14 +61,14 @@ define(
             });
 
             it("if no transaction is active, passes through to persistence" +
-                " provider", function() {
+                " provider", function () {
                 mockTransactionService.isActive.andReturn(false);
                 capability.persist();
                 expect(mockPersistence.persist).toHaveBeenCalled();
             });
 
             it("if transaction is active, persist and cancel calls are" +
-                " queued", function() {
+                " queued", function () {
                 mockTransactionService.isActive.andReturn(true);
                 capability.persist();
                 expect(mockTransactionService.addToTransaction).toHaveBeenCalled();
@@ -78,7 +78,7 @@ define(
                 expect(mockPersistence.refresh).toHaveBeenCalled();
             });
 
-            it("persist call is only added to transaction once", function() {
+            it("persist call is only added to transaction once", function () {
                 mockTransactionService.isActive.andReturn(true);
                 capability.persist();
                 expect(mockTransactionService.addToTransaction).toHaveBeenCalled();

platform/commonUI/edit/test/controllers/EditControllerSpec.js

@@ -52,15 +52,15 @@ define(
                 );
                 mockScope = jasmine.createSpyObj(
                     "$scope",
-                    [ "$on", "$watch" ]
+                    ["$on", "$watch"]
                 );
                 mockObject = jasmine.createSpyObj(
                     "domainObject",
-                    [ "getId", "getModel", "getCapability", "hasCapability", "useCapability" ]
+                    ["getId", "getModel", "getCapability", "hasCapability", "useCapability"]
                 );
                 mockType = jasmine.createSpyObj(
                     "type",
-                    [ "hasFeature" ]
+                    ["hasFeature"]
                 );
                 mockStatusCapability = jasmine.createSpyObj('statusCapability',
                     ["get"]
@@ -99,7 +99,7 @@ define(
                 expect(controller.getUnloadWarning()).toBeUndefined();
 
                 // Override the policy service to prevent navigation
-                mockPolicyService.allow.andCallFake(function(category, object, context, callback){
+                mockPolicyService.allow.andCallFake(function (category, object, context, callback) {
                     callback(errorMessage);
                 });
 

platform/commonUI/edit/test/controllers/EditPanesControllerSpec.js

@@ -34,11 +34,11 @@ define(
                 mockScope = jasmine.createSpyObj("$scope", ["$watch"]);
                 mockDomainObject = jasmine.createSpyObj(
                     'domainObject',
-                    [ 'getId', 'getCapability' ]
+                    ['getId', 'getCapability']
                 );
                 mockContext = jasmine.createSpyObj(
                     'context',
-                    [ 'getTrueRoot' ]
+                    ['getTrueRoot']
                 );
 
                 mockDomainObject.getId.andReturn('test-id');

platform/commonUI/edit/test/controllers/ElementsControllerSpec.js

@@ -34,8 +34,8 @@ define(
                 controller = new ElementsController(mockScope);
             });
 
-            function getModel (model) {
+            function getModel(model) {
-                return function() {
+                return function () {
                     return model;
                 };
             }

platform/commonUI/edit/test/creation/AddActionProviderSpec.js

@@ -60,37 +60,37 @@ define(
             beforeEach(function () {
                 mockTypeService = jasmine.createSpyObj(
                     "typeService",
-                    [ "listTypes" ]
+                    ["listTypes"]
                 );
                 mockDialogService = jasmine.createSpyObj(
                     "dialogService",
-                    [ "getUserInput" ]
+                    ["getUserInput"]
                 );
                 mockPolicyService = jasmine.createSpyObj(
                     "policyService",
-                    [ "allow" ]
+                    ["allow"]
                 );
 
                 mockDomainObject = jasmine.createSpyObj(
                     "domainObject",
-                    [ "getCapability" ]
+                    ["getCapability"]
                 );
 
                 //Mocking getCapability because AddActionProvider uses the
                 // type capability of the destination object.
                 mockDomainObject.getCapability.andReturn({});
 
-                mockTypes = [ "A", "B", "C" ].map(createMockType);
+                mockTypes = ["A", "B", "C"].map(createMockType);
 
-                mockTypes.forEach(function(type){
+                mockTypes.forEach(function (type) {
                     mockPolicyMap[type.getName()] = true;
                 });
 
-                mockCreationPolicy = function(type){
+                mockCreationPolicy = function (type) {
                     return mockPolicyMap[type.getName()];
                 };
 
-                mockCompositionPolicy = function(){
+                mockCompositionPolicy = function () {
                     return true;
                 };
 

platform/commonUI/edit/test/creation/CreateActionProviderSpec.js

@@ -29,13 +29,10 @@ define(
 
         describe("The create action provider", function () {
             var mockTypeService,
-                mockDialogService,
-                mockNavigationService,
                 mockPolicyService,
                 mockCreationPolicy,
                 mockPolicyMap = {},
                 mockTypes,
-                mockQ,
                 provider;
 
             function createMockType(name) {
@@ -59,41 +56,31 @@ define(
             beforeEach(function () {
                 mockTypeService = jasmine.createSpyObj(
                     "typeService",
-                    [ "listTypes" ]
+                    ["listTypes"]
-                );
-                mockDialogService = jasmine.createSpyObj(
-                    "dialogService",
-                    [ "getUserInput" ]
-                );
-                mockNavigationService = jasmine.createSpyObj(
-                    "navigationService",
-                    [ "setNavigation" ]
                 );
                 mockPolicyService = jasmine.createSpyObj(
                     "policyService",
-                    [ "allow" ]
+                    ["allow"]
                 );
 
-                mockTypes = [ "A", "B", "C" ].map(createMockType);
+                mockTypes = ["A", "B", "C"].map(createMockType);
 
-                mockTypes.forEach(function(type){
+                mockTypes.forEach(function (type) {
                     mockPolicyMap[type.getName()] = true;
                 });
 
-                mockCreationPolicy = function(type){
+                mockCreationPolicy = function (type) {
                     return mockPolicyMap[type.getName()];
                 };
 
-                mockPolicyService.allow.andCallFake(function(category, type){
+                mockPolicyService.allow.andCallFake(function (category, type) {
                     return category === "creation" && mockCreationPolicy(type) ? true : false;
                 });
 
                 mockTypeService.listTypes.andReturn(mockTypes);
 
                 provider = new CreateActionProvider(
-                    mockQ,
                     mockTypeService,
-                    mockNavigationService,
                     mockPolicyService
                 );
             });

platform/commonUI/edit/test/creation/CreateActionSpec.js

@@ -0,0 +1,190 @@
+/*****************************************************************************
+ * Open MCT Web, Copyright (c) 2014-2015, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT Web is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT Web includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+/**
+ * MCTRepresentationSpec. Created by vwoeltje on 11/6/14.
+ */
+define(
+    ["../../src/creation/CreateAction"],
+    function (CreateAction) {
+
+        describe("The create action", function () {
+            var mockType,
+                mockParent,
+                mockContext,
+                mockDomainObject,
+                capabilities = {},
+                mockEditAction,
+                mockSaveAction,
+                action;
+
+            function mockPromise(value) {
+                return {
+                    then: function (callback) {
+                        return mockPromise(callback(value));
+                    }
+                };
+            }
+
+            beforeEach(function () {
+                mockType = jasmine.createSpyObj(
+                    "type",
+                    [
+                        "getKey",
+                        "getGlyph",
+                        "getName",
+                        "getDescription",
+                        "getProperties",
+                        "getInitialModel"
+                    ]
+                );
+                mockParent = jasmine.createSpyObj(
+                    "domainObject",
+                    [
+                        "getId",
+                        "getModel",
+                        "getCapability",
+                        "useCapability"
+                    ]
+                );
+                mockDomainObject = jasmine.createSpyObj(
+                    "domainObject",
+                    [
+                        "getId",
+                        "getModel",
+                        "getCapability",
+                        "hasCapability",
+                        "useCapability"
+                    ]
+                );
+                mockDomainObject.hasCapability.andCallFake(function (name) {
+                    return !!capabilities[name];
+                });
+                mockDomainObject.getCapability.andCallFake(function (name) {
+                    return capabilities[name];
+                });
+                mockSaveAction = jasmine.createSpyObj(
+                    "saveAction",
+                    [
+                        "perform"
+                    ]
+                );
+
+                capabilities.action = jasmine.createSpyObj(
+                    "actionCapability",
+                    [
+                        "getActions",
+                        "perform"
+                    ]
+                );
+
+                capabilities.editor = jasmine.createSpyObj(
+                    "editorCapability",
+                    [
+                        "edit",
+                        "save",
+                        "cancel"
+                    ]
+                );
+
+                mockEditAction = jasmine.createSpyObj(
+                    "editAction",
+                    [
+                        "perform"
+                    ]
+                );
+
+                mockContext = {
+                    domainObject: mockParent
+                };
+                mockParent.useCapability.andReturn(mockDomainObject);
+
+                mockType.getKey.andReturn("test");
+                mockType.getGlyph.andReturn("T");
+                mockType.getDescription.andReturn("a test type");
+                mockType.getName.andReturn("Test");
+                mockType.getProperties.andReturn([]);
+                mockType.getInitialModel.andReturn({});
+
+                action = new CreateAction(
+                    mockType,
+                    mockParent,
+                    mockContext
+                );
+            });
+
+            it("exposes type-appropriate metadata", function () {
+                var metadata = action.getMetadata();
+
+                expect(metadata.name).toEqual("Test");
+                expect(metadata.description).toEqual("a test type");
+                expect(metadata.glyph).toEqual("T");
+            });
+
+            describe("the perform function", function () {
+                beforeEach(function () {
+                    capabilities.action.getActions.andReturn([mockEditAction]);
+                });
+
+                it("uses the instantiation capability when performed", function () {
+                    action.perform();
+                    expect(mockParent.useCapability).toHaveBeenCalledWith("instantiation", jasmine.any(Object));
+                });
+
+                it("uses the edit action if available", function () {
+                    action.perform();
+                    expect(mockEditAction.perform).toHaveBeenCalled();
+                });
+
+                it("uses the save action if object does not have an edit action" +
+                    " available", function () {
+                    capabilities.action.getActions.andReturn([]);
+                    capabilities.action.perform.andReturn(mockPromise(undefined));
+                    action.perform();
+                    expect(capabilities.action.perform).toHaveBeenCalledWith("save");
+                });
+
+                describe("uses to editor capability", function () {
+                    var promise = jasmine.createSpyObj("promise", ["then"]);
+                    beforeEach(function () {
+                        capabilities.action.getActions.andReturn([]);
+                        capabilities.action.perform.andReturn(promise);
+                    });
+
+                    it("to save the edit if user saves dialog", function () {
+                        action.perform();
+                        expect(promise.then).toHaveBeenCalled();
+                        promise.then.mostRecentCall.args[0]();
+                        expect(capabilities.editor.save).toHaveBeenCalled();
+                    });
+
+                    it("to cancel the edit if user cancels dialog", function () {
+                        action.perform();
+                        promise.then.mostRecentCall.args[1]();
+                        expect(capabilities.editor.cancel).toHaveBeenCalled();
+                    });
+                });
+            });
+
+        });
+    }
+);

platform/commonUI/edit/test/creation/CreateWizardSpec.js

@@ -39,7 +39,7 @@ define(
             function createMockProperty(name) {
                 var mockProperty = jasmine.createSpyObj(
                     "property" + name,
-                    [ "getDefinition", "getValue", "setValue" ]
+                    ["getDefinition", "getValue", "setValue"]
                 );
                 mockProperty.getDefinition.andReturn({
                     control: "textfield"
@@ -68,7 +68,7 @@ define(
                         "getCapability"
                     ]
                 );
-                mockProperties = [ "A", "B", "C" ].map(createMockProperty);
+                mockProperties = ["A", "B", "C"].map(createMockProperty);
                 mockPolicyService = jasmine.createSpyObj('policyService', ['allow']);
 
                 testModel = { someKey: "some value" };
@@ -152,7 +152,7 @@ define(
             });
 
             it("validates selection types using policy", function () {
-                var mockDomainObject = jasmine.createSpyObj(
+                var mockDomainObj = jasmine.createSpyObj(
                         'domainObject',
                         ['getCapability']
                     ),
@@ -166,8 +166,8 @@ define(
                     rows = structure.sections[sections.length - 1].rows,
                     locationRow = rows[rows.length - 1];
 
-                mockDomainObject.getCapability.andReturn(mockOtherType);
+                mockDomainObj.getCapability.andReturn(mockOtherType);
-                locationRow.validate(mockDomainObject);
+                locationRow.validate(mockDomainObj);
 
                 // Should check policy to see if the user-selected location
                 // can actually contain objects of this type
@@ -179,7 +179,7 @@ define(
             });
 
             it("creates a form model without a location if not requested", function () {
-                expect(wizard.getFormStructure(false).sections.some(function(section){
+                expect(wizard.getFormStructure(false).sections.some(function (section) {
                     return section.name === 'Location';
                 })).toEqual(false);
             });

platform/commonUI/edit/test/creation/CreationServiceSpec.js

@@ -61,23 +61,23 @@ define(
                 mockQ = { when: mockPromise, reject: mockReject };
                 mockLog = jasmine.createSpyObj(
                     "$log",
-                    [ "error", "warn", "info", "debug" ]
+                    ["error", "warn", "info", "debug"]
                 );
                 mockParentObject = jasmine.createSpyObj(
                     "parentObject",
-                    [ "getId", "getCapability", "useCapability" ]
+                    ["getId", "getCapability", "useCapability"]
                 );
                 mockNewObject = jasmine.createSpyObj(
                     "newObject",
-                    [ "getId", "getCapability", "useCapability" ]
+                    ["getId", "getCapability", "useCapability"]
                 );
                 mockMutationCapability = jasmine.createSpyObj(
                     "mutation",
-                    [ "invoke" ]
+                    ["invoke"]
                 );
                 mockPersistenceCapability = jasmine.createSpyObj(
                     "persistence",
-                    [ "persist", "getSpace" ]
+                    ["persist", "getSpace"]
                 );
                 mockCompositionCapability = jasmine.createSpyObj(
                     "composition",
@@ -100,7 +100,7 @@ define(
                 };
                 mockNewPersistenceCapability = jasmine.createSpyObj(
                     "new-persistence",
-                    [ "persist", "getSpace" ]
+                    ["persist", "getSpace"]
                 );
 
                 mockParentObject.getCapability.andCallFake(function (key) {

platform/commonUI/edit/test/creation/LocatorControllerSpec.js

@@ -40,20 +40,20 @@ define(
             beforeEach(function () {
                 mockScope = jasmine.createSpyObj(
                     "$scope",
-                    [ "$watch" ]
+                    ["$watch"]
                 );
                 mockTimeout = jasmine.createSpy("$timeout");
                 mockDomainObject = jasmine.createSpyObj(
                     "domainObject",
-                    [ "getCapability" ]
+                    ["getCapability"]
                 );
                 mockRootObject = jasmine.createSpyObj(
                     "rootObject",
-                    [ "getCapability" ]
+                    ["getCapability"]
                 );
                 mockContext = jasmine.createSpyObj(
                     "context",
-                    [ "getRoot" ]
+                    ["getRoot"]
                 );
                 mockObjectService = jasmine.createSpyObj(
                     "objectService",
@@ -123,7 +123,7 @@ define(
                 it("treats a lack of a selection as invalid", function () {
                         mockScope.ngModelController = jasmine.createSpyObj(
                             'ngModelController',
-                            [ '$setValidity' ]
+                            ['$setValidity']
                         );
 
                         mockScope.$watch.mostRecentCall.args[1](mockDomainObject);
@@ -142,8 +142,8 @@ define(
 
                     beforeEach(function () {
                         mockContext.getRoot.andReturn(undefined);
-                        getObjectsPromise.then.andCallFake(function(callback){
+                        getObjectsPromise.then.andCallFake(function (callback) {
-                            callback({'ROOT':defaultRoot});
+                            callback({'ROOT': defaultRoot});
                         });
                         controller = new LocatorController(mockScope, mockTimeout, mockObjectService);
                     });

platform/commonUI/edit/test/policies/EditActionPolicySpec.js

@@ -58,10 +58,10 @@ define(
                 mockEditAction = jasmine.createSpyObj('edit', ['getMetadata']);
                 mockPropertiesAction = jasmine.createSpyObj('edit', ['getMetadata']);
 
-                mockDomainObject.getCapability.andCallFake(function(capability){
+                mockDomainObject.getCapability.andCallFake(function (capability) {
                     return capabilities[capability];
                 });
-                mockDomainObject.hasCapability.andCallFake(function(capability){
+                mockDomainObject.hasCapability.andCallFake(function (capability) {
                     return !!capabilities[capability];
                 });
 
@@ -88,42 +88,42 @@ define(
             });
 
             it("allows the edit action when there are editable views", function () {
-                testViews = [ editableView ];
+                testViews = [editableView];
                 expect(policy.allow(mockEditAction, testContext)).toBe(true);
             });
 
             it("allows the edit properties action when there are no editable views", function () {
-                testViews = [ nonEditableView, nonEditableView ];
+                testViews = [nonEditableView, nonEditableView];
                 expect(policy.allow(mockPropertiesAction, testContext)).toBe(true);
             });
 
             it("disallows the edit action when there are no editable views", function () {
-                testViews = [ nonEditableView, nonEditableView ];
+                testViews = [nonEditableView, nonEditableView];
                 expect(policy.allow(mockEditAction, testContext)).toBe(false);
             });
 
             it("disallows the edit properties action when there are" +
                 " editable views", function () {
-                testViews = [ editableView ];
+                testViews = [editableView];
                 expect(policy.allow(mockPropertiesAction, testContext)).toBe(false);
             });
 
             it("disallows the edit action when object is already being" +
                 " edited", function () {
-                testViews = [ editableView ];
+                testViews = [editableView];
                 mockEditorCapability.isEditContextRoot.andReturn(true);
                 expect(policy.allow(mockEditAction, testContext)).toBe(false);
             });
 
             it("allows editing of panels in plot view", function () {
-                testViews = [ plotView ];
+                testViews = [plotView];
                 mockTypeCapability.getKey.andReturn('telemetry.panel');
 
                 expect(policy.allow(mockEditAction, testContext)).toBe(true);
             });
 
             it("disallows editing of plot view when object not a panel type", function () {
-                testViews = [ plotView ];
+                testViews = [plotView];
                 mockTypeCapability.getKey.andReturn('something.else');
 
                 expect(policy.allow(mockEditAction, testContext)).toBe(false);
@@ -131,7 +131,7 @@ define(
 
 
             it("allows the edit properties outside of the 'view-control' category", function () {
-                testViews = [ nonEditableView ];
+                testViews = [nonEditableView];
                 testContext.category = "something-else";
                 expect(policy.allow(mockPropertiesAction, testContext)).toBe(true);
             });

platform/commonUI/edit/test/policies/EditContextualActionPolicySpec.js

@@ -61,12 +61,12 @@ define(
                 policy = new EditContextualActionPolicy(navigationService, editModeBlacklist, nonEditContextBlacklist);
             });
 
-            it('Allows all actions when navigated object not in edit mode', function() {
+            it('Allows all actions when navigated object not in edit mode', function () {
                 expect(policy.allow(mockAction, context)).toBe(true);
             });
 
             it('Allows "window" action when navigated object in edit mode,' +
-                ' but selected object not in edit mode ', function() {
+                ' but selected object not in edit mode ', function () {
                 navigatedObject.hasCapability.andReturn(true);
                 mockEditorCapability.isEditContextRoot.andReturn(true);
                 metadata.key = "window";
@@ -75,7 +75,7 @@ define(
 
             it('Allows "remove" action when navigated object in edit mode,' +
                 ' and selected object not editable, but its parent is.',
-                function() {
+                function () {
                     var mockParent = jasmine.createSpyObj("parentObject", ["hasCapability"]),
                         mockContextCapability = jasmine.createSpyObj("contextCapability", ["getParent"]);
 
@@ -96,7 +96,7 @@ define(
                 });
 
             it('Disallows "move" action when navigated object in edit mode,' +
-                ' but selected object not in edit mode ', function() {
+                ' but selected object not in edit mode ', function () {
                 navigatedObject.hasCapability.andReturn(true);
                 mockEditorCapability.isEditContextRoot.andReturn(true);
                 mockEditorCapability.inEditContext.andReturn(false);
@@ -105,7 +105,7 @@ define(
             });
 
             it('Disallows copy action when navigated object and' +
-                ' selected object in edit mode', function() {
+                ' selected object in edit mode', function () {
                 navigatedObject.hasCapability.andReturn(true);
                 mockDomainObject.hasCapability.andReturn(true);
                 mockEditorCapability.isEditContextRoot.andReturn(true);

platform/commonUI/edit/test/representers/EditRepresenterSpec.js

@@ -72,7 +72,7 @@ define(
                 mockDomainObject.getModel.andReturn({});
                 mockDomainObject.hasCapability.andReturn(true);
                 mockDomainObject.useCapability.andReturn(true);
-                mockDomainObject.getCapability.andCallFake(function(capability){
+                mockDomainObject.getCapability.andCallFake(function (capability) {
                     return mockCapabilities[capability];
                 });
 

platform/commonUI/edit/test/representers/EditToolbarRepresenterSpec.js

@@ -34,13 +34,13 @@ define(
             beforeEach(function () {
                 mockScope = jasmine.createSpyObj(
                     '$scope',
-                    [ '$on', '$watch', '$watchCollection', "commit" ]
+                    ['$on', '$watch', '$watchCollection', "commit"]
                 );
                 mockElement = {};
                 testAttrs = { toolbar: 'testToolbar' };
                 mockScope.$parent = jasmine.createSpyObj(
                     '$parent',
-                    [ '$watch', '$watchCollection' ]
+                    ['$watch', '$watchCollection']
                 );
                 mockUnwatch = jasmine.createSpy('unwatch');
 
@@ -92,7 +92,7 @@ define(
 
                 // Provide a view which has a toolbar
                 representer.represent({
-                    toolbar: { sections: [ { items: [ { property: 'k' } ] } ] }
+                    toolbar: { sections: [{ items: [{ property: 'k' }] }] }
                 });
 
                 // Update the selection
@@ -120,7 +120,7 @@ define(
 
                 // Provide a view which has a toolbar
                 representer.represent({
-                    toolbar: { sections: [ { items: [ { property: 'k' } ] } ] }
+                    toolbar: { sections: [{ items: [{ property: 'k' }] }] }
                 });
 
                 // Update the selection

platform/commonUI/edit/test/representers/EditToolbarSpec.js

@@ -76,7 +76,7 @@ define(
 
             it("provides properties from the original structure", function () {
                 expect(
-                    new EditToolbar(testStructure, [ testABC ])
+                    new EditToolbar(testStructure, [testABC])
                         .getStructure()
                         .sections[0]
                         .items[1]
@@ -87,7 +87,7 @@ define(
             // This is needed by mct-toolbar
             it("adds keys to form structure", function () {
                 expect(
-                    new EditToolbar(testStructure, [ testABC ])
+                    new EditToolbar(testStructure, [testABC])
                         .getStructure()
                         .sections[0]
                         .items[1]
@@ -97,20 +97,20 @@ define(
 
             it("marks empty sections as hidden", function () {
                 // Verify that all sections are included when applicable...
-                toolbar.setSelection([ testABCXYZ ]);
+                toolbar.setSelection([testABCXYZ]);
                 expect(toolbar.getStructure().sections.map(getVisibility))
-                    .toEqual([ true, true, false ]);
+                    .toEqual([true, true, false]);
 
                 // ...but omitted when only some are applicable
-                toolbar.setSelection([ testABC ]);
+                toolbar.setSelection([testABC]);
                 expect(toolbar.getStructure().sections.map(getVisibility))
-                    .toEqual([ true, false, false ]);
+                    .toEqual([true, false, false]);
             });
 
             it("reads properties from selections", function () {
                 var structure, state;
 
-                toolbar.setSelection([ testABC ]);
+                toolbar.setSelection([testABC]);
 
                 structure = toolbar.getStructure();
                 state = toolbar.getState();
@@ -126,9 +126,11 @@ define(
             it("reads properties from getters", function () {
                 var structure, state;
 
-                testABC.a = function () { return "from a getter!"; };
+                testABC.a = function () {
+                    return "from a getter!";
+                };
 
-                toolbar.setSelection([ testABC ]);
+                toolbar.setSelection([testABC]);
                 structure = toolbar.getStructure();
                 state = toolbar.getState();
 
@@ -137,7 +139,7 @@ define(
             });
 
             it("sets properties on update", function () {
-                toolbar.setSelection([ testABC ]);
+                toolbar.setSelection([testABC]);
                 toolbar.updateState(
                     toolbar.getStructure().sections[0].items[0].key,
                     "new value"
@@ -151,7 +153,7 @@ define(
 
                 testABC.a = jasmine.createSpy('a');
 
-                toolbar.setSelection([ testABC ]);
+                toolbar.setSelection([testABC]);
                 structure = toolbar.getStructure();
 
                 toolbar.updateState(
@@ -165,7 +167,7 @@ define(
             it("provides a return value describing update status", function () {
                 // Should return true if actually updated, otherwise false
                 var key;
-                toolbar.setSelection([ testABC ]);
+                toolbar.setSelection([testABC]);
                 key = toolbar.getStructure().sections[0].items[0].key;
                 expect(toolbar.updateState(key, testABC.a)).toBeFalsy();
                 expect(toolbar.updateState(key, "new value")).toBeTruthy();
@@ -173,35 +175,35 @@ define(
 
             it("removes inapplicable items", function () {
                 // First, verify with all items
-                toolbar.setSelection([ testABC ]);
+                toolbar.setSelection([testABC]);
                 expect(toolbar.getStructure().sections[0].items.map(getVisibility))
-                    .toEqual([ true, true, true ]);
+                    .toEqual([true, true, true]);
                 // Then, try with some items omitted
-                toolbar.setSelection([ testABC, testAB ]);
+                toolbar.setSelection([testABC, testAB]);
                 expect(toolbar.getStructure().sections[0].items.map(getVisibility))
-                    .toEqual([ true, true, false ]);
+                    .toEqual([true, true, false]);
             });
 
             it("removes inconsistent states", function () {
                 // Only two of three values match among these selections
-                toolbar.setSelection([ testABC, testABC2 ]);
+                toolbar.setSelection([testABC, testABC2]);
                 expect(toolbar.getStructure().sections[0].items.map(getVisibility))
-                    .toEqual([ false, true, true ]);
+                    .toEqual([false, true, true]);
             });
 
             it("allows inclusive items", function () {
                 // One inclusive item is in the set, property 'x' of the
                 // second section; make sure items are pruned down
                 // when only some of the selection has x,y,z properties
-                toolbar.setSelection([ testABC, testABCXYZ ]);
+                toolbar.setSelection([testABC, testABCXYZ]);
                 expect(toolbar.getStructure().sections[1].items.map(getVisibility))
-                    .toEqual([ true, false, false ]);
+                    .toEqual([true, false, false]);
             });
 
             it("removes inclusive items when there are no matches", function () {
-                toolbar.setSelection([ testABCYZ ]);
+                toolbar.setSelection([testABCYZ]);
                 expect(toolbar.getStructure().sections[1].items.map(getVisibility))
-                    .toEqual([ false, true, true ]);
+                    .toEqual([false, true, true]);
             });
 
             it("adds click functions when a method is specified", function () {

platform/commonUI/edit/test/services/TransactionServiceSpec.js

@@ -30,7 +30,7 @@ define(
                 mockLog,
                 transactionService;
 
-            function fastPromise (val) {
+            function fastPromise(val) {
                 return {
                     then: function (callback) {
                         return fastPromise(callback(val));
@@ -75,8 +75,8 @@ define(
             describe("commit", function () {
                 var onCommits;
 
-                beforeEach(function() {
+                beforeEach(function () {
-                    onCommits = [0, 1, 2].map(function(val) {
+                    onCommits = [0, 1, 2].map(function (val) {
                             return jasmine.createSpy("onCommit" + val);
                         });
 
@@ -87,7 +87,7 @@ define(
                 it("commit calls all queued commit functions", function () {
                     expect(transactionService.onCommits.length).toBe(3);
                     transactionService.commit();
-                    onCommits.forEach( function (spy) {
+                    onCommits.forEach(function (spy) {
                         expect(spy).toHaveBeenCalled();
                     });
                 });
@@ -104,8 +104,8 @@ define(
             describe("cancel", function () {
                 var onCancels;
 
-                beforeEach(function() {
+                beforeEach(function () {
-                    onCancels = [0, 1, 2].map(function(val) {
+                    onCancels = [0, 1, 2].map(function (val) {
                         return jasmine.createSpy("onCancel" + val);
                     });
 
@@ -118,7 +118,7 @@ define(
                 it("cancel calls all queued cancel functions", function () {
                     expect(transactionService.onCancels.length).toBe(3);
                     transactionService.cancel();
-                    onCancels.forEach( function (spy) {
+                    onCancels.forEach(function (spy) {
                         expect(spy).toHaveBeenCalled();
                     });
                 });

platform/commonUI/formats/test/FormatProviderSpec.js

@@ -24,7 +24,7 @@ define(
     ['../src/FormatProvider'],
     function (FormatProvider) {
 
-        var KEYS = [ 'a', 'b', 'c' ];
+        var KEYS = ['a', 'b', 'c'];
 
         describe("The FormatProvider", function () {
             var mockFormats,
@@ -35,12 +35,14 @@ define(
                 mockFormatInstances = KEYS.map(function (k) {
                     return jasmine.createSpyObj(
                         'format-' + k,
-                        [ 'parse', 'validate', 'format' ]
+                        ['parse', 'validate', 'format']
                     );
                 });
                 // Return constructors
                 mockFormats = KEYS.map(function (k, i) {
-                    function MockFormat() { return mockFormatInstances[i]; }
+                    function MockFormat() {
+                        return mockFormatInstances[i];
+                    }
                     MockFormat.key = k;
                     return MockFormat;
                 });

platform/commonUI/general/bundle.js

@@ -380,7 +380,7 @@ define([
                 {
                     "key": "mctTree",
                     "implementation": MCTTree,
-                    "depends": [ '$parse', 'gestureService' ]
+                    "depends": ['$parse', 'gestureService']
                 }
             ],
             "constants": [

platform/commonUI/general/res/sass/_archetypes.scss

@@ -145,3 +145,8 @@
 .flex-justify-end {
     @include justify-content(flex-end);
 }
+
+/********************************************* POPUPS */
+.t-popup {
+    z-index: 75;
+}

platform/commonUI/general/res/sass/_constants.scss

@@ -48,7 +48,7 @@ $uePaneMiniTabW: 10px;
 $uePaneMiniTabCollapsedW: 11px;
 $ueEditLeftPaneW: 75%;
 $treeSearchInputBarH: 25px;
-$ueTimeControlH: (33px, 20px, 20px);
+$ueTimeControlH: (33px, 18px, 20px);
 // Panes
 $ueBrowseLeftPaneTreeMinW: 150px;
 $ueBrowseLeftPaneTreeMaxW: 35%;

platform/commonUI/general/res/sass/_global.scss

@@ -63,9 +63,10 @@ input, textarea {
 	font-family: Helvetica, Arial, sans-serif;
 }
 
-input[type="text"] {
+input[type="text"],
+input[type="search"] {
 	vertical-align: baseline;
-	padding: 3px 5px !important;
+	padding: 3px 5px;
 }
 
 h1, h2, h3 {

platform/commonUI/general/res/sass/_mixins.scss

@@ -139,6 +139,17 @@
     background-size: $d $d;
 }
 
+@mixin bgStripes($c: yellow, $a: 0.1, $bgsize: 5px, $angle: 90deg) {
+    @include background-image(linear-gradient($angle,
+        rgba($c, $a) 25%, transparent 25%,
+        transparent 50%, rgba($c, $a) 50%,
+        rgba($c, $a) 75%, transparent 75%,
+        transparent 100%
+    ));
+    background-repeat: repeat;
+    background-size: $bgsize $bgsize;
+}
+
 @mixin bgVertStripes($c: yellow, $a: 0.1, $d: 40px) {
     @include background-image(linear-gradient(-90deg,
         rgba($c, $a) 0%, rgba($c, $a) 50%,
@@ -322,13 +333,13 @@
 	color: $fg;
 	outline: none;
 	&.error {
-		background: rgba(red, 0.5);
+		background-color: $colorFormFieldErrorBg;
+        color: $colorFormFieldErrorFg;
 	}
 }
 
 @mixin nice-input($bg: $colorInputBg, $fg: $colorInputFg) {
 	@include input-base($bg, $fg);
-	padding: 0 $interiorMarginSm;
 }
 
 @mixin contextArrow() {

platform/commonUI/general/res/sass/controls/_controls.scss

@@ -29,7 +29,7 @@
     .accordion-head {
         $op: 0.2;
         border-radius: $basicCr * 0.75;
-        box-sizing: "border-box";
+        box-sizing: border-box;
         background: rgba($colorBodyFg, $op);
         cursor: pointer;
         font-size: 0.75em;
@@ -396,11 +396,11 @@ input[type="search"] {
         left: auto;
     }
     .knob-l {
-        @include border-left-radius($sliderKnobW);
+        @include border-left-radius($sliderKnobR);
         cursor: w-resize;
     }
     .knob-r {
-        @include border-right-radius($sliderKnobW);
+        @include border-right-radius($sliderKnobR);
         cursor: e-resize;
     }
     .range {
@@ -426,7 +426,6 @@ input[type="search"] {
     @include user-select(none);
     font-size: 0.8rem;
     padding: $interiorMarginLg !important;
-    width: 230px;
     .l-month-year-pager {
         $pagerW: 20px;
         height: $r1H;
@@ -518,6 +517,19 @@ input[type="search"] {
     }
 }
 
+@include phone {
+    .l-datetime-picker {
+        padding: $interiorMargin !important;
+    }
+    .l-calendar {
+        ul.l-cal-row {
+            li {
+                padding: 2px $interiorMargin;
+            }
+        }
+    }
+}
+
 /******************************************************** TEXTAREA */
 textarea {
     @include nice-textarea($colorInputBg, $colorInputFg);

platform/commonUI/general/res/sass/controls/_time-controller.scss

@@ -10,25 +10,24 @@
 	$knobHOffset: 0px;
 	$knobM: ($sliderKnobW + $knobHOffset) * -1;
 	$rangeValPad: $interiorMargin;
-	$rangeValOffset: $sliderKnobW;
+	$rangeValOffset: $sliderKnobW + $interiorMargin;
-	$timeRangeSliderLROffset: 130px + $sliderKnobW + $rangeValOffset;
+	$timeRangeSliderLROffset: 150px + ($sliderKnobW * 2);
-	$r1H: nth($ueTimeControlH,1);
+	$r1H: nth($ueTimeControlH,1); // Not currently used
 	$r2H: nth($ueTimeControlH,2);
 	$r3H: nth($ueTimeControlH,3);
 
-    display: block;
-	height: $r1H + $r2H + $r3H + ($interiorMargin * 2);
     min-width: $minW;
     font-size: 0.8rem;
 
-
 	.l-time-range-inputs-holder,
 	.l-time-range-slider-holder,
 	.l-time-range-ticks-holder
 	{
-		@include absPosDefault(0, visible);
 		box-sizing: border-box;
-		top: auto;
+        position: relative;
+        &:not(:first-child) {
+            margin-top: $interiorMargin;
+        }
 	}
 	.l-time-range-slider,
 	.l-time-range-ticks {
@@ -37,14 +36,21 @@
 	}
 
 	.l-time-range-inputs-holder {
-		height: $r1H; bottom: $r2H + $r3H + ($interiorMarginSm * 2);
-		padding-top: $interiorMargin;
 		border-top: 1px solid $colorInteriorBorder;
+        padding-top: $interiorMargin;
+        &.l-flex-row,
+        .l-flex-row {
+            @include align-items(center);
+            .flex-elem {
+                height: auto;
+                line-height: normal;
+            }
+        }
 		.type-icon {
 			font-size: 120%;
 			vertical-align: middle;
 		}
-		.l-time-range-input,
+		.l-time-range-input-w,
 		.l-time-range-inputs-elem {
 			margin-right: $interiorMargin;
 			.lbl {
@@ -52,13 +58,27 @@
 			}
 			.ui-symbol.icon {
 				font-size: 11px;
-				width: 11px;
+			}
+		}
+        .l-time-range-input-w {
+            // Wraps a datetime text input field
+            position: relative;
+            input[type="text"] {
+                width: 200px;
+                &.picker-icon {
+                    padding-right: 20px;
+                }
+            }
+            .icon-calendar {
+                position: absolute;
+                right: 5px;
+                top: 5px;
             }
         }
 	}
 
 	.l-time-range-slider-holder {
-		height: $r2H; bottom: $r3H + ($interiorMarginSm * 1);
+		height: $r2H;
 		.range-holder {
 			box-shadow: none;
 			background: none;
@@ -73,24 +93,13 @@
 					width: $myW;
 					height: auto;
 					z-index: 2;
-					&:before,
-					&:after {
-						background-color: $myC;
-						content: "";
-						position: absolute;
-					}
 					&:before {
 						// Vert line
+                        background-color: $myC;
+                        position: absolute;
+                        content: "";
 						top: 0; right: auto; bottom: -10px; left: floor($myW/2) - 1;
-						width: 2px;
+						width: 1px;
-					}
-					&:after {
-						// Circle element
-						border-radius: $myW;
-						@include transform(translateY(-50%));
-						top: 50%; right: 0; bottom: auto; left: 0;
-						width: auto;
-						height: $myW;
 					}
 				}
 				&:hover .toi-line {
@@ -126,9 +135,9 @@
 					@include webkitProp(transform, translateX(-50%));
 					color: $colorPlotLabelFg;
 					display: inline-block;
-					font-size: 0.9em;
+					font-size: 0.7rem;
 					position: absolute;
-					top: 8px;
+					top: 5px;
 					white-space: nowrap;
 					z-index: 2;
 				}
@@ -138,16 +147,29 @@
 
 	.knob {
 		z-index: 2;
+        &:before {
+            $mTB: 2px;
+            $grippyW: 3px;
+            $mLR: ($sliderKnobW - $grippyW)/2;
+            @include bgStripes($c: pullForward($sliderColorKnob, 20%), $a: 1, $bgsize: 4px, $angle: 0deg);
+            content: '';
+            display: block;
+            position: absolute;
+            top: $mTB; right: $mLR; bottom: $mTB; left: $mLR;
+        }
 		.range-value {
 			@include trans-prop-nice-fade(.25s);
-			padding: 0 $rangeValOffset;
+            font-size: 0.7rem;
 			position: absolute;
 			height: $r2H;
 			line-height: $r2H;
             white-space: nowrap;
+            z-index: 1;
 		}
-		&:hover .range-value {
+		&:hover {
+            .range-value {
                 color: $sliderColorKnobHov;
+            }
 		}
 		&.knob-l {
 			margin-left: $knobM;
@@ -170,7 +192,7 @@
 	.l-time-domain-selector {
 		position: absolute;
 		right: 0px;
-		bottom: 46px;
+		top: $interiorMargin;
 	}
 
 }
@@ -181,174 +203,64 @@
 	padding: 1px 1px 0 $interiorMargin;
 }
 
+/******************************************************************** MOBILE */
+
 @include phoneandtablet {
-	.l-time-controller, .l-time-range-inputs-holder {
-		min-width: 0px;
-	}
-
     .l-time-controller {
-
+        min-width: 0;
-		.l-time-domain-selector {
+        .l-time-range-slider-holder,
-			select {
+        .l-time-range-ticks-holder {
-				height: 25px;
-				margin-bottom: 0px;
-			}
-		}
-
-		.l-time-range-slider-holder, .l-time-range-ticks-holder {
             display: none;
         }
-
-		.time-range-start, .time-range-end, {
-			width: 100%;
-		}
-
-		.l-time-range-inputs-holder {
-			.l-time-range-input {
-				display: block;
-				.s-btn {
-					padding-right: 18px;
-					white-space: nowrap;
-					input {
-						width: 100%;
-					}
-				}
-			}
-			.l-time-range-inputs-elem {
-
-			}
-		}
     }
 }
 
 @include phone {
     .l-time-controller {
-		height: 48px;
-
         .l-time-range-inputs-holder {
-			bottom: 24px;
+            &.l-flex-row,
-		}
+            .l-flex-row {
-
+                @include align-items(flex-start);
-		.l-time-domain-selector {
-			width: 33%;
-			bottom: -9px;
-		}
-
-		.l-time-range-inputs-holder {
-			.l-time-range-input {
-				margin-bottom: 5px;
-				.s-btn {
-					width: 66%;
-				}
             }
             .l-time-range-inputs-elem {
-				&.ui-symbol {
+                &.type-icon {
-					display: none;
+                    margin-top: 3px;
                 }
-
+            }
-				&.lbl {
+            .t-inputs-w {
-					width: 33%;
+                @include flex-direction(column);
-					right: 0px;
+                .l-time-range-input-w:not(:first-child) {
-					top: 5px;
+                    &:not(:first-child) {
-					display: block;
+                        margin-top: $interiorMargin;
-					height: 25px;
+                    }
-					margin: 0;
+                    margin-right: 0;
-					line-height: 25px;
+                }
-					position: absolute;
+                .l-time-range-inputs-elem {
+                    &.lbl { display: none; }
                 }
             }
         }
     }
 }
 
-
+@include phonePortrait {
-@include tablet {
     .l-time-controller {
-		height: 17px;
-
         .l-time-range-inputs-holder {
-			bottom: -7px;
+            .t-inputs-w {
-			left: -5px;
+                @include flex(1 1 auto);
-		}
+                padding-top: 25px; // Make room for the ever lovin' Time Domain Selector
-
+                .flex-elem {
-		.l-time-domain-selector {
+                    @include flex(1 1 auto);
-			width: 23%;
+                    width: 100%;
-			right: -4px;
+                }
-			bottom: -10px;
+                input[type="text"] {
-		}
-
-		.l-time-range-inputs-holder {
-			.l-time-range-input {
-				float: left;
-				.s-btn {
                     width: 100%;
-					padding-left: 4px;
                 }
             }
         }
     }
-}
-
-@include tabletLandscape {
-	.l-time-controller {
-		height: 17px;
-
-		.l-time-range-inputs-holder {
-			bottom: -7px;
-		}
-
     .l-time-domain-selector {
-			width: 23%;
         right: auto;
-			bottom: -10px;
+        left: 20px;
-			left: 391px;
-		}
-
-		.l-time-range-inputs-holder {
-			.l-time-range-inputs-elem {
-				&.ui-symbol, &.lbl {
-					display: block;
-					float: left;
-					line-height: 25px;
-				}
-			}
-		}
-	}
-
-	.pane-tree-hidden .l-time-controller {
-		.l-time-domain-selector {
-			left: 667px;
-		}
-		.l-time-range-inputs-holder {
-			padding-left: 277px;
-		}
-	}
-}
-@include tabletPortrait {
-	.l-time-controller {
-		height: 17px;
-
-		.l-time-range-inputs-holder {
-			bottom: -7px;
-			left: -5px;
-		}
-
-		.l-time-domain-selector {
-			width: 23%;
-			right: -4px;
-			bottom: -10px;
-		}
-
-		.l-time-range-inputs-holder {
-			.l-time-range-input {
-				width: 38%;
-				float: left;
-			}
-			.l-time-range-inputs-elem {
-				&.ui-symbol, &.lbl {
-					display: none;
-				}
-			}
-		}
     }
 }

platform/commonUI/general/res/sass/user-environ/_layout.scss

@@ -194,7 +194,7 @@ body.desktop .pane .mini-tab-icon.toggle-pane {
     .holder.holder-treeview-elements {
         top: $bodyMargin;
         right: 0;
-        bottom: $bodyMargin;
+        bottom: $interiorMargin;
         left: $bodyMargin;
         .create-btn-holder {
             &.s-status-editing {
@@ -215,17 +215,17 @@ body.desktop .pane .mini-tab-icon.toggle-pane {
         left: 0;
         .holder-object {
             top: $bodyMargin;
-            bottom: $bodyMargin;
+            bottom: $interiorMargin;
         }
         .holder-inspector {
             top: $bodyMargin;
-            bottom: $bodyMargin;
+            bottom: $interiorMargin;
             left: $bodyMargin;
             right: $bodyMargin;
         }
         .holder-elements {
             top: 0;
-            bottom: $bodyMargin;
+            bottom: $interiorMargin;
             left: $bodyMargin;
             right: $bodyMargin;
         }

platform/commonUI/general/res/templates/controls/datetime-field.html

@@ -19,18 +19,17 @@
  this source code distribution or the Licensing information page available
  at runtime from the About dialog for additional information.
 -->
-<span class="s-btn"
+<span ng-controller="DateTimeFieldController">
-      ng-controller="DateTimeFieldController">
     <input type="text"
            ng-model="textValue"
            ng-blur="restoreTextValue(); ngBlur()"
            ng-class="{
                         error: textInvalid ||
                             (structure.validate &&
-                                !structure.validate(ngModel[field]))
+                                !structure.validate(ngModel[field])),
+                        'picker-icon': structure.format === 'utc' || !structure.format
                      }">
-    </input>
+    </input><a class="ui-symbol icon icon-calendar"
-    <a class="ui-symbol icon icon-calendar"
        ng-if="structure.format === 'utc' || !structure.format"
        ng-click="picker.active = !picker.active">
     </a>
@@ -38,8 +37,7 @@
         <div mct-click-elsewhere="picker.active = false">
             <mct-control key="'datetime-picker'"
                          ng-model="pickerModel"
-                         field="'value'"
+                         field="'value'">
-                         options="{ hours: true }">
             </mct-control>
         </div>
     </mct-popup>

platform/commonUI/general/res/templates/controls/time-controller.html

@@ -19,11 +19,12 @@
  this source code distribution or the Licensing information page available
  at runtime from the About dialog for additional information.
 -->
-<div ng-controller="TimeRangeController as trCtrl">
+<div ng-controller="TimeRangeController as trCtrl" class="l-flex-col">
-    <form class="l-time-range-inputs-holder"
+    <form class="l-time-range-inputs-holder l-flex-row flex-elem"
           ng-submit="trCtrl.updateBoundsFromForm()">
-        <span class="l-time-range-inputs-elem ui-symbol type-icon">&#x43;</span>
+        <span class="l-time-range-inputs-elem ui-symbol type-icon flex-elem">&#x43;</span>
-        <span class="l-time-range-input">
+        <span class="l-time-range-inputs-elem t-inputs-w l-flex-row flex-elem">
+            <span class="l-time-range-input-w flex-elem">
                 <mct-control key="'datetime-field'"
                              structure="{
                                  format: parameters.format,
@@ -36,9 +37,9 @@
                 </mct-control>
             </span>
 
-        <span class="l-time-range-inputs-elem lbl">to</span>
+            <span class="l-time-range-inputs-elem lbl flex-elem">to</span>
 
-        <span class="l-time-range-input" ng-controller="ToggleController as t2">
+            <span class="l-time-range-input-w flex-elem" ng-controller="ToggleController as t2">
                 <mct-control key="'datetime-field'"
                              structure="{
                                  format: parameters.format,
@@ -48,13 +49,13 @@
                              ng-blur="trCtrl.updateBoundsFromForm()"
                              field="'end'"
                              class="time-range-end">
-            </mct-control>&nbsp;
+                </mct-control>
+            </span>
         </span>
-
         <input type="submit" class="hidden">
     </form>
 
-    <div class="l-time-range-slider-holder">
+    <div class="l-time-range-slider-holder flex-elem">
         <div class="l-time-range-slider">
             <div class="slider"
                  mct-resize="spanWidth = bounds.width">
@@ -85,7 +86,7 @@
         </div>
     </div>
 
-    <div class="l-time-range-ticks-holder">
+    <div class="l-time-range-ticks-holder flex-elem">
         <div class="l-time-range-ticks">
             <div
                 ng-repeat="tick in ticks track by $index"

platform/commonUI/general/src/controllers/BannerController.js

@@ -40,7 +40,7 @@ define(
         function BannerController($scope, notificationService, dialogService) {
             $scope.active = notificationService.active;
 
-            $scope.action = function (action, $event){
+            $scope.action = function (action, $event) {
                 /*
                  Prevents default 'maximize' behaviour when clicking on
                   notification button
@@ -48,19 +48,19 @@ define(
                 $event.stopPropagation();
                 return action();
             };
-            $scope.dismiss = function(notification, $event) {
+            $scope.dismiss = function (notification, $event) {
                 $event.stopPropagation();
                 notification.dismissOrMinimize();
             };
-            $scope.maximize = function(notification) {
+            $scope.maximize = function (notification) {
-                if (notification.model.severity !== "info"){
+                if (notification.model.severity !== "info") {
 
-                    notification.model.cancel = function(){
+                    notification.model.cancel = function () {
                         dialogService.dismiss();
                     };
                     //If the notification is dismissed by the user, close
                     // the dialog.
-                    notification.onDismiss(function(){
+                    notification.onDismiss(function () {
                         dialogService.dismiss();
                     });
 

platform/commonUI/general/src/controllers/ClickAwayController.js

@@ -65,7 +65,7 @@ define(
          * Get the current state of the toggle.
          * @return {boolean} true if active
          */
-        ClickAwayController.prototype.isActive =function () {
+        ClickAwayController.prototype.isActive = function () {
             return this.state;
         };
 

platform/commonUI/general/src/controllers/DateTimePickerController.js

@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 define(
-    [ 'moment' ],
+    ['moment'],
     function (moment) {
 
         var TIME_NAMES = {

platform/commonUI/general/src/controllers/SelectorController.js

@@ -69,7 +69,9 @@ define(
             function updateList(ids) {
                 function updateSelectedObjects(objects) {
                     // Look up from the
-                    function getObject(id) { return objects[id]; }
+                    function getObject(id) {
+                        return objects[id];
+                    }
                     self.selectedObjects =
                         ids.filter(getObject).map(getObject);
                 }

platform/commonUI/general/src/directives/MCTDrag.js

@@ -76,7 +76,7 @@ define(
                 // based on a new mouse event object.
                 function updatePosition(event) {
                     // Get the current position, as an array
-                    var currentPosition = [ event.pageX, event.pageY ];
+                    var currentPosition = [event.pageX, event.pageY];
 
                     // Track the initial position, if one hasn't been observed
                     initialPosition = initialPosition || currentPosition;

platform/commonUI/general/src/directives/MCTPopup.js

@@ -46,13 +46,10 @@ define(
             function link(scope, element, attrs, ctrl, transclude) {
                 var div = $compile(TEMPLATE)(scope),
                     rect = element.parent()[0].getBoundingClientRect(),
-                    position = [ rect.left, rect.top ],
+                    position = [rect.left, rect.top],
                     popup = popupService.display(div, position);
 
-                // TODO: Handle in CSS;
+                div.addClass('t-popup');
-                //       https://github.com/nasa/openmctweb/issues/298
-                div.css('z-index', 75);
-
                 transclude(function (clone) {
                     div.append(clone);
                 });

platform/commonUI/general/src/directives/MCTSplitter.js

@@ -59,7 +59,7 @@ define(
                     },
                     // Grab the event when the user is done moving
                     // the splitter and pass it on
-                    endMove: function() {
+                    endMove: function () {
                         mctSplitPane.toggleClass('resizing');
                     }
                 };

platform/commonUI/general/src/services/PopupService.js

@@ -78,7 +78,7 @@ define(
             var $document = this.$document,
                 $window = this.$window,
                 body = $document.find('body'),
-                winDim = [ $window.innerWidth, $window.innerHeight ],
+                winDim = [$window.innerWidth, $window.innerHeight],
                 styles = { position: 'absolute' },
                 margin,
                 offset;
@@ -93,7 +93,7 @@ define(
                 options.offsetX !== undefined ? options.offsetX : 0,
                 options.offsetY !== undefined ? options.offsetY : 0
             ];
-            margin = [ options.marginX, options.marginY ].map(function (m, i) {
+            margin = [options.marginX, options.marginY].map(function (m, i) {
                 return m === undefined ? (winDim[i] / 2) : m;
             }).map(adjustNegatives);