diff --git a/res/app/components/stf/logcat-table/logcat-table-directive.js b/res/app/components/stf/logcat-table/logcat-table-directive.js index c3aef3fc..9061c603 100644 --- a/res/app/components/stf/logcat-table/logcat-table-directive.js +++ b/res/app/components/stf/logcat-table/logcat-table-directive.js @@ -29,9 +29,7 @@ module.exports = function logcatTableDirective($rootScope, $timeout, LogcatServi scrollPosition = event.target.scrollTop + event.target.clientHeight scrollHeight = event.target.scrollHeight } - var throttledScrollListener = _.throttle(scrollListener, 100) - parent.addEventListener('scroll', throttledScrollListener, false) function scrollToBottom() { @@ -87,45 +85,6 @@ module.exports = function logcatTableDirective($rootScope, $timeout, LogcatServi scope.$on('$destroy', function () { parent.removeEventListener('scroll', throttledScrollListener) }) - - -// addRow({ -// "serial": "1cd49783", -// "date": 1399964036.984, -// "pid": 9246, -// "tid": 9540, -// "priority": 3, -// "tag": "MobileDataStateTracker", -// "message": "default: setPolicyDataEnable(enabled=true)" -// }) -// -// for (var i = 0; i < 50; i++) { -// addRow({ -// "serial": "14141cd49783", -// "date": 1399964036.984, -// "pid": 9246, -// "tid": 9540, -// "priority": 3, -// "tag": "MobileDataStateTracker", -// "message": "XXdefault: setPolicyDataEnable(enabled=true)" -// }) -// } -// -// $timeout(function () { -// for (var i = 0; i < 10; i++) { -// addRow({ -// "serial": "14141cd49783", -// "date": 1399964036.984, -// "pid": 9246, -// "tid": 9540, -// "priority": 3, -// "tag": "MobileDataStateTracker", -// "message": "XXdefault: setPolicyDataEnable(enabled=true)" -// }) -// } -// }, 1000) - - } } } diff --git a/res/app/components/stf/logcat/logcat-service.js b/res/app/components/stf/logcat/logcat-service.js index 89d5ad93..73003a88 100644 --- a/res/app/components/stf/logcat/logcat-service.js +++ b/res/app/components/stf/logcat/logcat-service.js @@ -3,51 +3,19 @@ var _s = require('underscore.string') module.exports = function LogcatServiceFactory(socket, DeviceService) { var service = {} - service.started = false - - service.maxBuffer = 5000 - + service.maxEntriesBuffer = 5000 service.numberOfEntries = 0 service.filters = { numberOfEntries: 0, entries: [ - { - "serial": "1cd49783", - "date": 1399964036.984, - "pid": 9246, - "tid": 9540, - "priority": 3, - "tag": "MobileDataStateTracker", - "message": "default:(enabled=true)" - } ], levelNumber: null, levelNumbers: [] } - service.entries = [ - { - "serial": "1cd49783", - "date": 1399964036.984, - "pid": 9246, - "tid": 9540, - "priority": 3, - "tag": "MobileDataStateTracker", - "message": "default:(enabled=true)" - }, - { - "serial": "1dcvafaasfafcd49783", - "date": 1399964036.984, - "pid": 9246, - "tid": 9540, - "priority": 2, - "tag": "MobileDataStateTracker", - "message": "default: setPolicyDataEnable(enabled=true)" - } - ] service.logLevels = [ @@ -91,7 +59,6 @@ module.exports = function LogcatServiceFactory(socket, DeviceService) { socket.on('logcat.entry', function (data) { service.numberOfEntries++ -// console.log(enhanceEntry(data)) service.entries.push(enhanceEntry(data)) if (true) { @@ -106,4 +73,3 @@ module.exports = function LogcatServiceFactory(socket, DeviceService) { return service } - diff --git a/res/app/control-panes/logs/logs-controller.js b/res/app/control-panes/logs/logs-controller.js index 015aa7c5..6f3f6bef 100644 --- a/res/app/control-panes/logs/logs-controller.js +++ b/res/app/control-panes/logs/logs-controller.js @@ -8,9 +8,6 @@ module.exports = function LogsCtrl($scope, LogcatService) { $scope.started = LogcatService.started - - - $scope.$watch('started', function (newValue, oldValue) { if (newValue !== oldValue) { LogcatService.started = newValue @@ -31,17 +28,4 @@ module.exports = function LogsCtrl($scope, LogcatService) { LogcatService.clear() } - $scope.addFastRow = function (val) { - var e = { - "serial": "1cd49783", - "date": 1399964036.984, - "pid": 9246, - "tid": 9540, - "priority": 3, - "tag": "MobileDataStateTracker", - "message": "default: setPolicyDataEnable(enabled=true)" - } - - //console.log(val) - } }