Merge remote-tracking branch 'origin/open742'

This commit is contained in:
Pete Richards 2016-03-14 16:37:58 -07:00
commit d30532a8bc
2 changed files with 3 additions and 1 deletions

View File

@ -89,9 +89,9 @@ define(
datum = self.handle.getDatum(telemetryObject);
if (datum) {
row = self.table.getRowValues(telemetryObject, datum);
self.$scope.rows = self.$scope.rows || [];
if (!self.$scope.rows){
self.$scope.rows = [row];
self.$scope.$digest();
} else {
self.$scope.rows.push(row);
self.$scope.$broadcast('add:row',

View File

@ -56,6 +56,7 @@ define(
'$on',
'$watch',
'$watchCollection',
'$digest',
'$broadcast'
]);
mockScope.$on.andCallFake(function (expression, callback){
@ -131,6 +132,7 @@ define(
it('updates table with new streaming telemetry', function () {
controller.subscribe();
mockScope.rows = [];
mockTelemetryHandler.handle.mostRecentCall.args[1]();
expect(mockScope.$broadcast).toHaveBeenCalledWith('add:row', 0);
});