summaryrefslogtreecommitdiffstats
path: root/js/app/controllers
diff options
context:
space:
mode:
authorBernhard Posselt <nukeawhale@gmail.com>2013-04-13 17:28:07 +0200
committerBernhard Posselt <nukeawhale@gmail.com>2013-04-13 17:28:38 +0200
commit38e4b6d7e973bc99811139066a7a047b4bd76a4c (patch)
treefb88f63c0a69cc527956715333dddd20d3b94f0b /js/app/controllers
parent8df86d1991e25dfaef8623e2f4945c67dbc5f318 (diff)
implement opml import, fix #23
Diffstat (limited to 'js/app/controllers')
-rw-r--r--js/app/controllers/settingscontroller.coffee12
1 files changed, 8 insertions, 4 deletions
diff --git a/js/app/controllers/settingscontroller.coffee b/js/app/controllers/settingscontroller.coffee
index 07cf7360a..2df604c42 100644
--- a/js/app/controllers/settingscontroller.coffee
+++ b/js/app/controllers/settingscontroller.coffee
@@ -22,11 +22,15 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
angular.module('News').controller 'SettingsController',
-['$scope', 'FeedBl', ($scope, FeedBl) ->
-
- $scope.import = (fileContent) ->
- console.log fileContent
+['$scope', 'FeedBl', 'FolderBl', ($scope, FeedBl, FolderBl) ->
$scope.feedBl = FeedBl
+ $scope.import = (fileContent) =>
+ $scope.error = false
+ try
+ FolderBl.import(fileContent)
+ catch error
+ $scope.error = true
+
] \ No newline at end of file