diff options
Diffstat (limited to 'coffee')
| -rw-r--r-- | coffee/controllers/addnewcontroller.coffee | 20 | ||||
| -rw-r--r-- | coffee/controllers/controllers.coffee | 16 | ||||
| -rw-r--r-- | coffee/controllers/settingscontroller.coffee | 17 |
3 files changed, 16 insertions, 37 deletions
diff --git a/coffee/controllers/addnewcontroller.coffee b/coffee/controllers/addnewcontroller.coffee deleted file mode 100644 index 27fd071b7..000000000 --- a/coffee/controllers/addnewcontroller.coffee +++ /dev/null @@ -1,20 +0,0 @@ -### -# ownCloud news app -# -# @author Alessandro Cosentino -# @author Bernhard Posselt -# Copyright (c) 2012 - Alessandro Cosentino <cosenal@gmail.com> -# Copyright (c) 2012 - Bernhard Posselt <nukeawhale@gmail.com> -# -# This file is licensed under the Affero General Public License version 3 or -# later. -# -# See the COPYING-README file -# -### -angular.module('News').factory '_AddNewController', -['Controller', (Controller) -> - - class AddNewController extends Controller - -]
\ No newline at end of file diff --git a/coffee/controllers/controllers.coffee b/coffee/controllers/controllers.coffee index 62476443f..1474a7b39 100644 --- a/coffee/controllers/controllers.coffee +++ b/coffee/controllers/controllers.coffee @@ -14,12 +14,10 @@ ### angular.module('News').controller 'SettingsController', -['_SettingsController', '$scope', '$rootScope', 'ShowAll', 'PersistenceNews', -'FolderModel', 'FeedModel', 'OPMLParser', -(_SettingsController, $scope, $rootScope, ShowAll, PersistenceNews, -FolderModel, FeedModel, OPMLParser) -> - return new _SettingsController($scope, $rootScope, PersistenceNews, - OPMLParser) +['_SettingsController', '$scope', '$rootScope', 'PersistenceNews', 'OPMLParser', 'FeedModel', +(_SettingsController, $scope, $rootScope, PersistenceNews, OPMLParser, FeedModel) -> + return new _SettingsController($scope, $rootScope, PersistenceNews, + OPMLParser, FeedModel) ] angular.module('News').controller 'ItemController', @@ -42,10 +40,4 @@ StarredCount, ShowAll, ItemModel, GarbageRegistry, $rootScope, Loading, Config) ActiveFeed, PersistenceNews, StarredCount, ShowAll, ItemModel, GarbageRegistry, $rootScope, Loading, Config) -] - -angular.module('News').controller 'AddNewController', -['_AddNewController', '$scope', -(_AddNewController, $scope) -> - return new _AddNewController($scope) ]
\ No newline at end of file diff --git a/coffee/controllers/settingscontroller.coffee b/coffee/controllers/settingscontroller.coffee index 712d0e9ff..4da81c316 100644 --- a/coffee/controllers/settingscontroller.coffee +++ b/coffee/controllers/settingscontroller.coffee @@ -18,12 +18,9 @@ angular.module('News').factory '_SettingsController', ['Controller', class SettingsController extends Controller - constructor: (@$scope, @$rootScope, @persistence, @opmlParser) -> + constructor: (@$scope, @$rootScope, @persistence, @opmlParser, @feedModel) -> - @add = false - @settings = false - @addingFeed = false - @addingFolder = false + @$scope.feeds = @feedModel.getItems() @$scope.$on 'readFile', (scope, fileContent) => structure = @opmlParser.parseXML(fileContent) @@ -32,6 +29,16 @@ angular.module('News').factory '_SettingsController', ['Controller', @$scope.$on 'hidesettings', => @$scope.showSettings = false + @$scope.export = => + @export() + + + export: -> + # FIXME: this should only work when the routes are loaded + # and be put into a directive + url = OC.Router.generate('news_export_opml') + window.open url, '_blank' + # recursively create folders parseOPMLStructure: (structure, folderId=0) -> |