diff --git a/gulpfile.js b/gulpfile.js index aec872d8..77605d12 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -15,7 +15,6 @@ var protractorConfig = './res/test/protractor.conf' var karma = require('karma').server var karmaConfig = '/res/test/karma.conf.js' var stream = require('stream') -var spawn = require('child_process').spawn gulp.task('jshint', function () { return gulp.src([ diff --git a/res/app/components/stf/settings/settings-service.js b/res/app/components/stf/settings/settings-service.js index de730543..33ae748a 100644 --- a/res/app/components/stf/settings/settings-service.js +++ b/res/app/components/stf/settings/settings-service.js @@ -24,6 +24,7 @@ module.exports = function SettingsServiceFactory( } function applyDelta(delta) { + // TODO: This causes chaos $rootScope.safeApply(function() { _.merge(settings, delta, function(a, b) { // New Arrays overwrite old Arrays diff --git a/res/app/control-panes/control-panes-controller.js b/res/app/control-panes/control-panes-controller.js index 76f11518..eab21b94 100644 --- a/res/app/control-panes/control-panes-controller.js +++ b/res/app/control-panes/control-panes-controller.js @@ -129,7 +129,10 @@ module.exports = else { console.log('Upload error', err) $scope.upload = { - progress: 100, lastData: 'fail', settled: true, error: err.message + progress: 100, + lastData: 'fail', + settled: true, + error: err.message } } }) @@ -180,11 +183,7 @@ module.exports = if (oldValue === 'using') { FatalMessageService.open($scope.device, false) } - } else if (typeof newValue === 'undefined' && - typeof oldValue === 'undefined') { - //FatalMessageService.open(angular.copy($scope.device)) } }, true) - } diff --git a/res/app/control-panes/screenshots/screenshots-controller.js b/res/app/control-panes/screenshots/screenshots-controller.js index a1577607..e09af3a3 100644 --- a/res/app/control-panes/screenshots/screenshots-controller.js +++ b/res/app/control-panes/screenshots/screenshots-controller.js @@ -1,18 +1,19 @@ -module.exports = function ScreenshotsCtrl($scope, SettingsService) { +module.exports = function ScreenshotsCtrl($scope) { $scope.screenshots = [] - $scope.shotSizeRange = 200 + $scope.screenShotSize = 200 $scope.clear = function () { $scope.screenshots = [] } -// SettingsService.bind($scope, { -// key: 'shotSize', storeName: 'ScreenShots.shotSize' -// }) + //SettingsService.bind($scope, { + // target: 'screenShotSize', + // defaultValue: 200 + //}) $scope.shotSizeUrlParameter = function (maxSize) { - return ($scope.shotSizeRange === maxSize) ? '' : - '?crop=' + $scope.shotSizeRange + 'x' + return ($scope.screenShotSize === maxSize) ? '' : + '?crop=' + $scope.screenShotSize + 'x' } $scope.takeScreenShot = function () { @@ -24,14 +25,13 @@ module.exports = function ScreenshotsCtrl($scope, SettingsService) { } $scope.zoom = function (param) { - var newValue = parseInt($scope.shotSizeRange, 10) + param.step + var newValue = parseInt($scope.screenShotSize, 10) + param.step if (param.min && newValue < param.min) { newValue = param.min - } else - if (param.max && newValue > param.max) { + } else if (param.max && newValue > param.max) { newValue = param.max } - $scope.shotSizeRange = newValue + $scope.screenShotSize = newValue } } diff --git a/res/app/control-panes/screenshots/screenshots.jade b/res/app/control-panes/screenshots/screenshots.jade index c1e7fcd9..d679a461 100644 --- a/res/app/control-panes/screenshots/screenshots.jade +++ b/res/app/control-panes/screenshots/screenshots.jade @@ -22,7 +22,7 @@ ng-disabled='!screenshots.length') i.fa.fa-minus - input(type='range', ng-model='shotSizeRange', min='80', max='480', step='10', + input(type='range', ng-model='screenShotSize', min='80', max='480', step='10', ng-model-options='{ updateOn: "default blur", debounce: { default: 100, blur: 0} }', ng-disabled='!screenshots.length').zoom-range diff --git a/res/app/help/help-controller.js b/res/app/help/help-controller.js index da7a4cc8..c83c665c 100644 --- a/res/app/help/help-controller.js +++ b/res/app/help/help-controller.js @@ -5,7 +5,12 @@ module.exports = function HelpCtrl($scope) { wiki: 'http://amewiki.cadc.cyberagent.local/display/STF', chat: 'https://cyberagent.hipchat.com/chat?focus_jid=44808_stf@conf.hipchat.com', tracker: 'http://jira.amb.ca.local/browse/STF', - feedback: 'http://jira.amb.ca.local/secure/CreateIssueDetails!init.jspa?pid=10521&issuetype=14&summary=STF%E3%81%AB%E9%96%A2%E3%81%99%E3%82%8B%E3%81%8A%E5%95%8F%E3%81%84%E5%90%88%E3%82%8F%E3%81%9B&description=%E3%81%8A%E5%95%8F%E3%81%84%E5%90%88%E3%82%8F%E3%81%9B%E5%86%85%E5%AE%B9%E3%81%AF%E3%82%B3%E3%82%B3%E3%81%AB%E8%A8%98%E8%BC%89%E3%81%97%E3%81%A6%E3%81%8F%E3%81%A0%E3%81%95%E3%81%84', + feedback: 'http://jira.amb.ca.local/secure/CreateIssueDetails!init.jspa?' + + 'pid=10521&issuetype=14&summary=STF%E3%81%AB%E9%96%A2%E3%81%99%E3%82%8B%E3' + + '%81%8A%E5%95%8F%E3%81%84%E5%90%88%E3%82%8F%E3%81%9B&description=%E3%81' + + '%8A%E5%95%8F%E3%81%84%E5%90%88%E3%82%8F%E3%81%9B%E5%86%85%E5%AE%B9%E3%81' + + '%AF%E3%82%B3%E3%82%B3%E3%81%AB%E8%A8%98%E8%BC%89%E3%81%97%E3%81%A6%E3%81' + + '%8F%E3%81%A0%E3%81%95%E3%81%84', mail: 'stf@cyberagent.co.jp' } -} \ No newline at end of file +} diff --git a/webpack.config.js b/webpack.config.js index 9df60c9d..410c3ca9 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -60,8 +60,15 @@ module.exports = { { test: /dialogs\.js$/, loader: 'script'}, { test: /bluebird\.js$/, loader: 'imports?require=>undefined'} ], + preLoaders: [ + { + test: /\.js$/, + exclude: /node_modules|bower_components/, + loader: 'jshint-loader' + } + ], noParse: [ - // pathutil.resource('bower_components') + //pathutil.resource('bower_components') ] }, plugins: [