From eb779beb83ed6e8d000fd0453c9ed5c404327ae4 Mon Sep 17 00:00:00 2001
From: Sean Fridman <fridman@mail.sfsu.edu>
Date: Thu, 16 Apr 2015 02:11:55 -0400
Subject: Take metadata from config and make synchronous

---
 app/node_modules/okview/index.js | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'app/node_modules/okview/index.js')

diff --git a/app/node_modules/okview/index.js b/app/node_modules/okview/index.js
index 951261c..fba1c18 100644
--- a/app/node_modules/okview/index.js
+++ b/app/node_modules/okview/index.js
@@ -21,7 +21,7 @@ function OKView(options) {
   if (!options.template)
     throw new Error('No template provided to OKView.');
   if (!options.meta)
-    throw new Error('No meta resource provided to OKView');
+    throw new Error('No metadata provided to OKView');
   if (!options.route)
     throw new Error('No route provided to OKView');
   if (!options.errorHandler)
@@ -124,12 +124,9 @@ function fetchTemplateData(meta, queries, id) {
   // resource and will resolve errors if no data is found
   var single = queries && queries.length === 1;
   return Q.promise(function(resolve, reject) {
-    return Q.all(
-      [meta.get()].concat(queries.map(function(query) {
-        return query.get(id);
-      })))
-    .then(function(results) {
-      var metadata = results.shift();
+    return Q.all(queries.map(function(query) {
+      return query.get(id);
+    })).then(function(results) {
       if (single && !results[0]) {
         reject(new Error('No resource found'));
       } else {
@@ -164,7 +161,7 @@ function fetchTemplateData(meta, queries, id) {
             cache[type] = result;
           }
           return cache;
-        }, {meta: metadata});
+        }, {meta: meta});
 
         resolve(normalized);
       }
-- 
cgit v1.2.3-70-g09d2