From 24537d6e6f4268e6c8205e8c370187aa8f68541f Mon Sep 17 00:00:00 2001
From: Sacha Greif <sacha357@gmail.com>
Date: Sat, 21 Mar 2015 09:43:51 +0900
Subject: [PATCH] simplifying dropdown component

---
 .meteor/packages                              |  2 +-
 .meteor/versions                              |  2 +-
 client/views/forms/quickFormTelescope.js      |  2 --
 client/views/nav/dropdown_component.html      |  6 ------
 client/views/nav/dropdown_component.js        | 20 +++++--------------
 .../lib/client/templates/categories_menu.js   | 15 +++++++-------
 6 files changed, 15 insertions(+), 32 deletions(-)

diff --git a/.meteor/packages b/.meteor/packages
index 4f33043ad..ad4c86b52 100644
--- a/.meteor/packages
+++ b/.meteor/packages
@@ -26,7 +26,7 @@ meteorhacks:fast-render
 meteorhacks:subs-manager
 meteorhacks:npm
 
-aldeed:autoform@5.0.0
+aldeed:autoform@5.0.3
 aldeed:collection2
 aldeed:simple-schema
 aldeed:template-extension
diff --git a/.meteor/versions b/.meteor/versions
index 2efa6ce86..0491a738f 100644
--- a/.meteor/versions
+++ b/.meteor/versions
@@ -5,7 +5,7 @@ accounts-password@1.1.0
 accounts-twitter@1.0.4
 accounts-ui@1.1.5
 accounts-ui-unstyled@1.1.7
-aldeed:autoform@5.0.2
+aldeed:autoform@5.0.3
 aldeed:collection2@2.3.2
 aldeed:simple-schema@1.3.1
 aldeed:template-extension@3.4.3
diff --git a/client/views/forms/quickFormTelescope.js b/client/views/forms/quickFormTelescope.js
index ff1738192..f8cc059eb 100644
--- a/client/views/forms/quickFormTelescope.js
+++ b/client/views/forms/quickFormTelescope.js
@@ -13,7 +13,6 @@ var canEditField = function (field) {
 
 Template[getTemplate('quickForm_telescope')].helpers({
   fieldsWithNoFieldset: function () {
-    console.log(AutoForm.getFormSchema(this.atts.id))
     // get names of fields who don't have an autoform attribute or don't have a group, but are not omitted
     // note: we need to _.map() first to assign the field key to the "name" property to preserve it. 
     var fields = _.pluck(_.filter(_.map(AutoForm.getFormSchema()._schema, function (field, key) {
@@ -45,7 +44,6 @@ Template[getTemplate('quickForm_telescope')].helpers({
   },
   fieldsForFieldset: function () {
     var fieldset = this.toLowerCase();
-
     // get names of fields whose group match the current fieldset
     var fields = _.pluck(_.filter(AutoForm.getFormSchema()._schema, function (field, key) {
       return (field.name.indexOf('$') === -1) && field.autoform && field.autoform.group == fieldset;
diff --git a/client/views/nav/dropdown_component.html b/client/views/nav/dropdown_component.html
index aafe90e6d..cf5c90a43 100644
--- a/client/views/nav/dropdown_component.html
+++ b/client/views/nav/dropdown_component.html
@@ -11,12 +11,6 @@ dropdownItems (Array)
 
 dropdownLabel (String) [optional]
 
-dropdownItemLabel (Function) [optional]
-(Will default to "label" property)
-
-dropdownItemPath (Function) [optional]
-(Will default to "route" property)
-
 -->
 
 <template name="dropdownComponent">
diff --git a/client/views/nav/dropdown_component.js b/client/views/nav/dropdown_component.js
index 9f14cfd03..b8039cdac 100644
--- a/client/views/nav/dropdown_component.js
+++ b/client/views/nav/dropdown_component.js
@@ -20,32 +20,22 @@ Template[getTemplate('dropdownComponent')].helpers({
     return this.length > 3;
   },
   itemLabel: function () {
-    var dropdown = Template.parentData(2);
-    // case 1: if a dropdown label function is provided, use it
-    if (!!dropdown.dropdownItemLabel) {
-      return dropdown.dropdownItemLabel(this);
-    }
-    // case 2: if label is a String, return it
+    // case 1: if label is a String, return it
     if (typeof this.label == "string") {
       return i18n.t(this.label);
     }
-    // case 3: if label is a Function return its result
+    // case 2: if label is a Function return its result
     if (typeof this.label == "function") {
       return this.label()
     } 
   },
   itemPath: function () {
-    var dropdown = Template.parentData(2);
-    // case 1: if a dropdown path function is provided, use it
-    if (!!dropdown.dropdownItemPath) {
-      return dropdown.dropdownItemPath(this);
-    }
-    // case 2: if route is a String, apply Router.path() to it
+    // case 1: if route is a String, apply Router.path() to it
     if (typeof this.route == "string") {
       return Router.path(this.route);
     }
-    // case 3: if route is a Function return its result
-    if (typeof this.route == "string") {
+    // case 2: if route is a Function return its result
+    if (typeof this.route == "function") {
       return this.route()
     }
   }
diff --git a/packages/telescope-tags/lib/client/templates/categories_menu.js b/packages/telescope-tags/lib/client/templates/categories_menu.js
index d5549aad6..81775b321 100644
--- a/packages/telescope-tags/lib/client/templates/categories_menu.js
+++ b/packages/telescope-tags/lib/client/templates/categories_menu.js
@@ -3,13 +3,14 @@ Meteor.startup(function () {
     categoriesMenuData: function () {
       return {
         dropdownName: 'categories',
-        dropdownItems: Categories.find({}, {sort: {order: 1, name: 1}}).fetch(),
-        dropdownItemLabel: function (category) {
-          return category.name;
-        },
-        dropdownItemPath: function (category) {
-          return getCategoryUrl(category.slug);
-        }
+        dropdownItems: _.map(Categories.find({}, {sort: {order: 1, name: 1}}).fetch(), function (category) {
+          return {
+            route: function () {
+              return getCategoryUrl(category.slug);
+            },
+            label: category.name
+          }
+        })
       }
     }
   });