Replaced prepublish with postinstall

index.html

@@ -25,16 +25,8 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
     <title></title>
-    <script src="openmct-tutorial/lib/http.js">
-    </script>
     <script src="bower_components/requirejs/require.js">
     </script>
-    <script src="openmct-tutorial/dictionary-plugin.js">
-    </script>
-    <script src="openmct-tutorial/realtime-telemetry-plugin.js">
-    </script>
-    <script src="openmct-tutorial/historical-telemetry-plugin.js">
-    </script>
     <script>
         require(['openmct'], function (openmct) {
             [
@@ -48,9 +40,6 @@
             openmct.install(openmct.plugins.Espresso());
             openmct.install(openmct.plugins.Generator());
             openmct.install(openmct.plugins.UTCTimeSystem());
-            openmct.install(DictionaryPlugin());
-            openmct.install(RealtimeTelemetryPlugin());
-            openmct.install(HistoricalTelemetryPlugin());
             openmct.start();
         });
     </script>

package.json

@@ -5,9 +5,7 @@
   "dependencies": {
     "express": "^4.13.1",
     "minimist": "^1.1.1",
-    "request": "^2.69.0"
-  },
-  "devDependencies": {
+    "request": "^2.69.0",
     "bower": "^1.7.7",
     "git-rev-sync": "^1.4.0",
     "glob": ">= 3.0.0",
@@ -50,7 +48,7 @@
     "jsdoc": "jsdoc -c jsdoc.json -R API.md -r -d dist/docs/api",
     "otherdoc": "node docs/gendocs.js --in docs/src --out dist/docs --suppress-toc 'docs/src/index.md|docs/src/process/index.md'",
     "docs": "npm run jsdoc ; npm run otherdoc",
-    "prepublish": "node ./node_modules/bower/bin/bower install && node ./node_modules/gulp/bin/gulp.js install"
+    "postinstall": "node ./node_modules/bower/bin/bower install && node ./node_modules/gulp/bin/gulp.js install"
   },
   "repository": {
     "type": "git",

platform/commonUI/general/res/sass/startup-base.scss

@@ -19,7 +19,6 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-$output-bourbon-deprecation-warnings: false;
 @import "bourbon";
 @import "logo-and-bg";
 

platform/commonUI/themes/espresso/res/sass/theme-espresso.scss

@@ -19,7 +19,7 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-$output-bourbon-deprecation-warnings: false;
+
 @import "bourbon";
 
 @import "../../../../general/res/sass/_mixins";

platform/commonUI/themes/snow/res/sass/theme-snow.scss

@@ -19,7 +19,7 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-$output-bourbon-deprecation-warnings: false;
+
 @import "bourbon";
 
 @import "../../../../general/res/sass/_mixins";

platform/features/conductor/compatibility/bundle.js

@@ -21,9 +21,11 @@
  *****************************************************************************/
 
 define([
+    "./src/ConductorTelemetryDecorator",
     "./src/ConductorRepresenter",
     'legacyRegistry'
 ], function (
+    ConductorTelemetryDecorator,
     ConductorRepresenter,
     legacyRegistry
 ) {
@@ -37,6 +39,16 @@ define([
                         "openmct"
                     ]
                 }
+            ],
+            "components": [
+                {
+                    "type": "decorator",
+                    "provides": "telemetryService",
+                    "implementation": ConductorTelemetryDecorator,
+                    "depends": [
+                        "openmct"
+                    ]
+                }
             ]
         }
     });

platform/features/conductor/compatibility/src/ConductorTelemetryDecorator.js

