From 11e170fc19b6dd64e77a7b7b2d53ab6d17018aed Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Thu, 19 Dec 2013 13:59:39 +0100 Subject: lint coffee --- js/app/controllers/itemcontroller.coffee | 2 +- js/app/controllers/settingscontroller.coffee | 4 ++-- js/app/directives/undonotification.coffee | 2 +- .../services/businesslayer/feedbusinesslayer.coffee | 8 ++++---- .../services/businesslayer/folderbusinesslayer.coffee | 4 ++-- js/app/services/persistence.coffee | 12 ++++++------ js/public/app.js | 19 +++++++------------ .../businesslayer/feedbusinesslayerSpec.coffee | 2 +- .../businesslayer/folderbusinesslayerSpec.coffee | 2 +- 9 files changed, 25 insertions(+), 30 deletions(-) (limited to 'js') diff --git a/js/app/controllers/itemcontroller.coffee b/js/app/controllers/itemcontroller.coffee index cc9898397..1a3c876b9 100644 --- a/js/app/controllers/itemcontroller.coffee +++ b/js/app/controllers/itemcontroller.coffee @@ -45,7 +45,7 @@ Language, AutoPageLoading) -> @_$scope.cancel = (feedId) => feed = @_feedModel.getById(feedId) feed.editing = false - feed.title = feed.originalValue + feed.title = feed.originalValue @_$scope.isLoading = => return @_feedLoading.isLoading() diff --git a/js/app/controllers/settingscontroller.coffee b/js/app/controllers/settingscontroller.coffee index 120dfed49..b5cfb7550 100644 --- a/js/app/controllers/settingscontroller.coffee +++ b/js/app/controllers/settingscontroller.coffee @@ -27,7 +27,7 @@ angular.module('News').controller 'SettingsController', $scope.feedBusinessLayer = FeedBusinessLayer - $scope.import = (fileContent) => + $scope.import = (fileContent) -> $scope.error = false ShowAll.setShowAll(true) @@ -37,7 +37,7 @@ angular.module('News').controller 'SettingsController', $scope.error = true - $scope.importArticles = (fileContent) => + $scope.importArticles = (fileContent) -> $scope.jsonError = false $scope.loading = true diff --git a/js/app/directives/undonotification.coffee b/js/app/directives/undonotification.coffee index 39556e7a0..204f9eb56 100644 --- a/js/app/directives/undonotification.coffee +++ b/js/app/directives/undonotification.coffee @@ -48,7 +48,7 @@ angular.module('News').directive 'undoNotification', $timeout.cancel(timeout.promise) # fade out if not reset with a new - timeout = $timeout => + timeout = $timeout -> $(elm).fadeOut() , Config.undoTimeout diff --git a/js/app/services/businesslayer/feedbusinesslayer.coffee b/js/app/services/businesslayer/feedbusinesslayer.coffee index 03ff178dd..ed219b9c7 100644 --- a/js/app/services/businesslayer/feedbusinesslayer.coffee +++ b/js/app/services/businesslayer/feedbusinesslayer.coffee @@ -58,8 +58,8 @@ FeedModel, NewLoading, _ExistsError, Utils, $rootScope, NewestItem)-> data = undoCallback: => - @_persistence.restoreFeed feedId, => - @_persistence.getAllFeeds() + @_persistence.restoreFeed feedId, -> + @_persistence.getAllFeeds() caption: feed.title @_$rootScope.$broadcast 'undoMessage', data @@ -168,7 +168,7 @@ FeedModel, NewLoading, _ExistsError, Utils, $rootScope, NewestItem)-> @_feedModel.add(feed) - success = (response) => + success = (response) -> if response.status == 'error' feed.error = response.msg onFailure() @@ -183,7 +183,7 @@ FeedModel, NewLoading, _ExistsError, Utils, $rootScope, NewestItem)-> importArticles: (json, callback) -> - onSuccess = (response) => + onSuccess = (response) -> callback() @_persistence.importArticles(json, onSuccess) diff --git a/js/app/services/businesslayer/folderbusinesslayer.coffee b/js/app/services/businesslayer/folderbusinesslayer.coffee index aeaf64fc2..acb3b4a58 100644 --- a/js/app/services/businesslayer/folderbusinesslayer.coffee +++ b/js/app/services/businesslayer/folderbusinesslayer.coffee @@ -105,7 +105,7 @@ FeedModel, $rootScope) -> isVisible: (folderId) -> - if @_showAll.getShowAll() || + if @_showAll.getShowAll() || @_feedBusinessLayer.getFeedsOfFolder(folderId).length == 0 return true else @@ -141,7 +141,7 @@ FeedModel, $rootScope) -> @_folderModel.add(folder) - success = (response) => + success = (response) -> if response.status == 'error' folder.error = response.msg onFailure() diff --git a/js/app/services/persistence.coffee b/js/app/services/persistence.coffee index bfca4ccaa..6bf040e07 100644 --- a/js/app/services/persistence.coffee +++ b/js/app/services/persistence.coffee @@ -68,10 +68,10 @@ $rootScope, $q) -> # loading sign handling loading.increase() - successCallbackWrapper = (data) => + successCallbackWrapper = (data) -> onSuccess(data) loading.decrease() - failureCallbackWrapper = (data) => + failureCallbackWrapper = (data) -> loading.decrease() params = @@ -172,9 +172,9 @@ $rootScope, $q) -> failureCallbackWrapper = (data) => @_feedLoading.decrease() else - successCallbackWrapper = (data) => + successCallbackWrapper = (data) -> onSuccess() - failureCallbackWrapper = (data) => + failureCallbackWrapper = (data) -> params = onSuccess: successCallbackWrapper @@ -307,9 +307,9 @@ $rootScope, $q) -> failureCallbackWrapper = (data) => @_feedLoading.decrease() else - successCallbackWrapper = (data) => + successCallbackWrapper = (data) -> onSuccess() - failureCallbackWrapper = (data) => + failureCallbackWrapper = (data) -> params = diff --git a/js/public/app.js b/js/public/app.js index 30a8a6506..a99a469fc 100644 --- a/js/public/app.js +++ b/js/public/app.js @@ -570,7 +570,6 @@ License along with this library. If not, see . return caption; }; return scope.$on('undoMessage', function(scope, data) { - var _this = this; if (timeout) { $timeout.cancel(timeout.promise); } @@ -901,7 +900,6 @@ License along with this library. If not, see . (function() { angular.module('News').controller('SettingsController', [ '$scope', 'FeedBusinessLayer', 'FolderBusinessLayer', 'ShowAll', function($scope, FeedBusinessLayer, FolderBusinessLayer, ShowAll) { - var _this = this; $scope.feedBusinessLayer = FeedBusinessLayer; $scope["import"] = function(fileContent) { var error; @@ -1116,8 +1114,9 @@ License along with this library. If not, see . feed = this._feedModel.removeById(feedId); data = { undoCallback: function() { - _this._persistence.restoreFeed(feedId, function() {}); - return _this._persistence.getAllFeeds(); + return _this._persistence.restoreFeed(feedId, function() { + return this._persistence.getAllFeeds(); + }); }, caption: feed.title }; @@ -1215,8 +1214,7 @@ License along with this library. If not, see . }; FeedBusinessLayer.prototype.create = function(url, parentId, onSuccess, onFailure) { - var feed, success, - _this = this; + var feed, success; if (parentId == null) { parentId = 0; } @@ -1263,8 +1261,7 @@ License along with this library. If not, see . }; FeedBusinessLayer.prototype.importArticles = function(json, callback) { - var onSuccess, - _this = this; + var onSuccess; onSuccess = function(response) { return callback(); }; @@ -1430,8 +1427,7 @@ License along with this library. If not, see . }; FolderBusinessLayer.prototype.create = function(folderName, onSuccess, onFailure) { - var folder, success, - _this = this; + var folder, success; if (onSuccess == null) { onSuccess = null; } @@ -2687,8 +2683,7 @@ License along with this library. If not, see . Persistence.prototype.getItems = function(type, id, offset, onSuccess) { - var failureCallbackWrapper, loading, params, successCallbackWrapper, - _this = this; + var failureCallbackWrapper, loading, params, successCallbackWrapper; if (onSuccess == null) { onSuccess = null; } diff --git a/js/tests/services/businesslayer/feedbusinesslayerSpec.coffee b/js/tests/services/businesslayer/feedbusinesslayerSpec.coffee index 6061d8767..1c9168a4d 100644 --- a/js/tests/services/businesslayer/feedbusinesslayerSpec.coffee +++ b/js/tests/services/businesslayer/feedbusinesslayerSpec.coffee @@ -335,7 +335,7 @@ describe 'FeedBusinessLayer', -> it 'should create an import article request', => callback = jasmine.createSpy('called') @persistence.importArticles = jasmine.createSpy('importArticles') - @persistence.importArticles.andCallFake (data, onSuccess) => + @persistence.importArticles.andCallFake (data, onSuccess) -> onSuccess() json = {"test": "hi"} diff --git a/js/tests/services/businesslayer/folderbusinesslayerSpec.coffee b/js/tests/services/businesslayer/folderbusinesslayerSpec.coffee index 3b4115e60..55914ab4c 100644 --- a/js/tests/services/businesslayer/folderbusinesslayerSpec.coffee +++ b/js/tests/services/businesslayer/folderbusinesslayerSpec.coffee @@ -372,7 +372,7 @@ describe 'FolderBusinessLayer', -> it 'should import nested folders', => @persistence.createFolder = jasmine.createSpy('create folder') - @persistence.createFolder.andCallFake (name, parentId, onSuccess) => + @persistence.createFolder.andCallFake (name, parentId, onSuccess) -> data = data: folders: [ -- cgit v1.2.3