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 01bdc988..734f7f07 100644 --- a/res/app/components/stf/logcat-table/logcat-table-directive.js +++ b/res/app/components/stf/logcat-table/logcat-table-directive.js @@ -53,8 +53,8 @@ module.exports = function logcatTableDirective($rootScope, $timeout, LogcatServi newRow.classList.add('log-' + data.priorityLabel) - newRow.insertCell(-1) - .appendChild(document.createTextNode(LogcatService.numberOfEntries)) + //newRow.insertCell(-1) + // .appendChild(document.createTextNode(LogcatService.numberOfEntries)) //newRow.insertCell(-1) // .appendChild(document.createTextNode(data.deviceLabel)) newRow.insertCell(-1) diff --git a/res/app/components/stf/logcat-table/logcat-table.css b/res/app/components/stf/logcat-table/logcat-table.css index c791478e..8c98e59c 100644 --- a/res/app/components/stf/logcat-table/logcat-table.css +++ b/res/app/components/stf/logcat-table/logcat-table.css @@ -33,11 +33,11 @@ /*color: rgb(48, 57, 66);*/ } -.stf-logcat-table tr td:first-child { - background: #f3f3f3; - color: #800000; - text-align: right; -} +/*.stf-logcat-table tr td:first-child {*/ + /*background: #f3f3f3;*/ + /*color: #800000;*/ + /*text-align: right;*/ +/*}*/ /** Logging colors diff --git a/res/app/components/stf/logcat/logcat-service.js b/res/app/components/stf/logcat/logcat-service.js index 8a4971ce..cccd572e 100644 --- a/res/app/components/stf/logcat/logcat-service.js +++ b/res/app/components/stf/logcat/logcat-service.js @@ -7,6 +7,13 @@ module.exports = function LogcatServiceFactory(socket, DeviceService, FilterStri service.maxEntriesBuffer = 5000 service.numberOfEntries = 0 + service.serverFilters = [ + { + tag: '', + priority: 2 + } + ] + service.filters = { numberOfEntries: 0, entries: [ @@ -24,6 +31,7 @@ module.exports = function LogcatServiceFactory(socket, DeviceService, FilterStri }, set: function (value) { _filters[prop] = value ? value : null + service.serverFilters[0][prop] = value ? value : undefined service.filters.filterLines() } }) @@ -85,7 +93,6 @@ module.exports = function LogcatServiceFactory(socket, DeviceService, FilterStri socket.on('logcat.entry', function (rawData) { service.numberOfEntries++ - service.entries.push(enhanceEntry(rawData)) if (typeof(service.addEntryListener) === 'function') { diff --git a/res/app/control-panes/logs/logs-controller.js b/res/app/control-panes/logs/logs-controller.js index 5e7490b0..0fcb86ad 100644 --- a/res/app/control-panes/logs/logs-controller.js +++ b/res/app/control-panes/logs/logs-controller.js @@ -1,7 +1,5 @@ module.exports = function LogsCtrl($scope, LogcatService) { - var filters = [] - $scope.logEntries = LogcatService.entries $scope.started = LogcatService.started @@ -14,7 +12,7 @@ module.exports = function LogsCtrl($scope, LogcatService) { if (newValue !== oldValue) { LogcatService.started = newValue if (newValue) { - $scope.control.startLogcat(filters).then(function (result) { + $scope.control.startLogcat([]).then(function (result) { }) } else { $scope.control.stopLogcat()