alihan/openmct
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'github/master' into open229b

Browse Source 
Conflicts:
	platform/features/conductor/src/ConductorRepresenter.js
This commit is contained in:
Victor Woeltjen
2015-11-03 16:58:40 -08:00
parent c0ed19fd92 9523c918fb
commit 99376391a9
63 changed files with 4572 additions and 1360 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platform/telemetry/bundle.json
View File

@@ -38,7 +38,7 @@
{
"key": "telemetryFormatter",
"implementation": "TelemetryFormatter.js",
"depends": [ "formatService", "DEFAULT_TIME_FORMAT", "$log" ]
"depends": [ "formatService", "DEFAULT_TIME_FORMAT" ]
},
{
"key": "telemetrySubscriber",

6
platform/telemetry/src/TelemetryFormatter.js
View File

@@ -40,12 +40,10 @@ define(
* domain values
* @param {string} defaultFormatKey the format to request when no
* format has been otherwise specified
* @param $log Angular's `$log`, to log warnings
*/
function TelemetryFormatter(formatService, defaultFormatKey, $log) {
function TelemetryFormatter(formatService, defaultFormatKey) {
this.formatService = formatService;
this.defaultFormat = formatService.getFormat(defaultFormatKey);
this.$log = $log;
}
/**
@@ -62,7 +60,7 @@ define(
this.defaultFormat :
this.formatService.getFormat(key);
return isNaN(v) ? "" : formatter ? formatter.format(v) : String(v);
return isNaN(v) ? "" : formatter.format(v);
};
/**