[Testing] Move ExportImageController into constructor for dependency injection

This commit is contained in:
David Hudson 2016-09-03 14:44:33 +09:00
parent 26c14d2bca
commit fecf419f83
2 changed files with 14 additions and 5 deletions

View File

@ -25,6 +25,7 @@ define([
"./src/PlotController",
"./src/policies/PlotViewPolicy",
"./src/PlotOptionsController",
"./src/services/ExportImageService",
"text!./res/templates/plot.html",
"text!./res/templates/plot-options-browse.html",
'legacyRegistry'
@ -33,6 +34,7 @@ define([
PlotController,
PlotViewPolicy,
PlotOptionsController,
ExportImageService,
plotTemplate,
plotOptionsBrowseTemplate,
legacyRegistry
@ -71,6 +73,7 @@ define([
"depends": [
"$scope",
"$element",
"ExportImageService",
"telemetryFormatter",
"telemetryHandler",
"throttle",
@ -85,6 +88,13 @@ define([
]
}
],
"services": [
{
"key": "ExportImageService",
"implementation": ExportImageService,
"depends": []
}
],
"constants": [
{
"key": "PLOT_FIXED_DURATION",

View File

@ -32,8 +32,7 @@ define(
"./elements/PlotLimitTracker",
"./elements/PlotTelemetryFormatter",
"./modes/PlotModeOptions",
"./SubPlotFactory",
"./services/ExportImageService"
"./SubPlotFactory"
],
function (
PlotUpdater,
@ -42,8 +41,7 @@ define(
PlotLimitTracker,
PlotTelemetryFormatter,
PlotModeOptions,
SubPlotFactory,
ExportImageService
SubPlotFactory
) {
var AXIS_DEFAULTS = [
@ -66,6 +64,7 @@ define(
function PlotController(
$scope,
$element,
ExportImageService,
telemetryFormatter,
telemetryHandler,
throttle,
@ -250,7 +249,7 @@ define(
self.pending = true;
self.$element = $element;
self.ExportImageService = new ExportImageService();
self.ExportImageService = ExportImageService;
// Initialize axes; will get repopulated when telemetry
// metadata becomes available.