Renamed to 'pageMetadata';

OpenUserJS · Jun 28, 2014 · 4bb0be8 · 4bb0be8
1 parent 5e3c614
commit 4bb0be8
Show file tree

Hide file tree

Showing 10 changed files with 87 additions and 87 deletions.
diff --git a/controllers/_template.js b/controllers/_template.js
@@ -30,8 +30,8 @@ exports.example = function (req, res, next) {
   options.isMod = authedUser && authedUser.isMod;
   options.isAdmin = authedUser && authedUser.isAdmin;
 
-  // Metadata
-  metaData(options);
+  // Page metadata
+  pageMetadata(options);
 
   //--- Tasks
 
@@ -54,8 +54,8 @@ exports.example = function (req, res, next) {
   options.isMod = authedUser && authedUser.isMod;
   options.isAdmin = authedUser && authedUser.isAdmin;
 
-  // Metadata
-  metaData(options);
+  // Page metadata
+  pageMetadata(options);
 
   // Scripts: Query
   var scriptListQuery = Script.find();

diff --git a/controllers/admin.js b/controllers/admin.js
@@ -224,8 +224,8 @@ exports.adminPage = function (req, res, next) {
     });
   }
 
-  // Metadata
-  metaData(options, 'Admin');
+  // Page metadata
+  pageMetadata(options, 'Admin');
 
   //---
   async.parallel(tasks, function (err) {
@@ -254,8 +254,8 @@ exports.adminApiKeysPage = function (req, res, next) {
     });
   }
 
-  // Metadata
-  metaData(options, ['Site API Keys', 'Admin']);
+  // Page metadata
+  pageMetadata(options, ['Site API Keys', 'Admin']);
 
   //--- Tasks
 

