removing old code

This commit is contained in:
Jared Tabor 2016-09-14 16:10:22 -07:00
parent cf54fe27e6
commit 4bb2234019
3 changed files with 7 additions and 30 deletions

View File

@ -214,11 +214,6 @@ export default
}
UpdateDOM({ scope: scope });
});
// Unbind $rootScope socket event binding(s) so that they don't get triggered
// in another instance of this controller
// scope.$on('$destroy', function() {
// $rootScope.socket.removeAllListeners("job_events-" + job_id);
// });
}
openSocket();

View File

@ -22,16 +22,17 @@ export default
});
self.socket.onopen = function () {
$log.debug("Websocket connection opened");
$log.debug("Websocket connection opened.");
$rootScope.socketPromise.resolve();
};
self.socket.onerror = function (error) {
$log.debug('Error Logged: ' + error); //log errors
$log.debug('Websocket Error Logged: ' + error); //log errors
};
self.socket.onclose = function () {
$log.debug('Websocket Disconnected.');
self.socket.onclose = function (error, obj) {
$log.debug('Websocket Disconnected: '+error);
self.checkStatus();
};
self.socket.onmessage = function (e) {
@ -57,12 +58,11 @@ export default
else {
// The naming scheme is "ws" then a
// dash (-) and the group_name.
// ex: 'ws-jobs'
// ex: 'ws-jobs'
str = `ws-${data.group_name}`;
}
$rootScope.$emit(str, data);
return self.socket;
};
}
@ -159,14 +159,6 @@ export default
});
});
});
},
removeAllListeners: function (eventName) {
var self = this;
if(self){
if(self.socket){
self.socket.removeEventListener(eventName);
}
}
},
}
};
}];

View File

@ -28,11 +28,6 @@ export default ['$log', '$rootScope', '$scope', '$state', '$stateParams', 'Proce
event_queue++;
}
});
// Unbind $rootScope socket event binding(s) so that they don't get triggered
// in another instance of this controller
// $scope.$on('$destroy', function() {
// $rootScope.socket.removeAllListeners("job_events-" + job_id);
// });
}
if ($state.current.name === 'adHocJobStdout') {
$log.debug("socket watching on ad_hoc_command_events-" + job_id);
@ -42,11 +37,6 @@ export default ['$log', '$rootScope', '$scope', '$state', '$stateParams', 'Proce
event_queue++;
}
});
// Unbind $rootScope socket event binding(s) so that they don't get triggered
// in another instance of this controller
// $scope.$on('$destroy', function() {
// $rootScope.adhoc_event_socket.removeAllListeners("ad_hoc_command_events-" + job_id);
// });
}
}