@@ -0,0 +1,87 @@
+/*****************************************************************************
+ * 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.
+ *****************************************************************************/
+
+define(
+    function () {
+
+        /**
+         * Decorates the `telemetryService` such that requests are
+         * mediated by the time conductor. This is a modified version of the
+         * decorator used in the old TimeConductor that integrates with the
+         * new TimeConductor API.
+         *
+         * @constructor
+         * @memberof platform/features/conductor
+         * @implements {TelemetryService}
+         * @param {platform/features/conductor.TimeConductor} conductor
+         *        the service which exposes the global time conductor
+         * @param {TelemetryService} telemetryService the decorated service
+         */
+        function ConductorTelemetryDecorator(openmct, telemetryService) {
+            this.conductor = openmct.conductor;
+            this.telemetryService = telemetryService;
+
+            this.amendRequests = ConductorTelemetryDecorator.prototype.amendRequests.bind(this);
+        }
+
+        function amendRequest(request, bounds, timeSystem) {
+            request = request || {};
+            request.start = bounds.start;
+            request.end = bounds.end;
+            request.domain = timeSystem.metadata.key;
+
+            return request;
+        }
+
+        ConductorTelemetryDecorator.prototype.amendRequests = function (requests) {
+            var bounds = this.conductor.bounds(),
+                timeSystem = this.conductor.timeSystem();
+
+            return (requests || []).map(function (request) {
+                return amendRequest(request, bounds, timeSystem);
+            });
+        };
+
+        ConductorTelemetryDecorator.prototype.requestTelemetry = function (requests) {
+            return this.telemetryService
+                .requestTelemetry(this.amendRequests(requests));
+        };
+
+        ConductorTelemetryDecorator.prototype.subscribe = function (callback, requests) {
+            var unsubscribeFunc = this.telemetryService.subscribe(callback, this.amendRequests(requests)),
+                conductor = this.conductor,
+                self = this;
+
+            function amendRequests() {
+                return self.amendRequests(requests);
+            }
+
+            conductor.on('bounds', amendRequests);
+            return function () {
+                unsubscribeFunc();
+                conductor.off('bounds', amendRequests);
+            };
+        };
+
+        return ConductorTelemetryDecorator;
+    }
+);

platform/features/conductor/core/res/sass/time-conductor-espresso.scss

@@ -19,7 +19,6 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-$output-bourbon-deprecation-warnings: false;
 @import "bourbon";
 @import "../../../../../commonUI/general/res/sass/constants";
 @import "../../../../../commonUI/general/res/sass/mixins";

platform/features/conductor/core/res/sass/time-conductor-snow.scss

@@ -19,7 +19,6 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-$output-bourbon-deprecation-warnings: false;
 @import "bourbon";
 @import "../../../../../commonUI/general/res/sass/constants";
 @import "../../../../../commonUI/general/res/sass/mixins";

platform/features/timeline/res/sass/timeline-espresso.scss

@@ -19,7 +19,6 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-$output-bourbon-deprecation-warnings: false;
 @import "bourbon";
 
 @import "../../../../commonUI/general/res/sass/constants";

platform/features/timeline/res/sass/timeline-snow.scss

@@ -19,7 +19,6 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-$output-bourbon-deprecation-warnings: false;
 @import "bourbon";
 
 @import "../../../../commonUI/general/res/sass/constants";

platform/features/timeline/res/sass/timeline.scss

@@ -19,7 +19,6 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-$output-bourbon-deprecation-warnings: false;
 @import "bourbon";
 
 @import "../../../../commonUI/general/res/sass/constants";

platform/telemetry/src/TelemetryCapability.js

@@ -139,8 +139,7 @@ define(
                 type = domainObject.getCapability("type"),
                 typeRequest = (type && type.getDefinition().telemetry) || {},
                 modelTelemetry = domainObject.getModel().telemetry,
-                fullRequest = Object.create(typeRequest),
-                bounds;
+                fullRequest = Object.create(typeRequest);
 
             // Add properties from the telemetry field of this
             // specific domain object.
@@ -161,12 +160,6 @@ define(
                 fullRequest.key = domainObject.getId();
             }
 
-            if (request.start === undefined && request.end === undefined) {
-                bounds = this.openmct.conductor.bounds();
-                fullRequest.start = bounds.start;
-                fullRequest.end = bounds.end;
-            }
-
             return fullRequest;
         };
 

platform/telemetry/test/TelemetryCapabilitySpec.js

@@ -97,15 +97,7 @@ define(
                 });
 
                 mockAPI = {
-                    telemetry: mockTelemetryAPI,
-                    conductor: {
-                        bounds: function () {
-                            return {
-                                start: 0,
-                                end: 1
-                            };
-                        }
-                    }
+                    telemetry: mockTelemetryAPI
                 };
 
                 telemetry = new TelemetryCapability(
@@ -158,9 +150,7 @@ define(
                 expect(telemetry.getMetadata()).toEqual({
                     id: "testId", // from domain object
                     source: "testSource",
-                    key: "testKey",
-                    start: 0,
-                    end: 1
+                    key: "testKey"
                 });
             });
 
@@ -174,9 +164,7 @@ define(
                 expect(telemetry.getMetadata()).toEqual({
                     id: "testId", // from domain object
                     source: "testSource", // from model
-                    key: "testId", // from domain object
-                    start: 0,
-                    end: 1
+                    key: "testId" // from domain object
                 });
             });
 
@@ -255,9 +243,7 @@ define(
                     [{
                         id: "testId", // from domain object
                         source: "testSource",
-                        key: "testKey",
-                        start: 0,
-                        end: 1
+                        key: "testKey"
                     }]
                 );