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

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

Browse Source
This commit is contained in:
Pete Richards
2015-11-06 09:54:42 -08:00
parent 932e3cb7b0 ac529be55c
commit 639546bf86
4 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
platform/features/conductor/src/ConductorRepresenter.js
View File

@@ -102,7 +102,7 @@ define(
function updateDomain(value) {
var newDomain = conductor.domain(value);
conductorScope.parameters.format = newDomain.format;
repScope.$broadcast('telemetry:display:bounds', bounds());
broadcastBounds();
}
// telemetry domain metadata -> option for a select control
@@ -139,8 +139,6 @@ define(
.$watch('ngModel.conductor.inner.end', updateConductorInner);
conductorScope
.$watch('ngModel.domain', updateDomain);
repScope.$on('telemetry:view', updateConductorInner);
};
ConductorRepresenter.prototype.conductorScope = function (s) {

3
platform/features/plot/src/PlotController.js
View File

@@ -245,9 +245,6 @@ define(
// Unsubscribe when the plot is destroyed
$scope.$on("$destroy", releaseSubscription);
// Notify any external observers that a new telemetry view is here
$scope.$emit("telemetry:view");
}
/**