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