diff options
| author | Bernhard Posselt <nukeawhale@gmail.com> | 2013-04-12 14:53:02 +0200 |
|---|---|---|
| committer | Bernhard Posselt <nukeawhale@gmail.com> | 2013-04-12 14:53:02 +0200 |
| commit | a069add71e642f37c6309c3bd7af74761acef929 (patch) | |
| tree | 59b3326de202dd5a8bb5e29ae1a626794fb6b349 /js/app/controllers | |
| parent | e8767f75116ff7ef2b7a349480151c9f66bbade0 (diff) | |
implement export, needs proper unittests though, fix 31
Diffstat (limited to 'js/app/controllers')
| -rw-r--r-- | js/app/controllers/controllers.coffee | 8 | ||||
| -rw-r--r-- | js/app/controllers/settingscontroller.coffee | 15 |
2 files changed, 6 insertions, 17 deletions
diff --git a/js/app/controllers/controllers.coffee b/js/app/controllers/controllers.coffee index 02d5f5e6c..8a73549cf 100644 --- a/js/app/controllers/controllers.coffee +++ b/js/app/controllers/controllers.coffee @@ -20,14 +20,6 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>. ### -angular.module('News').controller 'SettingsController', -['$scope', '_SettingsController', -($scope, _SettingsController)-> - - return new _SettingsController($scope) -] - - angular.module('News').controller 'FeedController', ['$scope', '_FeedController', 'Persistence', 'FolderBl', 'FeedBl', 'SubscriptionsBl', 'StarredBl', 'unreadCountFormatter', diff --git a/js/app/controllers/settingscontroller.coffee b/js/app/controllers/settingscontroller.coffee index ec94b843c..07cf7360a 100644 --- a/js/app/controllers/settingscontroller.coffee +++ b/js/app/controllers/settingscontroller.coffee @@ -21,15 +21,12 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>. ### -angular.module('News').factory '_SettingsController', -> +angular.module('News').controller 'SettingsController', +['$scope', 'FeedBl', ($scope, FeedBl) -> - class SettingsController + $scope.import = (fileContent) -> + console.log fileContent - constructor: (@$scope) -> + $scope.feedBl = FeedBl - @$scope.import = (fileContent) => - console.log 'hi' - console.log fileContent - - - return SettingsController
\ No newline at end of file +]
\ No newline at end of file |