diff --git a/bundles.json b/bundles.json index 0486bdf24b..6e28332374 100644 --- a/bundles.json +++ b/bundles.json @@ -9,6 +9,7 @@ "platform/commonUI/general", "platform/commonUI/inspect", "platform/containment", + "platform/execution", "platform/telemetry", "platform/features/layout", "platform/features/pages", diff --git a/example/worker/README.md b/example/worker/README.md new file mode 100644 index 0000000000..811539ddeb --- /dev/null +++ b/example/worker/README.md @@ -0,0 +1 @@ +Example of running a Web Worker using the `workerService`. diff --git a/example/worker/bundle.json b/example/worker/bundle.json new file mode 100644 index 0000000000..2241aca2a6 --- /dev/null +++ b/example/worker/bundle.json @@ -0,0 +1,16 @@ +{ + "extensions": { + "indicators": [ + { + "implementation": "FibonacciIndicator.js", + "depends": [ "workerService", "$rootScope" ] + } + ], + "workers": [ + { + "key": "example.fibonacci", + "scriptUrl": "FibonacciWorker.js" + } + ] + } +} diff --git a/example/worker/src/FibonacciIndicator.js b/example/worker/src/FibonacciIndicator.js new file mode 100644 index 0000000000..77a55bc531 --- /dev/null +++ b/example/worker/src/FibonacciIndicator.js @@ -0,0 +1,70 @@ +/***************************************************************************** + * 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. + *****************************************************************************/ +/*global define*/ + +define( + [], + function () { + "use strict"; + + /** + * Displays Fibonacci numbers in the status area. + * @constructor + */ + function FibonacciIndicator(workerService, $rootScope) { + var latest, + counter = 0, + worker = workerService.run('example.fibonacci'); + + function requestNext() { + worker.postMessage([counter]); + counter += 1; + } + + function handleResponse(event) { + latest = event.data; + $rootScope.$apply(); + requestNext(); + } + + worker.onmessage = handleResponse; + requestNext(); + + return { + getGlyph: function () { + return "?"; + }, + getText: function () { + return latest; + }, + getGlyphClass: function () { + return ""; + }, + getDescription: function () { + return ""; + } + }; + } + + return FibonacciIndicator; + } +); diff --git a/example/worker/src/FibonacciWorker.js b/example/worker/src/FibonacciWorker.js new file mode 100644 index 0000000000..2ad8e7f2af --- /dev/null +++ b/example/worker/src/FibonacciWorker.js @@ -0,0 +1,15 @@ +/*global self*/ +(function () { + "use strict"; + + // Calculate fibonacci numbers inefficiently. + // We can do this because we're on a background thread, and + // won't halt the UI. + function fib(n) { + return n < 2 ? n : (fib(n - 1) + fib(n - 2)); + } + + self.onmessage = function (event) { + self.postMessage(fib(event.data)); + }; +}()); diff --git a/platform/commonUI/browse/bundle.json b/platform/commonUI/browse/bundle.json index 28d96c5ec2..08b8dd08c8 100644 --- a/platform/commonUI/browse/bundle.json +++ b/platform/commonUI/browse/bundle.json @@ -2,19 +2,26 @@ "extensions": { "routes": [ { - "when": "/browse", - "templateUrl": "templates/browse.html" + "when": "/browse/:ids*", + "templateUrl": "templates/browse.html", + "reloadOnSearch": false }, { "when": "", - "templateUrl": "templates/browse.html" + "templateUrl": "templates/browse.html", + "reloadOnSearch": false } ], "controllers": [ { "key": "BrowseController", "implementation": "BrowseController.js", - "depends": [ "$scope", "objectService", "navigationService" ] + "depends": [ "$scope", "$route", "$location", "objectService", "navigationService" ] + }, + { + "key": "BrowseObjectController", + "implementation": "BrowseObjectController.js", + "depends": [ "$scope", "$location", "$route" ] }, { "key": "CreateMenuController", @@ -151,4 +158,4 @@ } ] } -} \ No newline at end of file +} diff --git a/platform/commonUI/browse/res/templates/browse-object.html b/platform/commonUI/browse/res/templates/browse-object.html index d88f32c18b..6730d5a186 100644 --- a/platform/commonUI/browse/res/templates/browse-object.html +++ b/platform/commonUI/browse/res/templates/browse-object.html @@ -19,7 +19,7 @@ this source code distribution or the Licensing information page available at runtime from the About dialog for additional information. --> - +
@@ -44,4 +44,4 @@ mct-object="representation.selected.key && domainObject">
- \ No newline at end of file + diff --git a/platform/commonUI/browse/src/BrowseController.js b/platform/commonUI/browse/src/BrowseController.js index e2c2484e1b..241c39bb47 100644 --- a/platform/commonUI/browse/src/BrowseController.js +++ b/platform/commonUI/browse/src/BrowseController.js @@ -29,7 +29,8 @@ define( function () { "use strict"; - var ROOT_OBJECT = "ROOT"; + var ROOT_ID = "ROOT", + DEFAULT_PATH = "mine"; /** * The BrowseController is used to populate the initial scope in Browse @@ -40,35 +41,98 @@ define( * * @constructor */ - function BrowseController($scope, objectService, navigationService) { + function BrowseController($scope, $route, $location, objectService, navigationService) { + var path = [ROOT_ID].concat( + ($route.current.params.ids || DEFAULT_PATH).split("/") + ); + + function updateRoute(domainObject) { + var context = domainObject && + domainObject.getCapability('context'), + objectPath = context ? context.getPath() : [], + ids = objectPath.map(function (domainObject) { + return domainObject.getId(); + }), + priorRoute = $route.current, + // Act as if params HADN'T changed to avoid page reload + unlisten; + + unlisten = $scope.$on('$locationChangeSuccess', function () { + $route.current = priorRoute; + unlisten(); + }); + + $location.path("/browse/" + ids.slice(1).join("/")); + } + // Callback for updating the in-scope reference to the object // that is currently navigated-to. function setNavigation(domainObject) { $scope.navigatedObject = domainObject; $scope.treeModel.selectedObject = domainObject; navigationService.setNavigation(domainObject); + updateRoute(domainObject); + } + + function navigateTo(domainObject) { + // Check if an object has been navigated-to already... + // If not, or if an ID path has been explicitly set in the URL, + // navigate to the URL-specified object. + if (!navigationService.getNavigation() || $route.current.params.ids) { + // If not, pick a default as the last + // root-level component (usually "mine") + navigationService.setNavigation(domainObject); + $scope.navigatedObject = domainObject; + } else { + // Otherwise, just expose the currently navigated object. + $scope.navigatedObject = navigationService.getNavigation(); + updateRoute($scope.navigatedObject); + } + } + + function findObject(domainObjects, id) { + var i; + for (i = 0; i < domainObjects.length; i += 1) { + if (domainObjects[i].getId() === id) { + return domainObjects[i]; + } + } + } + + // Navigate to the domain object identified by path[index], + // which we expect to find in the composition of the passed + // domain object. + function doNavigate(domainObject, index) { + var composition = domainObject.useCapability("composition"); + if (composition) { + composition.then(function (c) { + var nextObject = findObject(c, path[index]); + if (nextObject) { + if (index + 1 >= path.length) { + navigateTo(nextObject); + } else { + doNavigate(nextObject, index + 1); + } + } else { + // Couldn't find the next element of the path + // so navigate to the last path object we did find + navigateTo(domainObject); + } + }); + } else { + // Similar to above case; this object has no composition, + // so navigate to it instead of subsequent path elements. + navigateTo(domainObject); + } } // Load the root object, put it in the scope. // Also, load its immediate children, and (possibly) // navigate to one of them, so that navigation state has // a useful initial value. - objectService.getObjects([ROOT_OBJECT]).then(function (objects) { - var composition = objects[ROOT_OBJECT].useCapability("composition"); - $scope.domainObject = objects[ROOT_OBJECT]; - if (composition) { - composition.then(function (c) { - // Check if an object has been navigated-to already... - if (!navigationService.getNavigation()) { - // If not, pick a default as the last - // root-level component (usually "mine") - navigationService.setNavigation(c[c.length - 1]); - } else { - // Otherwise, just expose it in the scope - $scope.navigatedObject = navigationService.getNavigation(); - } - }); - } + objectService.getObjects([path[0]]).then(function (objects) { + $scope.domainObject = objects[path[0]]; + doNavigate($scope.domainObject, 1); }); // Provide a model for the tree to modify @@ -91,4 +155,4 @@ define( return BrowseController; } -); \ No newline at end of file +); diff --git a/platform/commonUI/browse/src/BrowseObjectController.js b/platform/commonUI/browse/src/BrowseObjectController.js new file mode 100644 index 0000000000..c511898871 --- /dev/null +++ b/platform/commonUI/browse/src/BrowseObjectController.js @@ -0,0 +1,69 @@ +/***************************************************************************** + * 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. + *****************************************************************************/ +/*global define,Promise*/ + +define( + [], + function () { + "use strict"; + + /** + * Controller for the `browse-object` representation of a domain + * object (the right-hand side of Browse mode.) + * @constructor + */ + function BrowseObjectController($scope, $location, $route) { + function setViewForDomainObject(domainObject) { + var locationViewKey = $location.search().view; + + function selectViewIfMatching(view) { + if (view.key === locationViewKey) { + $scope.representation = $scope.representation || {}; + $scope.representation.selected = view; + } + } + + if (locationViewKey) { + ((domainObject && domainObject.useCapability('view')) || []) + .forEach(selectViewIfMatching); + } + } + + function updateQueryParam(viewKey) { + var unlisten, priorRoute = $route.current; + + if (viewKey) { + $location.search('view', viewKey); + unlisten = $scope.$on('$locationChangeSuccess', function () { + $route.current = priorRoute; + unlisten(); + }); + } + } + + $scope.$watch('domainObject', setViewForDomainObject); + $scope.$watch('representation.selected.key', updateQueryParam); + } + + return BrowseObjectController; + } +); diff --git a/platform/commonUI/browse/test/BrowseControllerSpec.js b/platform/commonUI/browse/test/BrowseControllerSpec.js index e0e885aa85..335e2f94eb 100644 --- a/platform/commonUI/browse/test/BrowseControllerSpec.js +++ b/platform/commonUI/browse/test/BrowseControllerSpec.js @@ -31,10 +31,13 @@ define( describe("The browse controller", function () { var mockScope, + mockRoute, + mockLocation, mockObjectService, mockNavigationService, mockRootObject, mockDomainObject, + mockNextObject, controller; function mockPromise(value) { @@ -50,6 +53,11 @@ define( "$scope", [ "$on", "$watch" ] ); + mockRoute = { current: { params: {} } }; + mockLocation = jasmine.createSpyObj( + "$location", + [ "path" ] + ); mockObjectService = jasmine.createSpyObj( "objectService", [ "getObjects" ] @@ -71,25 +79,38 @@ define( "domainObject", [ "getId", "getCapability", "getModel", "useCapability" ] ); + mockNextObject = jasmine.createSpyObj( + "nextObject", + [ "getId", "getCapability", "getModel", "useCapability" ] + ); mockObjectService.getObjects.andReturn(mockPromise({ ROOT: mockRootObject })); - + mockRootObject.useCapability.andReturn(mockPromise([ + mockDomainObject + ])); + mockDomainObject.useCapability.andReturn(mockPromise([ + mockNextObject + ])); + mockNextObject.useCapability.andReturn(undefined); + mockNextObject.getId.andReturn("next"); + mockDomainObject.getId.andReturn("mine"); controller = new BrowseController( mockScope, + mockRoute, + mockLocation, mockObjectService, mockNavigationService ); }); it("uses composition to set the navigated object, if there is none", function () { - mockRootObject.useCapability.andReturn(mockPromise([ - mockDomainObject - ])); controller = new BrowseController( mockScope, + mockRoute, + mockLocation, mockObjectService, mockNavigationService ); @@ -98,12 +119,11 @@ define( }); it("does not try to override navigation", function () { - // This behavior is needed if object navigation has been - // determined by query string parameters - mockRootObject.useCapability.andReturn(mockPromise([null])); mockNavigationService.getNavigation.andReturn(mockDomainObject); controller = new BrowseController( mockScope, + mockRoute, + mockLocation, mockObjectService, mockNavigationService ); @@ -130,6 +150,76 @@ define( ); }); + it("uses route parameters to choose initially-navigated object", function () { + mockRoute.current.params.ids = "mine/next"; + controller = new BrowseController( + mockScope, + mockRoute, + mockLocation, + mockObjectService, + mockNavigationService + ); + expect(mockScope.navigatedObject).toBe(mockNextObject); + expect(mockNavigationService.setNavigation) + .toHaveBeenCalledWith(mockNextObject); + }); + + it("handles invalid IDs by going as far as possible", function () { + // Idea here is that if we get a bad path of IDs, + // browse controller should traverse down it until + // it hits an invalid ID. + mockRoute.current.params.ids = "mine/junk"; + controller = new BrowseController( + mockScope, + mockRoute, + mockLocation, + mockObjectService, + mockNavigationService + ); + expect(mockScope.navigatedObject).toBe(mockDomainObject); + expect(mockNavigationService.setNavigation) + .toHaveBeenCalledWith(mockDomainObject); + }); + + it("handles compositionless objects by going as far as possible", function () { + // Idea here is that if we get a path which passes + // through an object without a composition, browse controller + // should stop at it since remaining IDs cannot be loaded. + mockRoute.current.params.ids = "mine/next/junk"; + controller = new BrowseController( + mockScope, + mockRoute, + mockLocation, + mockObjectService, + mockNavigationService + ); + expect(mockScope.navigatedObject).toBe(mockNextObject); + expect(mockNavigationService.setNavigation) + .toHaveBeenCalledWith(mockNextObject); + }); + + it("updates the displayed route to reflect current navigation", function () { + var mockContext = jasmine.createSpyObj('context', ['getPath']), + mockUnlisten = jasmine.createSpy('unlisten'); + + mockContext.getPath.andReturn( + [mockRootObject, mockDomainObject, mockNextObject] + ); + mockNextObject.getCapability.andCallFake(function (c) { + return c === 'context' && mockContext; + }); + mockScope.$on.andReturn(mockUnlisten); + // Provide a navigation change + mockNavigationService.addListener.mostRecentCall.args[0]( + mockNextObject + ); + expect(mockLocation.path).toHaveBeenCalledWith("/browse/mine/next"); + + // Exercise the Angular workaround + mockScope.$on.mostRecentCall.args[1](); + expect(mockUnlisten).toHaveBeenCalled(); + }); + }); } -); \ No newline at end of file +); diff --git a/platform/commonUI/browse/test/BrowseObjectControllerSpec.js b/platform/commonUI/browse/test/BrowseObjectControllerSpec.js new file mode 100644 index 0000000000..e498c1dc12 --- /dev/null +++ b/platform/commonUI/browse/test/BrowseObjectControllerSpec.js @@ -0,0 +1,99 @@ +/***************************************************************************** + * 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. + *****************************************************************************/ +/*global define,Promise,describe,it,expect,beforeEach,waitsFor,jasmine*/ + + +define( + ["../src/BrowseObjectController"], + function (BrowseObjectController) { + "use strict"; + + describe("The browse object controller", function () { + var mockScope, + mockLocation, + mockRoute, + mockUnlisten, + controller; + + // Utility function; look for a $watch on scope and fire it + function fireWatch(expr, value) { + mockScope.$watch.calls.forEach(function (call) { + if (call.args[0] === expr) { + call.args[1](value); + } + }); + } + + beforeEach(function () { + mockScope = jasmine.createSpyObj( + "$scope", + [ "$on", "$watch" ] + ); + mockRoute = { current: { params: {} } }; + mockLocation = jasmine.createSpyObj( + "$location", + [ "path", "search" ] + ); + mockUnlisten = jasmine.createSpy("unlisten"); + + mockScope.$on.andReturn(mockUnlisten); + + controller = new BrowseObjectController( + mockScope, + mockLocation, + mockRoute + ); + }); + + it("updates query parameters when selected view changes", function () { + fireWatch("representation.selected.key", "xyz"); + expect(mockLocation.search).toHaveBeenCalledWith('view', "xyz"); + + // Exercise the Angular workaround + mockScope.$on.mostRecentCall.args[1](); + expect(mockUnlisten).toHaveBeenCalled(); + }); + + it("sets the active view from query parameters", function () { + var mockDomainObject = jasmine.createSpyObj( + "domainObject", + ['getId', 'getModel', 'getCapability', 'useCapability'] + ), + testViews = [ + { key: 'abc' }, + { key: 'def', someKey: 'some value' }, + { key: 'xyz' } + ]; + + mockDomainObject.useCapability.andCallFake(function (c) { + return (c === 'view') && testViews; + }); + mockLocation.search.andReturn({ view: 'def' }); + + fireWatch('domainObject', mockDomainObject); + expect(mockScope.representation.selected) + .toEqual(testViews[1]); + }); + + }); + } +); diff --git a/platform/commonUI/browse/test/suite.json b/platform/commonUI/browse/test/suite.json index 21d76dae05..e36f345caa 100644 --- a/platform/commonUI/browse/test/suite.json +++ b/platform/commonUI/browse/test/suite.json @@ -1,5 +1,6 @@ [ "BrowseController", + "BrowseObjectController", "creation/CreateAction", "creation/CreateActionProvider", "creation/CreateMenuController", @@ -10,4 +11,4 @@ "navigation/NavigationService", "windowing/FullscreenAction", "windowing/WindowTitler" -] \ No newline at end of file +] diff --git a/platform/commonUI/general/res/css/theme-espresso.css b/platform/commonUI/general/res/css/theme-espresso.css index 5a8bcac07a..ef43a9da06 100644 --- a/platform/commonUI/general/res/css/theme-espresso.css +++ b/platform/commonUI/general/res/css/theme-espresso.css @@ -84,7 +84,7 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -/* line 5, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 5, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, @@ -105,38 +105,38 @@ time, mark, audio, video { font-size: 100%; vertical-align: baseline; } -/* line 22, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 22, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ html { line-height: 1; } -/* line 24, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 24, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ ol, ul { list-style: none; } -/* line 26, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 26, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ table { border-collapse: collapse; border-spacing: 0; } -/* line 28, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 28, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ caption, th, td { text-align: left; font-weight: normal; vertical-align: middle; } -/* line 30, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 30, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ q, blockquote { quotes: none; } - /* line 103, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ + /* line 103, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ q:before, q:after, blockquote:before, blockquote:after { content: ""; content: none; } -/* line 32, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 32, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ a img { border: none; } -/* line 116, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 116, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary { display: block; } @@ -2732,6 +2732,115 @@ label.checkbox.custom { .l-time-controller .knob.knob-r .range-value { left: 14px; } +/***************************************************************************** + * 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. + *****************************************************************************/ +/* line 26, ../sass/edit/_editor.scss */ +.edit-main .edit-corner, +.edit-main .edit-handle { + position: absolute; + z-index: 2; } +/* line 32, ../sass/edit/_editor.scss */ +.edit-main .edit-corner { + width: 15px; + height: 15px; } + /* line 35, ../sass/edit/_editor.scss */ + .edit-main .edit-corner.edit-resize-nw { + -moz-border-radius-bottomright: 5px; + -webkit-border-bottom-right-radius: 5px; + border-bottom-right-radius: 5px; + cursor: nw-resize; + top: 0; + left: 0; } + /* line 40, ../sass/edit/_editor.scss */ + .edit-main .edit-corner.edit-resize-se { + -moz-border-radius-topleft: 5px; + -webkit-border-top-left-radius: 5px; + border-top-left-radius: 5px; + cursor: se-resize; + bottom: 0; + right: 0; } + /* line 45, ../sass/edit/_editor.scss */ + .edit-main .edit-corner.edit-resize-sw { + -moz-border-radius-topright: 5px; + -webkit-border-top-right-radius: 5px; + border-top-right-radius: 5px; + cursor: sw-resize; + bottom: 0; + left: 0; } +/* line 53, ../sass/edit/_editor.scss */ +.edit-main .edit-handle { + top: 15px; + right: 15px; + bottom: 15px; + left: 15px; } + /* line 55, ../sass/edit/_editor.scss */ + .edit-main .edit-handle.edit-move { + cursor: move; + left: 0; + right: 0; + top: 0; + bottom: 0; + z-index: 1; } + /* line 65, ../sass/edit/_editor.scss */ + .edit-main .edit-handle.edit-resize-n { + top: 0px; + bottom: auto; + height: 15px; + cursor: n-resize; } + /* line 70, ../sass/edit/_editor.scss */ + .edit-main .edit-handle.edit-resize-e { + right: 0px; + left: auto; + width: 15px; + cursor: e-resize; } + /* line 75, ../sass/edit/_editor.scss */ + .edit-main .edit-handle.edit-resize-s { + bottom: 0px; + top: auto; + height: 15px; + cursor: s-resize; } + /* line 80, ../sass/edit/_editor.scss */ + .edit-main .edit-handle.edit-resize-w { + left: 0px; + right: auto; + width: 15px; + cursor: w-resize; } +/* line 89, ../sass/edit/_editor.scss */ +.edit-main .frame.child-frame.panel:hover { + -moz-box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px; + -webkit-box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px; + box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px; + border-color: #0099cc; + z-index: 2; } + /* line 93, ../sass/edit/_editor.scss */ + .edit-main .frame.child-frame.panel:hover .view-switcher { + opacity: 1; } + /* line 96, ../sass/edit/_editor.scss */ + .edit-main .frame.child-frame.panel:hover .edit-corner { + background-color: rgba(0, 153, 204, 0.8); } + /* line 98, ../sass/edit/_editor.scss */ + .edit-main .frame.child-frame.panel:hover .edit-corner:hover { + background-color: #0099cc; } + /* line 1, ../sass/features/_imagery.scss */ .l-image-main-wrapper, .l-image-main, @@ -3986,21 +4095,15 @@ input[type="text"] { left: 5px; } /* line 54, ../sass/user-environ/_frame.scss */ .frame.frame-template .view-switcher { - opacity: 0; } -/* line 58, ../sass/user-environ/_frame.scss */ + opacity: 0; + z-index: 10; } +/* line 59, ../sass/user-environ/_frame.scss */ .frame.frame-template:hover .view-switcher { opacity: 1; } -/* line 66, ../sass/user-environ/_frame.scss */ +/* line 67, ../sass/user-environ/_frame.scss */ .frame .view-switcher .name { display: none; } -/* line 73, ../sass/user-environ/_frame.scss */ -.edit-main .frame.child-frame.panel:hover { - border-color: #0099cc; - -moz-box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px; - -webkit-box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px; - box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px; } - /***************************************************************************** * Open MCT Web, Copyright (c) 2014-2015, United States Government * as represented by the Administrator of the National Aeronautics and Space @@ -4219,51 +4322,55 @@ input[type="text"] { * at runtime from the About dialog for additional information. *****************************************************************************/ /* line 24, ../sass/helpers/_bubbles.scss */ +.bubble-container { + pointer-events: none; } + +/* line 31, ../sass/helpers/_bubbles.scss */ .l-infobubble-wrapper { -moz-box-shadow: rgba(0, 0, 0, 0.4) 0 1px 5px; -webkit-box-shadow: rgba(0, 0, 0, 0.4) 0 1px 5px; box-shadow: rgba(0, 0, 0, 0.4) 0 1px 5px; position: relative; z-index: 50; } - /* line 29, ../sass/helpers/_bubbles.scss */ + /* line 36, ../sass/helpers/_bubbles.scss */ .l-infobubble-wrapper .l-infobubble { display: inline-block; min-width: 100px; max-width: 300px; padding: 5px 10px; } - /* line 34, ../sass/helpers/_bubbles.scss */ + /* line 41, ../sass/helpers/_bubbles.scss */ .l-infobubble-wrapper .l-infobubble:before { content: ""; position: absolute; width: 0; height: 0; } - /* line 40, ../sass/helpers/_bubbles.scss */ + /* line 47, ../sass/helpers/_bubbles.scss */ .l-infobubble-wrapper .l-infobubble table { width: 100%; } - /* line 43, ../sass/helpers/_bubbles.scss */ + /* line 50, ../sass/helpers/_bubbles.scss */ .l-infobubble-wrapper .l-infobubble table tr td { padding: 2px 0; vertical-align: top; } - /* line 50, ../sass/helpers/_bubbles.scss */ + /* line 57, ../sass/helpers/_bubbles.scss */ .l-infobubble-wrapper .l-infobubble table tr td.label { padding-right: 10px; white-space: nowrap; } - /* line 54, ../sass/helpers/_bubbles.scss */ + /* line 61, ../sass/helpers/_bubbles.scss */ .l-infobubble-wrapper .l-infobubble table tr td.value { white-space: nowrap; } - /* line 58, ../sass/helpers/_bubbles.scss */ + /* line 65, ../sass/helpers/_bubbles.scss */ .l-infobubble-wrapper .l-infobubble table tr td.align-wrap { white-space: normal; } - /* line 64, ../sass/helpers/_bubbles.scss */ + /* line 71, ../sass/helpers/_bubbles.scss */ .l-infobubble-wrapper .l-infobubble .title { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; margin-bottom: 5px; } - /* line 71, ../sass/helpers/_bubbles.scss */ + /* line 78, ../sass/helpers/_bubbles.scss */ .l-infobubble-wrapper.arw-left { margin-left: 20px; } - /* line 73, ../sass/helpers/_bubbles.scss */ + /* line 80, ../sass/helpers/_bubbles.scss */ .l-infobubble-wrapper.arw-left .l-infobubble::before { right: 100%; width: 0; @@ -4271,10 +4378,10 @@ input[type="text"] { border-top: 6.66667px solid transparent; border-bottom: 6.66667px solid transparent; border-right: 10px solid #ddd; } - /* line 79, ../sass/helpers/_bubbles.scss */ + /* line 86, ../sass/helpers/_bubbles.scss */ .l-infobubble-wrapper.arw-right { margin-right: 20px; } - /* line 81, ../sass/helpers/_bubbles.scss */ + /* line 88, ../sass/helpers/_bubbles.scss */ .l-infobubble-wrapper.arw-right .l-infobubble::before { left: 100%; width: 0; @@ -4282,16 +4389,16 @@ input[type="text"] { border-top: 6.66667px solid transparent; border-bottom: 6.66667px solid transparent; border-left: 10px solid #ddd; } - /* line 88, ../sass/helpers/_bubbles.scss */ + /* line 95, ../sass/helpers/_bubbles.scss */ .l-infobubble-wrapper.arw-top .l-infobubble::before { top: 20px; } - /* line 94, ../sass/helpers/_bubbles.scss */ + /* line 101, ../sass/helpers/_bubbles.scss */ .l-infobubble-wrapper.arw-btm .l-infobubble::before { bottom: 20px; } - /* line 99, ../sass/helpers/_bubbles.scss */ + /* line 106, ../sass/helpers/_bubbles.scss */ .l-infobubble-wrapper.arw-down { margin-bottom: 10px; } - /* line 101, ../sass/helpers/_bubbles.scss */ + /* line 108, ../sass/helpers/_bubbles.scss */ .l-infobubble-wrapper.arw-down .l-infobubble::before { left: 50%; top: 100%; @@ -4299,21 +4406,21 @@ input[type="text"] { border-left: 5px solid transparent; border-right: 5px solid transparent; border-top: 7.5px solid #ddd; } - /* line 110, ../sass/helpers/_bubbles.scss */ + /* line 117, ../sass/helpers/_bubbles.scss */ .l-infobubble-wrapper .arw { z-index: 2; } - /* line 113, ../sass/helpers/_bubbles.scss */ + /* line 120, ../sass/helpers/_bubbles.scss */ .l-infobubble-wrapper.arw-up .arw.arw-down, .l-infobubble-wrapper.arw-down .arw.arw-up { display: none; } -/* line 120, ../sass/helpers/_bubbles.scss */ +/* line 127, ../sass/helpers/_bubbles.scss */ .l-thumbsbubble-wrapper .arw-up { width: 0; height: 0; border-left: 6.66667px solid transparent; border-right: 6.66667px solid transparent; border-bottom: 10px solid #4d4d4d; } -/* line 123, ../sass/helpers/_bubbles.scss */ +/* line 130, ../sass/helpers/_bubbles.scss */ .l-thumbsbubble-wrapper .arw-down { width: 0; height: 0; @@ -4321,7 +4428,7 @@ input[type="text"] { border-right: 6.66667px solid transparent; border-top: 10px solid #4d4d4d; } -/* line 127, ../sass/helpers/_bubbles.scss */ +/* line 134, ../sass/helpers/_bubbles.scss */ .s-infobubble { -moz-border-radius: 2px; -webkit-border-radius: 2px; @@ -4332,22 +4439,22 @@ input[type="text"] { background: #ddd; color: #666; font-size: 0.8rem; } - /* line 134, ../sass/helpers/_bubbles.scss */ + /* line 141, ../sass/helpers/_bubbles.scss */ .s-infobubble .title { color: #333333; font-weight: bold; } - /* line 139, ../sass/helpers/_bubbles.scss */ + /* line 146, ../sass/helpers/_bubbles.scss */ .s-infobubble tr td { border-top: 1px solid #c4c4c4; font-size: 0.9em; } - /* line 143, ../sass/helpers/_bubbles.scss */ + /* line 150, ../sass/helpers/_bubbles.scss */ .s-infobubble tr:first-child td { border-top: none; } - /* line 147, ../sass/helpers/_bubbles.scss */ + /* line 154, ../sass/helpers/_bubbles.scss */ .s-infobubble .value { color: #333333; } -/* line 152, ../sass/helpers/_bubbles.scss */ +/* line 159, ../sass/helpers/_bubbles.scss */ .s-thumbsbubble { background: #4d4d4d; color: #b3b3b3; } diff --git a/platform/commonUI/general/res/sass/_main.scss b/platform/commonUI/general/res/sass/_main.scss index 010d590669..07fec4ed79 100644 --- a/platform/commonUI/general/res/sass/_main.scss +++ b/platform/commonUI/general/res/sass/_main.scss @@ -46,6 +46,7 @@ @import "controls/lists"; @import "controls/menus"; @import "controls/time-controller"; +@import "edit/editor"; @import "features/imagery"; @import "features/time-display"; @import "forms/mixins"; diff --git a/platform/commonUI/general/res/sass/edit/_editor.scss b/platform/commonUI/general/res/sass/edit/_editor.scss index 01a21c06b3..b4a4920f56 100644 --- a/platform/commonUI/general/res/sass/edit/_editor.scss +++ b/platform/commonUI/general/res/sass/edit/_editor.scss @@ -19,3 +19,86 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ + +.edit-main { + $handleD: 15px; + $cr: 5px; + .edit-corner, + .edit-handle { + position: absolute; + z-index: 2; + } + + .edit-corner { + width: $handleD; + height: $handleD; + &.edit-resize-nw { + @include border-bottom-right-radius($cr); + cursor: nw-resize; + top: 0; left: 0; + } + &.edit-resize-se { + @include border-top-left-radius($cr); + cursor: se-resize; + bottom: 0; right: 0; + } + &.edit-resize-sw { + @include border-top-right-radius($cr); + cursor: sw-resize; + bottom: 0; left: 0; + } + + } + + .edit-handle { + top: $handleD; right: $handleD; bottom: $handleD; left: $handleD; + &.edit-move { + $m: 0; //$handleD; + cursor: move; + left: $m; + right: $m; + top: $m; + bottom: $m; + z-index: 1; + + } + &.edit-resize-n { + top: 0px; bottom: auto; + height: $handleD; + cursor: n-resize; + } + &.edit-resize-e { + right: 0px; left: auto; + width: $handleD; + cursor: e-resize; + } + &.edit-resize-s { + bottom: 0px; top: auto; + height: $handleD; + cursor: s-resize; + } + &.edit-resize-w { + left: 0px; right: auto; + width: $handleD; + cursor: w-resize; + } + } + + + .frame.child-frame.panel { + &:hover { + @include boxShdwLarge(); + border-color: $colorKey; + z-index: 2; + .view-switcher { + opacity: 1; + } + .edit-corner { + background-color: rgba($colorKey, 0.8); + &:hover { + background-color: rgba($colorKey, 1); + } + } + } + } +} \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/helpers/_bubbles.scss b/platform/commonUI/general/res/sass/helpers/_bubbles.scss index e9648523c4..5b174ba6da 100644 --- a/platform/commonUI/general/res/sass/helpers/_bubbles.scss +++ b/platform/commonUI/general/res/sass/helpers/_bubbles.scss @@ -19,6 +19,13 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ + +//************************************************* GENERAL +.bubble-container { + pointer-events: none; +} + + //************************************************* LAYOUT .l-infobubble-wrapper { diff --git a/platform/commonUI/general/res/sass/user-environ/_frame.scss b/platform/commonUI/general/res/sass/user-environ/_frame.scss index caeb3157e4..a371459cc0 100644 --- a/platform/commonUI/general/res/sass/user-environ/_frame.scss +++ b/platform/commonUI/general/res/sass/user-environ/_frame.scss @@ -54,6 +54,7 @@ .view-switcher { //display: none; opacity: 0; + z-index: 10; } &:hover .view-switcher { // Show the view switcher on frame hover @@ -68,10 +69,3 @@ } } } - -.edit-main .frame.child-frame.panel { - &:hover { - border-color: $colorKey; - @include boxShdwLarge(); - } -} diff --git a/platform/commonUI/general/src/controllers/ViewSwitcherController.js b/platform/commonUI/general/src/controllers/ViewSwitcherController.js index a821d1f326..69674013d5 100644 --- a/platform/commonUI/general/src/controllers/ViewSwitcherController.js +++ b/platform/commonUI/general/src/controllers/ViewSwitcherController.js @@ -53,12 +53,14 @@ define( // Get list of views, read from capability function updateOptions(views) { - $timeout(function () { - $scope.ngModel.selected = findMatchingOption( - views || [], - ($scope.ngModel || {}).selected - ); - }, 0); + if (Array.isArray(views)) { + $timeout(function () { + $scope.ngModel.selected = findMatchingOption( + views, + ($scope.ngModel || {}).selected + ); + }, 0); + } } // Update view options when the in-scope results of using the @@ -68,4 +70,4 @@ define( return ViewSwitcherController; } -); \ No newline at end of file +); diff --git a/platform/commonUI/inspect/bundle.json b/platform/commonUI/inspect/bundle.json index 07506d0983..51244b2bf2 100644 --- a/platform/commonUI/inspect/bundle.json +++ b/platform/commonUI/inspect/bundle.json @@ -44,7 +44,7 @@ "constants": [ { "key": "INFO_HOVER_DELAY", - "value": 500 + "value": 2000 } ] } diff --git a/platform/commonUI/inspect/res/info-bubble.html b/platform/commonUI/inspect/res/info-bubble.html index 1deeeade15..82545cb29e 100644 --- a/platform/commonUI/inspect/res/info-bubble.html +++ b/platform/commonUI/inspect/res/info-bubble.html @@ -1,6 +1,8 @@ - + diff --git a/platform/commonUI/inspect/src/InfoConstants.js b/platform/commonUI/inspect/src/InfoConstants.js index 86570911c6..5e43a1b618 100644 --- a/platform/commonUI/inspect/src/InfoConstants.js +++ b/platform/commonUI/inspect/src/InfoConstants.js @@ -23,7 +23,8 @@ define({ BUBBLE_TEMPLATE: "" + + "bubble-layout=\"{{bubbleLayout}}\" " + + "class=\"bubble-container\">" + "" + "" + "", diff --git a/platform/core/bundle.json b/platform/core/bundle.json index 97ee2d262f..245fc3df72 100644 --- a/platform/core/bundle.json +++ b/platform/core/bundle.json @@ -184,6 +184,11 @@ { "key": "now", "implementation": "services/Now.js" + }, + { + "key": "throttle", + "implementation": "services/Throttle.js", + "depends": [ "$timeout" ] } ], "roots": [ diff --git a/platform/core/src/services/Throttle.js b/platform/core/src/services/Throttle.js new file mode 100644 index 0000000000..0c86a403c7 --- /dev/null +++ b/platform/core/src/services/Throttle.js @@ -0,0 +1,63 @@ +/*global define*/ + +define( + [], + function () { + "use strict"; + + /** + * Throttler for function executions, registered as the `throttle` + * service. + * + * Usage: + * + * throttle(fn, delay, [apply]) + * + * Returns a function that, when invoked, will invoke `fn` after + * `delay` milliseconds, only if no other invocations are pending. + * The optional argument `apply` determines whether. + * + * The returned function will itself return a `Promise` which will + * resolve to the returned value of `fn` whenever that is invoked. + * + * @returns {Function} + */ + function Throttle($timeout) { + /** + * Throttle this function. + * @param {Function} fn the function to throttle + * @param {number} [delay] the delay, in milliseconds, before + * executing this function; defaults to 0. + * @param {boolean} apply true if a `$apply` call should be + * invoked after this function executes; defaults to + * `false`. + */ + return function (fn, delay, apply) { + var activeTimeout; + + // Clear active timeout, so that next invocation starts + // a new one. + function clearActiveTimeout() { + activeTimeout = undefined; + } + + // Defaults + delay = delay || 0; + apply = apply || false; + + return function () { + // Start a timeout if needed + if (!activeTimeout) { + activeTimeout = $timeout(fn, delay, apply); + activeTimeout.then(clearActiveTimeout); + } + // Return whichever timeout is active (to get + // a promise for the results of fn) + return activeTimeout; + }; + }; + } + + return Throttle; + } +); diff --git a/platform/core/test/services/ThrottleSpec.js b/platform/core/test/services/ThrottleSpec.js new file mode 100644 index 0000000000..173fad8006 --- /dev/null +++ b/platform/core/test/services/ThrottleSpec.js @@ -0,0 +1,49 @@ +/*global define,Promise,describe,it,expect,beforeEach,waitsFor,jasmine*/ + +define( + ["../../src/services/Throttle"], + function (Throttle) { + "use strict"; + + describe("The 'throttle' service", function () { + var throttle, + mockTimeout, + mockFn, + mockPromise; + + beforeEach(function () { + mockTimeout = jasmine.createSpy("$timeout"); + mockPromise = jasmine.createSpyObj("promise", ["then"]); + mockFn = jasmine.createSpy("fn"); + mockTimeout.andReturn(mockPromise); + throttle = new Throttle(mockTimeout); + }); + + it("provides functions which run on a timeout", function () { + var throttled = throttle(mockFn); + // Verify precondition: Not called at throttle-time + expect(mockTimeout).not.toHaveBeenCalled(); + expect(throttled()).toEqual(mockPromise); + expect(mockTimeout).toHaveBeenCalledWith(mockFn, 0, false); + }); + + it("schedules only one timeout at a time", function () { + var throttled = throttle(mockFn); + throttled(); + throttled(); + throttled(); + expect(mockTimeout.calls.length).toEqual(1); + }); + + it("schedules additional invocations after resolution", function () { + var throttled = throttle(mockFn); + throttled(); + mockPromise.then.mostRecentCall.args[0](); // Resolve timeout + throttled(); + mockPromise.then.mostRecentCall.args[0](); + throttled(); + expect(mockTimeout.calls.length).toEqual(3); + }); + }); + } +); diff --git a/platform/core/test/suite.json b/platform/core/test/suite.json index 26749fa612..9c939acf5e 100644 --- a/platform/core/test/suite.json +++ b/platform/core/test/suite.json @@ -24,6 +24,7 @@ "objects/DomainObjectProvider", "services/Now", + "services/Throttle", "types/MergeModels", "types/TypeCapability", diff --git a/platform/execution/README.md b/platform/execution/README.md new file mode 100644 index 0000000000..2188e5f909 --- /dev/null +++ b/platform/execution/README.md @@ -0,0 +1 @@ +Contains services which manage execution and flow control (e.g. for concurrency.) diff --git a/platform/execution/bundle.json b/platform/execution/bundle.json new file mode 100644 index 0000000000..6e6ea83eee --- /dev/null +++ b/platform/execution/bundle.json @@ -0,0 +1,11 @@ +{ + "extensions": { + "services": [ + { + "key": "workerService", + "implementation": "WorkerService.js", + "depends": [ "$window", "workers[]" ] + } + ] + } +} diff --git a/platform/execution/src/WorkerService.js b/platform/execution/src/WorkerService.js new file mode 100644 index 0000000000..b8f24ee614 --- /dev/null +++ b/platform/execution/src/WorkerService.js @@ -0,0 +1,68 @@ +/***************************************************************************** + * 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. + *****************************************************************************/ +/*global define*/ + +define( + [], + function () { + "use strict"; + + /** + * Handles the execution of WebWorkers. + * @constructor + */ + function WorkerService($window, workers) { + var workerUrls = {}, + Worker = $window.Worker; + + function addWorker(worker) { + var key = worker.key; + if (!workerUrls[key]) { + workerUrls[key] = [ + worker.bundle.path, + worker.bundle.sources, + worker.scriptUrl + ].join("/"); + } + } + + (workers || []).forEach(addWorker); + + return { + /** + * Start running a new web worker. This will run a worker + * that has been registered under the `workers` category + * of extension. + * + * @param {string} key symbolic identifier for the worker + * @returns {Worker} the running Worker + */ + run: function (key) { + var scriptUrl = workerUrls[key]; + return scriptUrl && Worker && new Worker(scriptUrl); + } + }; + } + + return WorkerService; + } +); diff --git a/platform/execution/test/WorkerServiceSpec.js b/platform/execution/test/WorkerServiceSpec.js new file mode 100644 index 0000000000..24abab6e81 --- /dev/null +++ b/platform/execution/test/WorkerServiceSpec.js @@ -0,0 +1,77 @@ +/***************************************************************************** + * 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. + *****************************************************************************/ +/*global define,describe,it,expect,beforeEach,jasmine*/ + +define( + ["../src/WorkerService"], + function (WorkerService) { + "use strict"; + + describe("The worker service", function () { + var mockWindow, + testWorkers, + mockWorker, + service; + + beforeEach(function () { + mockWindow = jasmine.createSpyObj('$window', ['Worker']); + testWorkers = [ + { + key: 'abc', + scriptUrl: 'c.js', + bundle: { path: 'a', sources: 'b' } + }, + { + key: 'xyz', + scriptUrl: 'z.js', + bundle: { path: 'x', sources: 'y' } + }, + { + key: 'xyz', + scriptUrl: 'bad.js', + bundle: { path: 'bad', sources: 'bad' } + } + ]; + mockWorker = {}; + + mockWindow.Worker.andReturn(mockWorker); + + service = new WorkerService(mockWindow, testWorkers); + }); + + it("instantiates workers at registered paths", function () { + expect(service.run('abc')).toBe(mockWorker); + expect(mockWindow.Worker).toHaveBeenCalledWith('a/b/c.js'); + }); + + it("prefers the first worker when multiple keys are found", function () { + expect(service.run('xyz')).toBe(mockWorker); + expect(mockWindow.Worker).toHaveBeenCalledWith('x/y/z.js'); + }); + + it("returns undefined for unknown workers", function () { + expect(service.run('def')).toBeUndefined(); + }); + + }); + } +); diff --git a/platform/execution/test/suite.json b/platform/execution/test/suite.json new file mode 100644 index 0000000000..d14a0714c5 --- /dev/null +++ b/platform/execution/test/suite.json @@ -0,0 +1,3 @@ +[ + "WorkerService" +] diff --git a/platform/features/layout/res/templates/frame.html b/platform/features/layout/res/templates/frame.html index 808603a84a..df4e3390ad 100644 --- a/platform/features/layout/res/templates/frame.html +++ b/platform/features/layout/res/templates/frame.html @@ -35,7 +35,7 @@
+ mct-object="representation.selected.key && domainObject">
\ No newline at end of file diff --git a/platform/features/layout/res/templates/layout.html b/platform/features/layout/res/templates/layout.html index 3a4f78f6e0..0a42ba30fe 100644 --- a/platform/features/layout/res/templates/layout.html +++ b/platform/features/layout/res/templates/layout.html @@ -34,50 +34,62 @@ - - - - - - + --> - - - - + - diff --git a/platform/features/layout/src/LayoutController.js b/platform/features/layout/src/LayoutController.js index 4e9de17618..fc6c8aafba 100644 --- a/platform/features/layout/src/LayoutController.js +++ b/platform/features/layout/src/LayoutController.js @@ -90,6 +90,10 @@ define( function lookupPanels(ids) { var configuration = $scope.configuration || {}; + // ids is read from model.composition and may be undefined; + // fall back to an array if that occurs + ids = ids || []; + // Pull panel positions from configuration rawPositions = shallowCopy(configuration.panels || {}, ids); diff --git a/platform/features/plot/bundle.json b/platform/features/plot/bundle.json index 71479685e1..2a7d6e9c73 100644 --- a/platform/features/plot/bundle.json +++ b/platform/features/plot/bundle.json @@ -23,7 +23,7 @@ { "key": "PlotController", "implementation": "PlotController.js", - "depends": [ "$scope", "telemetryFormatter", "telemetryHandler" ] + "depends": [ "$scope", "telemetryFormatter", "telemetryHandler", "throttle" ] } ] } diff --git a/platform/features/plot/src/PlotController.js b/platform/features/plot/src/PlotController.js index 0f06ddccb4..fcce051968 100644 --- a/platform/features/plot/src/PlotController.js +++ b/platform/features/plot/src/PlotController.js @@ -51,13 +51,14 @@ define( * * @constructor */ - function PlotController($scope, telemetryFormatter, telemetryHandler) { + function PlotController($scope, telemetryFormatter, telemetryHandler, throttle) { var subPlotFactory = new SubPlotFactory(telemetryFormatter), modeOptions = new PlotModeOptions([], subPlotFactory), subplots = [], cachedObjects = [], updater, handle, + scheduleUpdate, domainOffset; // Populate the scope with axis information (specifically, options @@ -89,9 +90,7 @@ define( // Update all sub-plots function update() { - modeOptions.getModeHandler() - .getSubPlots() - .forEach(updateSubplot); + scheduleUpdate(); } // Reinstantiate the plot updater (e.g. because we have a @@ -162,6 +161,12 @@ define( // Unsubscribe when the plot is destroyed $scope.$on("$destroy", releaseSubscription); + + // Create a throttled update function + scheduleUpdate = throttle(function () { + modeOptions.getModeHandler().getSubPlots() + .forEach(updateSubplot); + }); return { /** diff --git a/platform/features/plot/src/modes/PlotOverlayMode.js b/platform/features/plot/src/modes/PlotOverlayMode.js index ec32f2300d..501d4b0e78 100644 --- a/platform/features/plot/src/modes/PlotOverlayMode.js +++ b/platform/features/plot/src/modes/PlotOverlayMode.js @@ -62,8 +62,6 @@ define( points: buf.getLength() }; }); - - subplot.update(); } return { diff --git a/platform/features/plot/src/modes/PlotStackMode.js b/platform/features/plot/src/modes/PlotStackMode.js index 4b6c5cbbb9..5d54b461f1 100644 --- a/platform/features/plot/src/modes/PlotStackMode.js +++ b/platform/features/plot/src/modes/PlotStackMode.js @@ -58,8 +58,6 @@ define( color: PlotPalette.getFloatColor(0), points: buffer.getLength() }]; - - subplot.update(); } function plotTelemetry(prepared) { diff --git a/platform/features/plot/test/PlotControllerSpec.js b/platform/features/plot/test/PlotControllerSpec.js index 1cd4b43331..138071d339 100644 --- a/platform/features/plot/test/PlotControllerSpec.js +++ b/platform/features/plot/test/PlotControllerSpec.js @@ -33,6 +33,7 @@ define( var mockScope, mockFormatter, mockHandler, + mockThrottle, mockHandle, mockDomainObject, mockSeries, @@ -56,6 +57,7 @@ define( "telemetrySubscriber", ["handle"] ); + mockThrottle = jasmine.createSpy("throttle"); mockHandle = jasmine.createSpyObj( "subscription", [ @@ -73,12 +75,18 @@ define( ); mockHandler.handle.andReturn(mockHandle); + mockThrottle.andCallFake(function (fn) { return fn; }); mockHandle.getTelemetryObjects.andReturn([mockDomainObject]); mockHandle.getMetadata.andReturn([{}]); mockHandle.getDomainValue.andReturn(123); mockHandle.getRangeValue.andReturn(42); - controller = new PlotController(mockScope, mockFormatter, mockHandler); + controller = new PlotController( + mockScope, + mockFormatter, + mockHandler, + mockThrottle + ); }); it("provides plot colors", function () { @@ -224,4 +232,4 @@ define( }); }); } -); \ No newline at end of file +); diff --git a/platform/forms/res/templates/controls/datetime.html b/platform/forms/res/templates/controls/datetime.html index 6dae89eb8a..8c61fb9861 100644 --- a/platform/forms/res/templates/controls/datetime.html +++ b/platform/forms/res/templates/controls/datetime.html @@ -35,8 +35,8 @@ @@ -80,4 +80,4 @@ - \ No newline at end of file + diff --git a/platform/forms/src/controllers/DateTimeController.js b/platform/forms/src/controllers/DateTimeController.js index c026e98935..e37e3a8f71 100644 --- a/platform/forms/src/controllers/DateTimeController.js +++ b/platform/forms/src/controllers/DateTimeController.js @@ -26,7 +26,7 @@ define( function () { "use strict"; - var DATE_FORMAT = "YYYY-DDD"; + var DATE_FORMAT = "YYYY-MM-DD"; /** * Controller for the `datetime` form control. @@ -92,6 +92,9 @@ define( $scope.$watch("datetime.min", update); $scope.$watch("datetime.sec", update); + // Expose format string for placeholder + $scope.format = DATE_FORMAT; + // Initialize forms values updateDateTime( ($scope.ngModel && $scope.field) ? @@ -102,4 +105,4 @@ define( return DateTimeController; } -); \ No newline at end of file +); diff --git a/platform/forms/test/controllers/DateTimeControllerSpec.js b/platform/forms/test/controllers/DateTimeControllerSpec.js index 230d6a7a33..d2b0be4e7c 100644 --- a/platform/forms/test/controllers/DateTimeControllerSpec.js +++ b/platform/forms/test/controllers/DateTimeControllerSpec.js @@ -47,7 +47,7 @@ define( it("converts date-time input into a timestamp", function () { mockScope.ngModel = {}; mockScope.field = "test"; - mockScope.datetime.date = "2014-332"; + mockScope.datetime.date = "2014-11-28"; mockScope.datetime.hour = 22; mockScope.datetime.min = 55; mockScope.datetime.sec = 13; @@ -63,7 +63,7 @@ define( // as required. mockScope.ngModel = {}; mockScope.field = "test"; - mockScope.datetime.date = "2014-332"; + mockScope.datetime.date = "2014-11-28"; mockScope.datetime.hour = 22; mockScope.datetime.min = 55; // mockScope.datetime.sec = 13; @@ -85,6 +85,11 @@ define( expect(mockScope.ngModel.test).toBeUndefined(); }); + + it("exposes date-time format for placeholder", function () { + expect(mockScope.format).toEqual(jasmine.any(String)); + expect(mockScope.format.length).toBeGreaterThan(0); + }); it("initializes form fields with values from ng-model", function () { mockScope.ngModel = { test: 1417215313000 }; mockScope.field = "test"; @@ -94,7 +99,7 @@ define( } }); expect(mockScope.datetime).toEqual({ - date: "2014-332", + date: "2014-11-28", hour: "22", min: "55", sec: "13" diff --git a/platform/representation/src/MCTRepresentation.js b/platform/representation/src/MCTRepresentation.js index ac498f9140..97194f12c3 100644 --- a/platform/representation/src/MCTRepresentation.js +++ b/platform/representation/src/MCTRepresentation.js @@ -93,15 +93,18 @@ define( function link($scope, element, attrs) { var activeRepresenters = representers.map(function (Representer) { - return new Representer($scope, element, attrs); - }); + return new Representer($scope, element, attrs); + }), + toClear = [], // Properties to clear out of scope on change + counter = 0; // Populate scope with any capabilities indicated by the // representation's extension definition function refreshCapabilities() { var domainObject = $scope.domainObject, representation = lookup($scope.key, domainObject), - uses = ((representation || {}).uses || []); + uses = ((representation || {}).uses || []), + myCounter = counter; if (domainObject) { // Update model @@ -115,10 +118,16 @@ define( " for representation ", $scope.key ].join("")); + $q.when( domainObject.useCapability(used) ).then(function (c) { - $scope[used] = c; + // Avoid clobbering capabilities from + // subsequent representations; + // Angular reuses scopes. + if (counter === myCounter) { + $scope[used] = c; + } }); }); } @@ -130,8 +139,7 @@ define( function refresh() { var domainObject = $scope.domainObject, representation = lookup($scope.key, domainObject), - uses = ((representation || {}).uses || []), - gestureKeys = ((representation || {}).gestures || []); + uses = ((representation || {}).uses || []); // Create an empty object named "representation", for this // representation to store local variables into. @@ -152,9 +160,19 @@ define( $log.warn("No representation found for " + $scope.key); } + // Clear out the scope from the last representation + toClear.forEach(function (property) { + delete $scope[property]; + }); + // Populate scope with fields associated with the current // domain object (if one has been passed in) if (domainObject) { + // Track how many representations we've made in this scope, + // to ensure that the correct representations are matched to + // the correct object/key pairs. + counter += 1; + // Initialize any capabilities refreshCapabilities(); @@ -168,6 +186,10 @@ define( activeRepresenters.forEach(function (representer) { representer.represent(representation, domainObject); }); + + // Track which properties we want to clear from scope + // next change object/key pair changes + toClear = uses.concat(['model']); } } diff --git a/platform/representation/src/gestures/DropGesture.js b/platform/representation/src/gestures/DropGesture.js index 3ff94ba974..25bee716cf 100644 --- a/platform/representation/src/gestures/DropGesture.js +++ b/platform/representation/src/gestures/DropGesture.js @@ -43,7 +43,7 @@ define( function DropGesture(dndService, $q, element, domainObject) { var actionCapability = domainObject.getCapability('action'), action; // Action for the drop, when it occurs - + function broadcastDrop(id, event) { // Find the relevant scope... var scope = element && element.scope && element.scope(), @@ -92,17 +92,24 @@ define( function drop(e) { var event = (e || {}).originalEvent || e, - id = event.dataTransfer.getData(GestureConstants.MCT_DRAG_TYPE); - - // Handle the drop; add the dropped identifier to the - // destination domain object's composition, and persist - // the change. - if (id) { - $q.when(action && action.perform()).then(function (result) { - broadcastDrop(id, event); - }); + id = event.dataTransfer.getData(GestureConstants.MCT_DRAG_TYPE), + domainObjectType = domainObject.getModel().type; + + // If currently in edit mode allow drag and drop gestures to the + // domain object. An exception to this is folders which have drop + // gestures in browse mode. + if (domainObjectType === 'folder' || domainObject.hasCapability('editor')) { + + // Handle the drop; add the dropped identifier to the + // destination domain object's composition, and persist + // the change. + if (id) { + $q.when(action && action.perform()).then(function (result) { + broadcastDrop(id, event); + }); + } } - + // TODO: Alert user if drag and drop is not allowed } // We can only handle drops if we have access to actions... diff --git a/platform/representation/test/MCTRepresentationSpec.js b/platform/representation/test/MCTRepresentationSpec.js index 01cf01da78..337f214a86 100644 --- a/platform/representation/test/MCTRepresentationSpec.js +++ b/platform/representation/test/MCTRepresentationSpec.js @@ -212,6 +212,25 @@ define( // Should have gotten a warning - that's an unknown key expect(mockLog.warn).toHaveBeenCalled(); }); + + it("clears out obsolete peroperties from scope", function () { + mctRepresentation.link(mockScope, mockElement); + + mockScope.key = "def"; + mockScope.domainObject = mockDomainObject; + mockDomainObject.useCapability.andReturn("some value"); + + // Trigger the watch + mockScope.$watch.calls[0].args[1](); + expect(mockScope.testCapability).toBeDefined(); + + // Change the view + mockScope.key = "xyz"; + + // Trigger the watch again; should clear capability from scope + mockScope.$watch.calls[0].args[1](); + expect(mockScope.testCapability).toBeUndefined(); + }); }); } ); diff --git a/platform/representation/test/gestures/DropGestureSpec.js b/platform/representation/test/gestures/DropGestureSpec.js index 023c37c86f..6481eefa32 100644 --- a/platform/representation/test/gestures/DropGestureSpec.js +++ b/platform/representation/test/gestures/DropGestureSpec.js @@ -131,8 +131,11 @@ define( expect(mockEvent.preventDefault).toHaveBeenCalled(); expect(mockEvent.dataTransfer.dropEffect).toBeDefined(); }); - - it("invokes compose on drop", function () { + + it("invokes compose on drop in edit mode", function () { + // Set the mockDomainObject to have the editor capability + mockDomainObject.hasCapability.andReturn(true); + callbacks.dragover(mockEvent); expect(mockAction.getActions).toHaveBeenCalledWith({ key: 'compose', @@ -141,9 +144,43 @@ define( callbacks.drop(mockEvent); expect(mockCompose.perform).toHaveBeenCalled(); }); + + + it("does not invoke compose on drop in browse mode for non-folders", function () { + // Set the mockDomainObject to not have the editor capability + mockDomainObject.hasCapability.andReturn(false); + // Set the mockDomainObject to not have a type of folder + mockDomainObject.getModel.andReturn({type: 'notAFolder'}); + + callbacks.dragover(mockEvent); + expect(mockAction.getActions).toHaveBeenCalledWith({ + key: 'compose', + selectedObject: mockDraggedObject + }); + callbacks.drop(mockEvent); + expect(mockCompose.perform).not.toHaveBeenCalled(); + }); + + + it("invokes compose on drop in browse mode for folders", function () { + // Set the mockDomainObject to not have the editor capability + mockDomainObject.hasCapability.andReturn(false); + // Set the mockDomainObject to have a type of folder + mockDomainObject.getModel.andReturn({type: 'folder'}); - - it("broadcasts drop position", function () { + callbacks.dragover(mockEvent); + expect(mockAction.getActions).toHaveBeenCalledWith({ + key: 'compose', + selectedObject: mockDraggedObject + }); + callbacks.drop(mockEvent); + expect(mockCompose.perform).toHaveBeenCalled(); + }); + + it("broadcasts drop position (in edit mode)", function () { + // Set the mockDomainObject to have the editor capability + mockDomainObject.hasCapability.andReturn(true); + testRect.left = 42; testRect.top = 36; mockEvent.pageX = 52; diff --git a/platform/telemetry/src/TelemetryQueue.js b/platform/telemetry/src/TelemetryQueue.js index bd463b61be..cf82d08ff8 100644 --- a/platform/telemetry/src/TelemetryQueue.js +++ b/platform/telemetry/src/TelemetryQueue.js @@ -35,28 +35,68 @@ define( * @constructor */ function TelemetryQueue() { - var queue = []; + // General approach here: + // * Maintain a queue as an array of objects containing key-value + // pairs. Putting values into the queue will assign to the + // earliest-available queue position for the associated key + // (appending to the array if necessary.) + // * Maintain a set of counts for each key, such that determining + // the next available queue position is easy; O(1) insertion. + // * When retrieving objects, pop off the queue and decrement + // counts. This provides O(n+k) or O(k) retrieval for a queue + // of length n with k unique keys; this depends on whether + // the browser's implementation of Array.prototype.shift is + // O(n) or O(1). + + // Graphically (indexes at top, keys along side, values as *'s), + // if we have a queue that looks like: + // 0 1 2 3 4 + // a * * * * * + // b * * + // c * * * + // + // And we put a new value for b, we expect: + // 0 1 2 3 4 + // a * * * * * + // b * * * + // c * * * + var queue = [], + counts = {}; // Look up an object in the queue that does not have a value // assigned to this key (or, add a new one) function getFreeObject(key) { - var index = 0, object; + var index = counts[key] || 0, object; - // Look for an existing queue position where we can store - // a value to this key without overwriting an existing value. - for (index = 0; index < queue.length; index += 1) { - if (queue[index][key] === undefined) { - return queue[index]; - } + // Track the largest free position for this key + counts[key] = index + 1; + + // If it's before the end of the queue, add it there + if (index < queue.length) { + return queue[index]; } - // If we made it through the loop, values have been assigned + // Otherwise, values have been assigned // to that key in all queued containers, so we need to queue // up a new container for key-value pairs. object = {}; queue.push(object); return object; } + + // Decrement counts for a specific key + function decrementCount(key) { + if (counts[key] < 2) { + delete counts[key]; + } else { + counts[key] -= 1; + } + } + + // Decrement all counts + function decrementCounts() { + Object.keys(counts).forEach(decrementCount); + } return { /** @@ -74,6 +114,8 @@ define( * @return {object} key-value pairs */ poll: function () { + // Decrement counts for the object that will be popped + decrementCounts(); return queue.shift(); }, /**