diff options
author | Bernhard Posselt <nukeawhale@gmail.com> | 2013-04-13 17:28:33 +0200 |
---|---|---|
committer | Bernhard Posselt <nukeawhale@gmail.com> | 2013-04-13 17:28:38 +0200 |
commit | ee9e17ef17cb212e8a89175fccfa4f44b6da8ad5 (patch) | |
tree | 7e2c8bb470a1b920030c93c320d95131ba888e9b /js/app | |
parent | 38e4b6d7e973bc99811139066a7a047b4bd76a4c (diff) |
implement opml import, fix #23
Diffstat (limited to 'js/app')
-rw-r--r-- | js/app/controllers/settingscontroller.coffee | 6 | ||||
-rw-r--r-- | js/app/services/bl/folderbl.coffee | 4 |
2 files changed, 9 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 diff --git a/js/app/services/bl/folderbl.coffee b/js/app/services/bl/folderbl.coffee index a74ecc42f..ad3f5f97d 100644 --- a/js/app/services/bl/folderbl.coffee +++ b/js/app/services/bl/folderbl.coffee @@ -106,6 +106,7 @@ ItemModel, ShowAll, _ExistsError, OPMLParser)-> folder = name: folderName + opened: true @_folderModel.add(folder) @@ -138,11 +139,14 @@ ItemModel, ShowAll, _ExistsError, OPMLParser)-> catch error if error instanceof _ExistsError folder = @_folderModel.getByName(item.getName()) + @open(folder.id) @_importElement(item, folder.id) else try @_feedBl.create(item.getUrl(), parentFolderId) catch error + console.log 'feed ' + item.getUrl() + ' exists' + console.log error return new FolderBl(FolderModel, FeedBl, ShowAll, ActiveFeed, Persistence, |