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 9061c603..8f8a6815 100644 --- a/res/app/components/stf/logcat-table/logcat-table-directive.js +++ b/res/app/components/stf/logcat-table/logcat-table-directive.js @@ -66,7 +66,7 @@ module.exports = function logcatTableDirective($rootScope, $timeout, LogcatServi .appendChild(document.createTextNode(data.message)) if (autoScroll && shouldAutoScroll() && !batchRequest) { - _.throttle(scrollToBottom, 10)() + _.throttle(scrollToBottom, 30)() } } diff --git a/res/app/components/stf/logcat/logcat-service.js b/res/app/components/stf/logcat/logcat-service.js index 73003a88..e98d9dea 100644 --- a/res/app/components/stf/logcat/logcat-service.js +++ b/res/app/components/stf/logcat/logcat-service.js @@ -44,7 +44,8 @@ module.exports = function LogcatServiceFactory(socket, DeviceService) { function enhanceEntry(data) { var date = new Date(data.date * 1000) - data.dateLabel = _s.pad(date.getHours(), 2, '0') + ':' + + data.dateLabel = + _s.pad(date.getHours(), 2, '0') + ':' + _s.pad(date.getMinutes(), 2, '0') + ':' + _s.pad(date.getSeconds(), 2, '0') + '.' + _s.pad(date.getMilliseconds(), 3, '0') diff --git a/res/app/components/stf/screen/screen-controller.js b/res/app/components/stf/screen/screen-controller.js index 4c4eb463..79478953 100644 --- a/res/app/components/stf/screen/screen-controller.js +++ b/res/app/components/stf/screen/screen-controller.js @@ -1,5 +1,4 @@ module.exports = function DeviceScreenCtrl($scope, $rootScope, ScalingService) { $scope.displayError = false $scope.ScalingService = ScalingService - } diff --git a/res/app/control-panes/device-control/device-control.jade b/res/app/control-panes/device-control/device-control.jade index 7ef99782..185aecc0 100644 --- a/res/app/control-panes/device-control/device-control.jade +++ b/res/app/control-panes/device-control/device-control.jade @@ -1,8 +1,7 @@ .interact-control.fill-height.as-table.stf-device-control(ng-controller='DeviceControlCtrl') - .as-cell.fill-height .as-table.fill-height - .stf-vnc-navbar.as-row(ng-if='!$root.basicMode') + .stf-vnc-navbar.as-row(ng-show='!$root.basicMode') .pull-right button(ng-click='control.identify()', tooltip='Find Device', tooltip-placement='bottom').btn.btn-sm.btn-info-outline