From c93b3ab6fae72f5c5a344a515fadb1b6254fea92 Mon Sep 17 00:00:00 2001
From: Sacha Greif <sacha357@gmail.com>
Date: Mon, 24 Aug 2015 11:05:13 +0900
Subject: [PATCH] refactor menu component to pass container node objects
 instead of decorating item object

---
 .../client/templates/menu/menu_component.html | 19 ++++-
 .../client/templates/menu/menu_component.js   | 71 ++++++++++---------
 packages/telescope-posts/lib/routes.js        |  5 +-
 3 files changed, 60 insertions(+), 35 deletions(-)

diff --git a/packages/telescope-core/lib/client/templates/menu/menu_component.html b/packages/telescope-core/lib/client/templates/menu/menu_component.html
index 00057bb80..e1505f0d6 100644
--- a/packages/telescope-core/lib/client/templates/menu/menu_component.html
+++ b/packages/telescope-core/lib/client/templates/menu/menu_component.html
@@ -1,12 +1,14 @@
 <!--
 
-Menu Component
+menuComponent
 
 menuName (String)
 | The name of the menu
 
 menuItems (Array)
 | An array containing the contents of the menu
+_ _id (String) [optional] used in nested menus
+_ parentId (String) [optional] used in nested menus
 - route (String/Function) [optional]
 - label (String/Function) [optional]
 - description (String) [optional]
@@ -62,6 +64,21 @@ menuClass (String) [optional]
   </div>
 </template>
 
+<!--
+
+menuItem
+
+allItems (Array)
+| A reference pointing back to an array containing *all* menu items
+
+level (Number)
+| The current hierarchical depth level, starting with 0
+
+item (Object)
+| The current item to display
+
+-->
+
 <template name="menuItem">
   <li class="menu-item {{itemClass}}">
   
diff --git a/packages/telescope-core/lib/client/templates/menu/menu_component.js b/packages/telescope-core/lib/client/templates/menu/menu_component.js
index 7df7f7427..59c2210ce 100644
--- a/packages/telescope-core/lib/client/templates/menu/menu_component.js
+++ b/packages/telescope-core/lib/client/templates/menu/menu_component.js
@@ -14,26 +14,32 @@ var filterMenuItems = function (menuItems) {
 };
 
 Telescope.utils.getChildMenuItems = function (node) {
+  // don't try to find child menu items if current element doesn't have an id
+  if (node.item._id) {
 
-  var level = node.level;
-  var childLevel = level + 1;
-  var menuItems = node.allMenuItems;
+    var level = node.level;
+    var childLevel = level + 1;
+    var menuItems = filterMenuItems(node.allItems);
 
-  menuItems = filterMenuItems(menuItems);
+    menuItems = _.filter(menuItems, function (item) {
+      // return elements with the correct parentId
+      return item.parentId === node.item._id;
+    });
 
-  menuItems = _.filter(menuItems, function (item) {
-    // return elements with the correct parentId
-    return item.parentId === node._id;
-  });
+    // build "node container" object
+    menuItems = _.map(menuItems, function (item) {
+      return {
+        allItems: node.allItems,
+        level: childLevel,
+        item: item
+      };
+    });
 
-  // decorate child item with their level and a reference to the root level
-  menuItems = _.map(menuItems, function (item) {
-    item.level = childLevel;
-    item.allMenuItems = node.allMenuItems
-    return item;
-  });
+    return menuItems;
 
-  return menuItems;
+  } else {
+    return [];
+  }
 };
 
 // Template.menuComponent.onCreated(function () {
@@ -51,10 +57,13 @@ Template.menuComponent.helpers({
       return typeof item.parentId === "undefined";
     });
     
+    // build "node container" object
     menuItems = _.map(menuItems, function (item) {
-      item.level = 0;
-      item.allMenuItems = allMenuItems;
-      return item;
+      return {
+        allItems: allMenuItems,
+        level: 0,
+        item: item
+      };
     });
     
     return menuItems;
@@ -97,49 +106,47 @@ Template.menuComponent.events({
 });
 
 Template.menuItem.onCreated(function () {
+  var context = this.data;
   // if menu item has a custom template specified, make that template inherit helpers from menuItem
-  if (this.data.template) {
-    Template[this.data.template].inheritsHelpersFrom("menuItem");
+  if (context.item.template) {
+    Template[context.item.template].inheritsHelpersFrom("menuItem");
   }
 });
 
 Template.menuItem.helpers({
   hasTemplate: function () {
-    return !!this.template;
+    return !!this.item.template;
   },
   menuItemData: function () {
     // if a data property is defined, use it for data context. Else default to current item
-    return this.data ? this.data : this;
+    return this.item.data ? this.item.data : this.item;
   },
   itemClass: function () {
     var itemClass = "";
     var currentPath = Router.current().location.get().path ;
 
-    if (this.adminOnly) {
+    if (this.item.adminOnly) {
       itemClass += " item-admin";
     }
-    if (this.route && (getRoute(this) === currentPath || getRoute(this) === Meteor.absoluteUrl() + currentPath.substr(1))) {
+    if (this.item.route && (getRoute(this.item) === currentPath || getRoute(this.item) === Meteor.absoluteUrl() + currentPath.substr(1))) {
       // substr(1) is to avoid having two "/" in the URL
       itemClass += " item-active";
     }
-    if (this.itemClass) {
-      itemClass += " "+this.itemClass;
+    if (this.item.itemClass) {
+      itemClass += " "+this.item.itemClass;
     }
 
     return itemClass;
   },
   itemLabel: function () {
     // if label is a Function return its result, else return i18n'd version of label
-    return typeof this.label === "function" ? this.label() :  i18n.t(this.label);
+    return typeof this.item.label === "function" ? this.item.label() :  i18n.t(this.item.label);
   },
   itemRoute: function () {
-    return getRoute(this);
+    return getRoute(this.item);
   },
   childMenuItems: function () {    
-    if (this._id) { // don't try to find child menu items if current element doesn't have an id
-      var childMenuItems = Telescope.utils.getChildMenuItems(this);
-      return childMenuItems;
-    }
+    return Telescope.utils.getChildMenuItems(this);
   }
 });
 
diff --git a/packages/telescope-posts/lib/routes.js b/packages/telescope-posts/lib/routes.js
index 54a7e03e1..5858479b9 100644
--- a/packages/telescope-posts/lib/routes.js
+++ b/packages/telescope-posts/lib/routes.js
@@ -34,10 +34,11 @@ Posts.controllers.list = RouteController.extend({
   },
 
   getDescription: function () {
-    if (Router.current().route.getName() === 'posts_default') { // return site description on root path
+    var currentRoute = Router.current().route.getName();
+    if (currentRoute === 'posts_default') { // return site description on root path
       return Settings.get('description');
     } else {
-      return i18n.t(_.findWhere(Telescope.menuItems.get("viewsMenu"), {label: this.view}).description);
+      return i18n.t(_.findWhere(Telescope.menuItems.get("viewsMenu"), {route: currentRoute}).description);
     }
   }