+ } : {}">
diff --git a/platform/features/timeline/src/controllers/TimelineController.js b/platform/features/timeline/src/controllers/TimelineController.js
index 8667bfec5f..a31fffa1c7 100644
--- a/platform/features/timeline/src/controllers/TimelineController.js
+++ b/platform/features/timeline/src/controllers/TimelineController.js
@@ -98,7 +98,7 @@ define(
});
}
}
-
+
// Recalculate swimlane state on changes
$scope.$watch("domainObject", swimlanePopulator.populate);
@@ -108,6 +108,9 @@ define(
// Carry over changes in swimlane set to changes in graphs
$scope.$watch(graphMask, repopulateGraphs);
+ // Pass selection object into swimlane populator
+ $scope.$watch("selection", swimlanePopulator.selection);
+
// Convey current selection to drag handle populator
$scope.$watch("selection.get()", dragPopulator.select);
diff --git a/platform/features/timeline/src/controllers/swimlane/TimelineSwimlanePopulator.js b/platform/features/timeline/src/controllers/swimlane/TimelineSwimlanePopulator.js
index a15d97196f..0875c87d5a 100644
--- a/platform/features/timeline/src/controllers/swimlane/TimelineSwimlanePopulator.js
+++ b/platform/features/timeline/src/controllers/swimlane/TimelineSwimlanePopulator.js
@@ -46,7 +46,8 @@ define(
start = Number.POSITIVE_INFINITY,
end = Number.NEGATIVE_INFINITY,
colors = (configuration.colors || {}),
- assigner = new TimelineColorAssigner(colors);
+ assigner = new TimelineColorAssigner(colors),
+ lastDomainObject;
// Track extremes of start/end times
function trackStartEnd(timespan) {
@@ -144,12 +145,25 @@ define(
domainObject && new TimelineProxy(domainObject, selection)
);
}
+
+ lastDomainObject = domainObject;
+ }
+
+ function setSelectionObject(s) {
+ selection = s;
+ recalculateSwimlanes(lastDomainObject);
}
// Ensure colors are exposed in configuration
configuration.colors = colors;
return {
+ /**
+ * Set the selection object associated with this timeline view.
+ * @param {Object} selection the selection object
+ */
+ selection: setSelectionObject,
+
/**
* Update list of swimlanes to match those reachable from this
* object.
diff --git a/platform/features/timeline/test/controllers/swimlane/TimelineSwimlanePopulatorSpec.js b/platform/features/timeline/test/controllers/swimlane/TimelineSwimlanePopulatorSpec.js
index 02b2010def..895ae34a79 100644
--- a/platform/features/timeline/test/controllers/swimlane/TimelineSwimlanePopulatorSpec.js
+++ b/platform/features/timeline/test/controllers/swimlane/TimelineSwimlanePopulatorSpec.js
@@ -150,6 +150,15 @@ define(
expect(mockSelection.proxy).toHaveBeenCalled();
});
+ it("allows selection object to be changed", function () {
+ var mockNewSelectionObject = jasmine.createSpyObj(
+ 'new-selection',
+ ['get', 'select', 'proxy']
+ );
+ populator.selection(mockNewSelectionObject);
+ expect(mockNewSelectionObject.proxy)
+ .toHaveBeenCalled();
+ });
});
}
diff --git a/platform/forms/bundle.js b/platform/forms/bundle.js
index 43c76d18ae..19ebf4d9b5 100644
--- a/platform/forms/bundle.js
+++ b/platform/forms/bundle.js
@@ -29,6 +29,15 @@ define([
"./src/controllers/CompositeController",
"./src/controllers/ColorController",
"./src/controllers/DialogButtonController",
+ "text!./res/templates/controls/checkbox.html",
+ "text!./res/templates/controls/datetime.html",
+ "text!./res/templates/controls/select.html",
+ "text!./res/templates/controls/textfield.html",
+ "text!./res/templates/controls/button.html",
+ "text!./res/templates/controls/color.html",
+ "text!./res/templates/controls/composite.html",
+ "text!./res/templates/controls/menu-button.html",
+ "text!./res/templates/controls/dialog.html",
'legacyRegistry'
], function (
MCTForm,
@@ -38,6 +47,15 @@ define([
CompositeController,
ColorController,
DialogButtonController,
+ checkboxTemplate,
+ datetimeTemplate,
+ selectTemplate,
+ textfieldTemplate,
+ buttonTemplate,
+ colorTemplate,
+ compositeTemplate,
+ menuButtonTemplate,
+ dialogTemplate,
legacyRegistry
) {
"use strict";
@@ -59,6 +77,7 @@ define([
"key": "mctControl",
"implementation": MCTControl,
"depends": [
+ "templateLinker",
"controls[]"
]
}
@@ -66,39 +85,39 @@ define([
"controls": [
{
"key": "checkbox",
- "templateUrl": "templates/controls/checkbox.html"
+ "template": checkboxTemplate
},
{
"key": "datetime",
- "templateUrl": "templates/controls/datetime.html"
+ "template": datetimeTemplate
},
{
"key": "select",
- "templateUrl": "templates/controls/select.html"
+ "template": selectTemplate
},
{
"key": "textfield",
- "templateUrl": "templates/controls/textfield.html"
+ "template": textfieldTemplate
},
{
"key": "button",
- "templateUrl": "templates/controls/button.html"
+ "template": buttonTemplate
},
{
"key": "color",
- "templateUrl": "templates/controls/color.html"
+ "template": colorTemplate
},
{
"key": "composite",
- "templateUrl": "templates/controls/composite.html"
+ "template": compositeTemplate
},
{
"key": "menu-button",
- "templateUrl": "templates/controls/menu-button.html"
+ "template": menuButtonTemplate
},
{
"key": "dialog-button",
- "templateUrl": "templates/controls/dialog.html"
+ "template": dialogTemplate
}
],
"controllers": [
diff --git a/platform/forms/src/MCTControl.js b/platform/forms/src/MCTControl.js
index 78ac8c194d..09192a09ee 100644
--- a/platform/forms/src/MCTControl.js
+++ b/platform/forms/src/MCTControl.js
@@ -36,23 +36,18 @@ define(
* @constructor
* @memberof platform/forms
*/
- function MCTControl(controls) {
+ function MCTControl(templateLinker, controls) {
var controlMap = {};
// Prepopulate controlMap for easy look up by key
controls.forEach(function (control) {
- var path = [
- control.bundle.path,
- control.bundle.resources,
- control.templateUrl
- ].join("/");
- controlMap[control.key] = path;
+ controlMap[control.key] = control;
});
function link(scope, element, attrs, ngModelController) {
+ var changeTemplate = templateLinker.link(scope, element);
scope.$watch("key", function (key) {
- // Pass the template URL to ng-include via scope.
- scope.inclusion = controlMap[key];
+ changeTemplate(controlMap[key]);
});
scope.ngModelController = ngModelController;
}
@@ -61,10 +56,6 @@ define(
// Only show at the element level
restrict: "E",
- // Use ng-include as a template; "inclusion" will be the real
- // template path
- template: '',
-
// ngOptions is terminal, so we need to be higher priority
priority: 1000,
diff --git a/platform/forms/src/MCTForm.js b/platform/forms/src/MCTForm.js
index ce48ed1572..70c18cbf2f 100644
--- a/platform/forms/src/MCTForm.js
+++ b/platform/forms/src/MCTForm.js
@@ -27,8 +27,8 @@
* @namespace platform/forms
*/
define(
- ["./controllers/FormController"],
- function (FormController) {
+ ["./controllers/FormController", "text!../res/templates/form.html"],
+ function (FormController, formTemplate) {
"use strict";
/**
@@ -52,18 +52,12 @@ define(
* @constructor
*/
function MCTForm() {
- var templatePath = [
- "platform/forms", //MCTForm.bundle.path,
- "res", //MCTForm.bundle.resources,
- "templates/form.html"
- ].join("/");
-
return {
// Only show at the element level
restrict: "E",
// Load the forms template
- templateUrl: templatePath,
+ template: formTemplate,
// Use FormController to populate/respond to changes in scope
controller: [ '$scope', FormController ],
diff --git a/platform/forms/src/MCTToolbar.js b/platform/forms/src/MCTToolbar.js
index 0a31efc4fd..42c93c4842 100644
--- a/platform/forms/src/MCTToolbar.js
+++ b/platform/forms/src/MCTToolbar.js
@@ -25,8 +25,8 @@
* Module defining MCTForm. Created by vwoeltje on 11/10/14.
*/
define(
- ["./controllers/FormController"],
- function (FormController) {
+ ["./MCTForm", "text!../res/templates/toolbar.html"],
+ function (MCTForm, toolbarTemplate) {
"use strict";
/**
@@ -49,38 +49,14 @@ define(
* @memberof platform/forms
* @constructor
*/
- function MCTForm() {
- var templatePath = [
- "platform/forms", //MCTForm.bundle.path,
- "res", //MCTForm.bundle.resources,
- "templates/toolbar.html"
- ].join("/");
-
- return {
- // Only show at the element level
- restrict: "E",
-
- // Load the forms template
- templateUrl: templatePath,
-
- // Use FormController to populate/respond to changes in scope
- controller: [ '$scope', FormController ],
-
- // Initial an isolate scope
- scope: {
-
- // The model: Where form input will actually go
- ngModel: "=",
-
- // Form structure; what sections/rows to show
- structure: "=",
-
- // Name under which to publish the form
- name: "@"
- }
- };
+ function MCTToolbar() {
+ // Use Directive Definition Object from mct-form,
+ // but use the toolbar's template instead.
+ var ddo = new MCTForm();
+ ddo.template = toolbarTemplate;
+ return ddo;
}
- return MCTForm;
+ return MCTToolbar;
}
);
diff --git a/platform/forms/test/MCTControlSpec.js b/platform/forms/test/MCTControlSpec.js
index a743fd8e31..4f4b2cbd6f 100644
--- a/platform/forms/test/MCTControlSpec.js
+++ b/platform/forms/test/MCTControlSpec.js
@@ -29,6 +29,8 @@ define(
describe("The mct-control directive", function () {
var testControls,
mockScope,
+ mockLinker,
+ mockChangeTemplate,
mctControl;
beforeEach(function () {
@@ -46,8 +48,11 @@ define(
];
mockScope = jasmine.createSpyObj("$scope", [ "$watch" ]);
+ mockLinker = jasmine.createSpyObj("templateLinker", ["link"]);
+ mockChangeTemplate = jasmine.createSpy('changeTemplate');
+ mockLinker.link.andReturn(mockChangeTemplate);
- mctControl = new MCTControl(testControls);
+ mctControl = new MCTControl(mockLinker, testControls);
});
it("is restricted to the element level", function () {
@@ -66,14 +71,16 @@ define(
it("changes its template dynamically", function () {
mctControl.link(mockScope);
+ expect(mockChangeTemplate)
+ .not.toHaveBeenCalledWith(testControls[1]);
+
mockScope.key = "xyz";
mockScope.$watch.mostRecentCall.args[1]("xyz");
// Should have communicated the template path to
// ng-include via the "inclusion" field in scope
- expect(mockScope.inclusion).toEqual(
- "x/y/z/template.html"
- );
+ expect(mockChangeTemplate)
+ .toHaveBeenCalledWith(testControls[1]);
});
});
diff --git a/platform/persistence/queue/bundle.js b/platform/persistence/queue/bundle.js
index 473e91a06d..00df156b0a 100644
--- a/platform/persistence/queue/bundle.js
+++ b/platform/persistence/queue/bundle.js
@@ -25,11 +25,13 @@ define([
"./src/QueuingPersistenceCapabilityDecorator",
"./src/PersistenceQueue",
"./src/PersistenceFailureController",
+ "text!./res/templates/persistence-failure-dialog.html",
'legacyRegistry'
], function (
QueuingPersistenceCapabilityDecorator,
PersistenceQueue,
PersistenceFailureController,
+ persistenceFailureDialogTemplate,
legacyRegistry
) {
"use strict";
@@ -67,7 +69,7 @@ define([
"templates": [
{
"key": "persistence-failure-dialog",
- "templateUrl": "templates/persistence-failure-dialog.html"
+ "template": persistenceFailureDialogTemplate
}
],
"controllers": [
diff --git a/platform/search/bundle.js b/platform/search/bundle.js
index 3ad0c8b77f..7a0a9f4b9e 100644
--- a/platform/search/bundle.js
+++ b/platform/search/bundle.js
@@ -27,6 +27,9 @@ define([
"./src/controllers/ClickAwayController",
"./src/services/GenericSearchProvider",
"./src/services/SearchAggregator",
+ "text!./res/templates/search-item.html",
+ "text!./res/templates/search.html",
+ "text!./res/templates/search-menu.html",
'legacyRegistry'
], function (
SearchController,
@@ -34,6 +37,9 @@ define([
ClickAwayController,
GenericSearchProvider,
SearchAggregator,
+ searchItemTemplate,
+ searchTemplate,
+ searchMenuTemplate,
legacyRegistry
) {
"use strict";
@@ -80,17 +86,17 @@ define([
"representations": [
{
"key": "search-item",
- "templateUrl": "templates/search-item.html"
+ "template": searchItemTemplate
}
],
"templates": [
{
"key": "search",
- "templateUrl": "templates/search.html"
+ "template": searchTemplate
},
{
"key": "search-menu",
- "templateUrl": "templates/search-menu.html"
+ "template": searchMenuTemplate
}
],
"components": [
diff --git a/scripts/migrate-templates.js b/scripts/migrate-templates.js
new file mode 100644
index 0000000000..4ada0c0ea3
--- /dev/null
+++ b/scripts/migrate-templates.js
@@ -0,0 +1,106 @@
+/*****************************************************************************
+ * 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.
+ *****************************************************************************/
+
+// Converts all templateUrl references in bundle.js files to
+// plain template references, loading said templates with the
+// RequireJS text plugin.
+
+var glob = require('glob'),
+ fs = require('fs'),
+ path = require('path'),
+ _ = require('lodash');
+
+function toTemplateName(templateUrl) {
+ var parts = templateUrl.split('/');
+ return _.camelCase(parts[parts.length - 1].replace(".html", "")) +
+ "Template";
+}
+
+function getTemplateUrl(sourceLine) {
+ return _.trim(sourceLine.split(":")[1], "\", ");
+}
+
+function hasTemplateUrl(sourceLine) {
+ return sourceLine.indexOf("templateUrl") !== -1;
+}
+
+function findTemplateURLs(sourceCode) {
+ return sourceCode.split('\n')
+ .map(_.trim)
+ .filter(hasTemplateUrl)
+ .map(getTemplateUrl);
+}
+
+function injectRequireArgument(sourceCode, templateUrls) {
+ var lines = sourceCode.split('\n'),
+ index;
+
+ templateUrls = _.uniq(templateUrls);
+
+ // Add arguments for source paths...
+ index = lines.map(_.trim).indexOf("'legacyRegistry'");
+ lines = lines.slice(0, index).concat(templateUrls.map(function (url) {
+ return " \"text!./res/" + url + "\",";
+ }).concat(lines.slice(index)));
+
+ /// ...and for arguments
+ index = lines.map(_.trim).indexOf("legacyRegistry");
+ lines = lines.slice(0, index).concat(templateUrls.map(function (url) {
+ return " " + toTemplateName(url) + ",";
+ }).concat(lines.slice(index)));
+
+ return lines.join('\n');
+}
+
+function rewriteUrl(sourceLine) {
+ return [
+ sourceLine.substring(0, sourceLine.indexOf(sourceLine.trim())),
+ "\"template\": " + toTemplateName(getTemplateUrl(sourceLine)),
+ _.endsWith(sourceLine, ",") ? "," : ""
+ ].join('');
+}
+
+function rewriteLine(sourceLine) {
+ return hasTemplateUrl(sourceLine) ?
+ rewriteUrl(sourceLine.replace("templateUrl", "template")) :
+ sourceLine;
+}
+
+function rewriteTemplateUrls(sourceCode) {
+ return sourceCode.split('\n').map(rewriteLine).join('\n');
+}
+
+function migrate(file) {
+ var sourceCode = fs.readFileSync(file, 'utf8');
+ fs.writeFileSync(file, rewriteTemplateUrls(
+ injectRequireArgument(sourceCode, findTemplateURLs(sourceCode))
+ ), 'utf8');
+}
+
+glob('platform/**/bundle.js', {}, function (err, files) {
+ if (err) {
+ console.log(err);
+ return;
+ }
+
+ files.forEach(migrate);
+});