Merged from Master

2016-01-14 17:23:53 -08:00
parent 3e7eb11d84 88f8925d17
commit 032b2542f0
84 changed files with 605 additions and 3970 deletions
--- a/platform/features/plot/bundle.json
+++ b/platform/features/plot/bundle.json
@@ -1,50 +0,0 @@
-{
-    "name": "Plot view for telemetry",
-    "extensions": {
-        "views": [
-            {
-                "name": "Plot",
-                "key": "plot",
-                "glyph": "6",
-                "templateUrl": "templates/plot.html",
-                "needs": [ "telemetry" ],
-                "priority": "preferred",
-                "delegation": true
-            }
-        ],
-        "directives": [
-            {
-                "key": "mctChart",
-                "implementation": "MCTChart.js",
-                "depends": [ "$interval", "$log" ]
-            }
-        ],
-        "controllers": [
-            {
-                "key": "PlotController",
-                "implementation": "PlotController.js",
-                "depends": [
-                    "$scope",
-                    "telemetryFormatter",
-                    "telemetryHandler",
-                    "throttle",
-                    "PLOT_FIXED_DURATION"
-                ]
-            }
-        ],
-        "constants": [
-            {
-                "key": "PLOT_FIXED_DURATION",
-                "value": 900000,
-                "priority": "fallback",
-                "comment": "Fifteen minutes."
-            }
-        ],
-        "policies": [
-            {
-                "category": "view",
-                "implementation": "policies/PlotViewPolicy.js"
-            }
-        ]
-    }
-}