From 04a0c96c80930834792688d79793151e0fb3bc44 Mon Sep 17 00:00:00 2001 From: Vit Brunner Date: Thu, 12 Jun 2014 22:22:40 +0200 Subject: [PATCH] Customizable headings --- source/documents/scripts/controllers.js.coffee | 9 ++++++--- source/documents/scripts/services/fetch.js.coffee | 6 +++++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/source/documents/scripts/controllers.js.coffee b/source/documents/scripts/controllers.js.coffee index a60c2ae..19ef90c 100644 --- a/source/documents/scripts/controllers.js.coffee +++ b/source/documents/scripts/controllers.js.coffee @@ -9,15 +9,18 @@ angular.module("sideBySide.controllers", []) }]] update = (config) -> - fetch(config).then((promises) -> - $q.all(promises).then((results) -> + fetch(config).then((result) -> + $q.all(result.promises).then((results) -> $scope.columns = results.length transformed = transformer(results) $scope.verses = transformed.verses + $scope.meta = transformed.meta + headingKey = result.heading or "Author" + $scope.headings = (version[headingKey] for version in transformed.meta) ) ) - update($location.path() + "/config.json") + update(window.location.pathname.slice(0, -1) + $location.path() + "/config.json") ] #.controller "notificationController", ['$scope', '$timeout', ($scope, $timeout) -> diff --git a/source/documents/scripts/services/fetch.js.coffee b/source/documents/scripts/services/fetch.js.coffee index e78ccec..ab45b08 100644 --- a/source/documents/scripts/services/fetch.js.coffee +++ b/source/documents/scripts/services/fetch.js.coffee @@ -11,6 +11,10 @@ angular.module("sideBySide").factory "fetch", ['$http', 'readerFactory', ($http, reader = readerFactory(poem) return reader(response.data) )) - return promises + + return { + promises: promises + heading: response.data.heading + } ) ]