From bef3bfcfcd820816ac6c4a787786f47adb6379e4 Mon Sep 17 00:00:00 2001 From: Vit Brunner Date: Tue, 23 Dec 2014 08:19:29 +0100 Subject: [PATCH] Store whole config in poems service --- source/scripts/controllers.js.coffee | 2 +- source/scripts/services/load.js.coffee | 5 +++-- source/scripts/services/poems.js.coffee | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/source/scripts/controllers.js.coffee b/source/scripts/controllers.js.coffee index fe5d42b..8f05644 100644 --- a/source/scripts/controllers.js.coffee +++ b/source/scripts/controllers.js.coffee @@ -31,7 +31,7 @@ angular.module("sideBySide.controllers", []) $scope.verses = transformed.verses $scope.meta = transformed.meta - headingKey = poems.heading or "Author" + headingKey = poems.config.heading or "Author" $scope.headings = (version[headingKey] for version in transformed.meta) $scope.all = poems.all diff --git a/source/scripts/services/load.js.coffee b/source/scripts/services/load.js.coffee index a703536..0a0df18 100644 --- a/source/scripts/services/load.js.coffee +++ b/source/scripts/services/load.js.coffee @@ -1,5 +1,6 @@ angular.module("sideBySide").factory "load", -['filter', 'fetch', 'poems', (filter, fetch, poems) -> +['filter', 'fetch', 'poems' +(filter, fetch, poems) -> # Load poems # # @param base [String] Path to config file directory @@ -22,6 +23,6 @@ angular.module("sideBySide").factory "load", config.fetchedPoems.then (poemList) -> disp = display or config.data.display poems.all = (activize(poem, disp) for poem in poemList) - poems.heading = config.data.heading + poems.config = config.data filter.update() ] diff --git a/source/scripts/services/poems.js.coffee b/source/scripts/services/poems.js.coffee index 5734691..26b46ef 100644 --- a/source/scripts/services/poems.js.coffee +++ b/source/scripts/services/poems.js.coffee @@ -9,7 +9,7 @@ angular.module("sideBySide").service "poems", -> text: 'Please be patient!' }] }] - @heading = undefined + @config = {} # Get active poems #