diff options
Diffstat (limited to 'js/app/controllers/settingscontroller.coffee')
| -rw-r--r-- | js/app/controllers/settingscontroller.coffee | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/js/app/controllers/settingscontroller.coffee b/js/app/controllers/settingscontroller.coffee index b7cea8d21..120dfed49 100644 --- a/js/app/controllers/settingscontroller.coffee +++ b/js/app/controllers/settingscontroller.coffee @@ -37,14 +37,16 @@ angular.module('News').controller 'SettingsController', $scope.error = true - $scope.importGoogleReader = (fileContent) => + $scope.importArticles = (fileContent) => $scope.jsonError = false - ShowAll.setShowAll(true) + $scope.loading = true try parsedJSON = JSON.parse(fileContent) - FeedBusinessLayer.importGoogleReader(parsedJSON) + FeedBusinessLayer.importArticles parsedJSON, -> + $scope.loading = false catch error $scope.jsonError = true + $scope.loading = false ]
\ No newline at end of file |