diff --git a/controllers/discussion.js b/controllers/discussion.js
@@ -48,8 +48,8 @@ exports.categoryListPage = function (req, res, next) {
   options.isMod = authedUser && authedUser.isMod;
   options.isAdmin = authedUser && authedUser.isAdmin;
 
-  // Metadata
-  metaData(options, 'Discussions');
+  // Page metadata
+  pageMetadata(options, 'Discussions');
 
   // categoryList
   options.categoryList = _.map(categories, modelParser.parseCategory);
@@ -131,8 +131,8 @@ exports.list = function (req, res, next) {
   category = options.category = modelParser.parseCategory(category);
   options.canPostTopicToCategory = category.canUserPostTopic(authedUser);
 
-  // Metadata
-  metaData(options, [category.name, 'Discussions'], category.description);
+  // Page metadata
+  pageMetadata(options, [category.name, 'Discussions'], category.description);
 
   // discussionListQuery
   var discussionListQuery = Discussion.find();
@@ -217,8 +217,8 @@ exports.show = function (req, res, next) {
     // Discussion
     var discussion = options.discussion = modelParser.parseDiscussion(discussionData);
 
-    // Metadata
-    metaData(options, [discussion.topic, 'Discussions'], discussion.topic);
+    // Page metadata
+    pageMetadata(options, [discussion.topic, 'Discussions'], discussion.topic);
 
     // commentListQuery
     var commentListQuery = Comment.find();
@@ -292,8 +292,8 @@ exports.newTopic = function (req, res, next) {
   //
   options.category = category;
 
-  // Metadata
-  metaData(options, ['New Topic', 'Discussions']);
+  // Page metadata
+  pageMetadata(options, ['New Topic', 'Discussions']);
 
   //---
   res.render('pages/newDiscussionPage', options);

diff --git a/controllers/group.js b/controllers/group.js
@@ -140,8 +140,8 @@ exports.list = function (req, res) {
   options.isMod = authedUser && authedUser.isMod;
   options.isAdmin = authedUser && authedUser.isAdmin;
 
-  // Metadata
-  metaData(options, 'Groups');
+  // Page metadata
+  pageMetadata(options, 'Groups');
 
   // groupListQuery
   var groupListQuery = Group.find();
@@ -180,9 +180,9 @@ exports.list = function (req, res) {
     // popularGroupList
     options.popularGroupList = _.map(options.popularGroupList, modelParser.parseGroup);
 
-    // Metadata
+    // Page metadata
     if (options.groupList) {
-      metaData(options, 'Groups', null, _.pluck(options.groupList, 'name'));
+      pageMetadata(options, 'Groups', null, _.pluck(options.groupList, 'name'));
     }
   };
   function render() { res.render('pages/groupListPage', options); }
@@ -230,9 +230,9 @@ exports.view = function (req, res, next) {
     options.isMod = authedUser && authedUser.isMod;
     options.isAdmin = authedUser && authedUser.isAdmin;
 
-    // Metadata
+    // Page metadata
     var group = options.group = modelParser.parseGroup(groupData);
-    metaData(options, [group.name, 'Groups']);
+    pageMetadata(options, [group.name, 'Groups']);
 
     // scriptListQuery
     var scriptListQuery = Script.find();

diff --git a/controllers/index.js b/controllers/index.js
@@ -27,8 +27,8 @@ exports.home = function (req, res) {
   //
   options.librariesOnly = req.query.library !== undefined;
 
-  // Metadata
-  metaData(options, options.librariesOnly ? 'Libraries' : '');
+  // Page metadata
+  pageMetadata(options, options.librariesOnly ? 'Libraries' : '');
 
   // Session
   authedUser = options.authedUser = modelParser.parseUser(authedUser);
@@ -123,12 +123,12 @@ exports.home = function (req, res) {
       options.pageHeading = options.isFlagged ? 'Flagged Scripts' : 'Scripts';
     }
 
-    // Metadata
+    // Page metadata
     if (options.isFlagged) {
       if (options.librariesOnly) {
-        metaData(options, ['Flagged Libraries', 'Moderation']);
+        pageMetadata(options, ['Flagged Libraries', 'Moderation']);
       } else {
-        metaData(options, ['Flagged Scripts', 'Moderation']);
+        pageMetadata(options, ['Flagged Scripts', 'Moderation']);
       }
     }
   };
@@ -179,8 +179,8 @@ function getSearchResults(req, res, prefixSearch, fullSearch, opts, callback) {
     'scriptsList': scriptsList
   };
 
-  // Metadata
-  metaData(options, 'Searching for "' + search + '"');
+  // Page metadata
+  pageMetadata(options, 'Searching for "' + search + '"');
 
   modelsList.listScripts(opts, req.route.params, baseUrl,
     function (scriptsList) {
@@ -209,8 +209,8 @@ exports.toolbox = function (req, res) {
     scriptsList: scriptsList
   };
 
-  // Metadata
-  metaData(options, 'Toolbox');
+  // Page metadata
+  pageMetadata(options, 'Toolbox');
 
   modelsList.listScripts({ isLib: true }, req.route.params, '/toolbox',
     function (scriptsList) {
@@ -239,8 +239,8 @@ exports.register = function (req, res) {
   var options = {};
   var tasks = [];
 
-  // Metadata
-  metaData(options, 'Login / Register');
+  // Page metadata
+  pageMetadata(options, 'Login / Register');
 
   // Session
   authedUser = options.authedUser = modelParser.parseUser(authedUser);

diff --git a/controllers/issue.js b/controllers/issue.js
@@ -56,8 +56,8 @@ exports.list = function (req, res, next) {
     category.categoryPostDiscussionPageUrl = script.scriptOpenIssuePageUrl;
     options.category = category;
 
-    // Metadata
-    metaData(
+    // Page metadata
+    pageMetadata(
       options,
       [(open ? 'Issues' : 'Closed Issues'), script.name, (script.isLib ? 'Libraries' : 'Scripts')],
       category.description);
@@ -183,8 +183,8 @@ exports.view = function (req, res, next) {
       tasks.push(execQueryTask(commentListQuery, options, 'commentList'));
 
       function preRender() {
-        // Metadata
-        metaData(options, [discussion.topic, 'Discussions'], discussion.topic);
+        // Page metadata
+        pageMetadata(options, [discussion.topic, 'Discussions'], discussion.topic);
 
         // commentList
         options.commentList = _.map(options.commentList, modelParser.parseComment);
@@ -265,8 +265,8 @@ exports.open = function (req, res, next) {
 
       //---
       function preRender() {
-        // Metadata
-        metaData(options, ['New Issue', script.name]);
+        // Page metadata
+        pageMetadata(options, ['New Issue', script.name]);
       };
       function render() { res.render('pages/scriptNewIssuePage', options); }
       function asyncComplete() { preRender(); render(); }

diff --git a/controllers/moderation.js b/controllers/moderation.js
@@ -21,8 +21,8 @@ exports.flagged = function (req, res, next) {
     username: user ? user.name : ''
   };
 
-  // Metadata
-  metaData(options, 'Flagged Content');
+  // Page metadata
+  pageMetadata(options, 'Flagged Content');
 
   options[type + 'Type'] = true;
 
@@ -79,8 +79,8 @@ exports.graveyard = function (req, res, next) {
   var contentType = contentTypes[type];
   var options = { username: user ? user.name : '' };
 
-  // Metadata
-  metaData(options, 'Graveyard');
+  // Page metadata
+  pageMetadata(options, 'Graveyard');
 
   if (!contentType || !user || user.role > 3) { return next(); }
 
@@ -157,8 +157,8 @@ exports.removedItemListPage = function (req, res, next) {
     });
   }
 
-  // Metadata
-  metaData(options, 'Graveyard');
+  // Page metadata
+  pageMetadata(options, 'Graveyard');
 
   // removedItemListQuery
   var removedItemListQuery = Remove.find();
@@ -211,8 +211,8 @@ exports.modPage = function (req, res, next) {
     });
   }
 
-  // Metadata
-  metaData(options, 'Moderation');
+  // Page metadata
+  pageMetadata(options, 'Moderation');
 
   //---
   res.render('pages/modPage', options);

diff --git a/controllers/script.js b/controllers/script.js
@@ -323,8 +323,8 @@ exports.view = function (req, res, next) {
     script.installNameSlug = installNameSlug;
     script.scriptPermalinkInstallPageUrl = 'http://' + req.get('host') + script.scriptInstallPageUrl;
 
-    // Metadata
-    metaData(options, ['About', script.name, (script.isLib ? 'Libraries' : 'Scripts')],
+    // Page metadata
+    pageMetadata(options, ['About', script.name, (script.isLib ? 'Libraries' : 'Scripts')],
       script.meta.description);
     options.isScriptPage = true;
 
@@ -341,7 +341,7 @@ exports.view = function (req, res, next) {
     //---
     function preRender() {
       if (script.groups) {
-        metaData(options, ['About', script.name, (script.isLib ? 'Libraries' : 'Scripts')],
+        pageMetadata(options, ['About', script.name, (script.isLib ? 'Libraries' : 'Scripts')],
           script.meta.description, _.pluck(script.groups, 'name'));
       }
     };
@@ -380,10 +380,10 @@ exports.edit = function (req, res, next) {
     options.isMod = authedUser && authedUser.isMod;
     options.isAdmin = authedUser && authedUser.isAdmin;
 
-    // Metadata
+    // Page metadata
     var script = options.script = modelParser.parseScript(scriptData);
     options.isOwner = authedUser && authedUser._id == script._authorId;
-    metaData(options, ['Edit', script.name, (script.isLib ? 'Libraries' : 'Scripts')],
+    pageMetadata(options, ['Edit', script.name, (script.isLib ? 'Libraries' : 'Scripts')],
       script.name);
 
     // If authed user is not the script author.