diff --git a/lib/units/device/plugins/account.js b/lib/units/device/plugins/account.js index 9902ffe3..e7f68120 100644 --- a/lib/units/device/plugins/account.js +++ b/lib/units/device/plugins/account.js @@ -235,8 +235,8 @@ module.exports = syrup.serial() .then(function() { return service.pressKey('enter') }) - case '4.3': // tested: 4.3 - case '4.4': // tested: 4.4.2 + //case '4.3': // tested: 4.3 + //case '4.4': // tested: 4.4.2 default: return service.pressKey('tab').delay(1000) .then(function() { diff --git a/lib/units/device/plugins/service.js b/lib/units/device/plugins/service.js index a1747763..b0efc6df 100644 --- a/lib/units/device/plugins/service.js +++ b/lib/units/device/plugins/service.js @@ -562,7 +562,8 @@ module.exports = syrup.serial() var response = apk.wire.GetRingerModeResponse.decode(data) // Reflection to decode enums to their string values, otherwise // we only get an integer - var ringerMode = apk.builder.lookup('jp.co.cyberagent.stf.proto.RingerMode') + var ringerMode = apk.builder.lookup( + 'jp.co.cyberagent.stf.proto.RingerMode') .children[response.mode].name if (response.success) { return ringerMode diff --git a/lib/units/device/resources/service.js b/lib/units/device/resources/service.js index e9a1ef3c..47638af1 100644 --- a/lib/units/device/resources/service.js +++ b/lib/units/device/resources/service.js @@ -13,7 +13,8 @@ module.exports = syrup.serial() .dependency(require('../support/adb')) .define(function(options, adb) { var log = logger.createLogger('device:resources:service') - var builder = ProtoBuf.loadProtoFile(pathutil.vendor('STFService/wire.proto')) + var builder = ProtoBuf.loadProtoFile( + pathutil.vendor('STFService/wire.proto')) var resource = { requiredVersion: '0.7.21' diff --git a/res/app/components/stf/admin-mode/admin-mode-directive.js b/res/app/components/stf/admin-mode/admin-mode-directive.js index 758e0f72..0958dff6 100644 --- a/res/app/components/stf/admin-mode/admin-mode-directive.js +++ b/res/app/components/stf/admin-mode/admin-mode-directive.js @@ -1,7 +1,7 @@ module.exports = function adminModeDirective($rootScope, SettingsService) { return { restrict: 'AE', - link: function (scope) { + link: function () { SettingsService.bind($rootScope, { target: 'adminMode', defaultValue: false diff --git a/res/app/components/stf/angular-packery/angular-packery-directive.js b/res/app/components/stf/angular-packery/angular-packery-directive.js index 59609640..c760ae3b 100644 --- a/res/app/components/stf/angular-packery/angular-packery-directive.js +++ b/res/app/components/stf/angular-packery/angular-packery-directive.js @@ -1,6 +1,8 @@ var _ = require('lodash') -module.exports = function angularPackeryDirective(PackeryService, DraggabillyService, $timeout, $parse) { +module.exports = function angularPackeryDirective(PackeryService, + DraggabillyService, $timeout, $parse) { + return { restrict: 'AE', link: function (scope, element, attrs) { diff --git a/res/app/control-panes/advanced/advanced-controller.js b/res/app/control-panes/advanced/advanced-controller.js index b33cdfc2..d25901b0 100644 --- a/res/app/control-panes/advanced/advanced-controller.js +++ b/res/app/control-panes/advanced/advanced-controller.js @@ -1,3 +1,3 @@ -module.exports = function AdvancedCtrl($scope) { - +module.exports = function AdvancedCtrl() { + } diff --git a/res/app/control-panes/cpu/cpu-controller.js b/res/app/control-panes/cpu/cpu-controller.js index c93988bb..bc4038e8 100644 --- a/res/app/control-panes/cpu/cpu-controller.js +++ b/res/app/control-panes/cpu/cpu-controller.js @@ -1,3 +1,3 @@ -module.exports = function CpuCtrl($scope) { - +module.exports = function CpuCtrl() { + } diff --git a/res/app/control-panes/dashboard/dashboard-controller.js b/res/app/control-panes/dashboard/dashboard-controller.js index 4b366432..7db018f9 100644 --- a/res/app/control-panes/dashboard/dashboard-controller.js +++ b/res/app/control-panes/dashboard/dashboard-controller.js @@ -1,3 +1,3 @@ -module.exports = function DashboardCtrl($scope) { - +module.exports = function DashboardCtrl() { + } diff --git a/res/app/control-panes/device-control/device-control-controller.js b/res/app/control-panes/device-control/device-control-controller.js index e4a36fbe..d91545f2 100644 --- a/res/app/control-panes/device-control/device-control-controller.js +++ b/res/app/control-panes/device-control/device-control-controller.js @@ -1,6 +1,7 @@ var _ = require('lodash') -module.exports = function DeviceControlCtrl($scope, DeviceService, GroupService, $location, $timeout, gettext, $filter) { +module.exports = function DeviceControlCtrl($scope, DeviceService, GroupService, + $location, $timeout) { $scope.showScreen = true @@ -44,7 +45,7 @@ module.exports = function DeviceControlCtrl($scope, DeviceService, GroupService, $scope.$digest() }) } - } catch(e) { + } catch (e) { alert(e.message) } } @@ -87,7 +88,7 @@ module.exports = function DeviceControlCtrl($scope, DeviceService, GroupService, $scope.currentRotation = 'portrait' - $scope.$watch('device.display.rotation', function (newValue, oldValue) { + $scope.$watch('device.display.rotation', function (newValue) { if (isPortrait(newValue)) { $scope.currentRotation = 'portrait' } else if (isLandscape(newValue)) { diff --git a/res/app/control-panes/inspect/inspect-controller.js b/res/app/control-panes/inspect/inspect-controller.js index 891b5de8..dbb3a88c 100644 --- a/res/app/control-panes/inspect/inspect-controller.js +++ b/res/app/control-panes/inspect/inspect-controller.js @@ -1,3 +1,3 @@ -module.exports = function InspectCtrl($scope) { - +module.exports = function InspectCtrl() { + } diff --git a/res/app/control-panes/logs/logs-controller.js b/res/app/control-panes/logs/logs-controller.js index 07cf8400..1e2028ed 100644 --- a/res/app/control-panes/logs/logs-controller.js +++ b/res/app/control-panes/logs/logs-controller.js @@ -12,7 +12,7 @@ module.exports = function LogsCtrl($scope, LogcatService) { if (newValue !== oldValue) { LogcatService.started = newValue if (newValue) { - $scope.control.startLogcat([]).then(function (result) { + $scope.control.startLogcat([]).then(function () { }) } else { $scope.control.stopLogcat() diff --git a/res/app/control-panes/resources/resources-controller.js b/res/app/control-panes/resources/resources-controller.js index fce649e4..601e7c59 100644 --- a/res/app/control-panes/resources/resources-controller.js +++ b/res/app/control-panes/resources/resources-controller.js @@ -1,3 +1,3 @@ -module.exports = function ResourcesCtrl($scope) { - +module.exports = function ResourcesCtrl() { + } diff --git a/res/app/device-list/device-list-stats-directive.js b/res/app/device-list/device-list-stats-directive.js index d45910bd..5b822a68 100644 --- a/res/app/device-list/device-list-stats-directive.js +++ b/res/app/device-list/device-list-stats-directive.js @@ -1,6 +1,5 @@ module.exports = function DeviceListStatsDirective( UserService -, $timeout ) { return { restrict: 'E' diff --git a/res/app/menu/menu-controller.js b/res/app/menu/menu-controller.js index d1e4b7d8..41b4b2d7 100644 --- a/res/app/menu/menu-controller.js +++ b/res/app/menu/menu-controller.js @@ -1,13 +1,8 @@ -module.exports = function MenuCtrl( - $scope -, $rootScope -, SettingsService -, $location -, ExternalUrlModalService -) { +module.exports = function MenuCtrl($scope, $rootScope, SettingsService, + $location, ExternalUrlModalService) { + SettingsService.bind($rootScope, { - target: 'platform' - , defaultValue: 'native' + target: 'platform', defaultValue: 'native' }) $scope.$on('$routeChangeSuccess', function () { @@ -15,7 +10,8 @@ module.exports = function MenuCtrl( }) $scope.openChat = function () { - var hipChatUrl = 'https://cyberagent.hipchat.com/chat?focus_jid=44808_stf@conf.hipchat.com&minimal=true' + var hipChatUrl = 'https://cyberagent.hipchat.com/chat?focus_jid=' + + '44808_stf@conf.hipchat.com&minimal=true' ExternalUrlModalService.open(hipChatUrl, 'HipChat #STF', 'fa-comment') } }