Fix template helper assignment deprecation warning. (#117)

aslagle · Oct 30, 2014 · 4eb69e2 · 4eb69e2
1 parent f972a3c
commit 4eb69e2
Show file tree

Hide file tree

Showing 6 changed files with 66 additions and 57 deletions.
diff --git a/examples/leaderboard/.meteor/versions b/examples/leaderboard/.meteor/versions
@@ -1,6 +1,6 @@
 anti:[email protected]
 [email protected]
-aslagle:[email protected].0
+aslagle:[email protected].2
 [email protected]
 [email protected]
 [email protected]

diff --git a/examples/leaderboard/leaderboard.js b/examples/leaderboard/leaderboard.js
@@ -4,29 +4,33 @@
 Players = new Meteor.Collection("players");
 
 if (Meteor.isClient) {
-  Template.leaderboard.players = function () {
+  Template.leaderboard.helpers({
+    players : function () {
       return Players.find({}, {sort: {score: -1, name: 1}});
-  };
-
-  Template.leaderboard.tableSettings = function () {
-    return {
-        fields: [
-          { key: 'name', label: 'Full Name' },
-          { key: 'name', label: 'First Name', fn: function (name) { return name.split(' ')[0]; } },
-          { key: 'score', label: 'Score' }
-        ],
-        useFontAwesome: true
-    };
-  };
-
-  Template.leaderboard.selected_name = function () {
-    var player = Players.findOne(Session.get("selected_player"));
-    return player && player.name;
-  };
-
-  Template.player.selected = function () {
-    return Session.equals("selected_player", this._id) ? "selected" : '';
-  };
+    },
+
+    tableSettings : function () {
+      return {
+          fields: [
+            { key: 'name', label: 'Full Name' },
+            { key: 'name', label: 'First Name', fn: function (name) { return name.split(' ')[0]; } },
+            { key: 'score', label: 'Score' }
+          ],
+          useFontAwesome: true
+      };
+    },
+
+    selected_name : function () {
+      var player = Players.findOne(Session.get("selected_player"));
+      return player && player.name;
+    }
+  });
+
+  Template.player.helpers({
+    selected : function () {
+      return Session.equals("selected_player", this._id) ? "selected" : '';
+    }
+  });
 
   Template.leaderboard.events({
     'click input.inc': function () {

diff --git a/examples/table-features/.meteor/versions b/examples/table-features/.meteor/versions
@@ -1,6 +1,6 @@
 anti:[email protected]
 [email protected]
-aslagle:[email protected].0
+aslagle:[email protected].2
 [email protected]
 [email protected]
 [email protected]

diff --git a/examples/table-features/table-features.js b/examples/table-features/table-features.js
@@ -1,9 +1,6 @@
 var Tables = new Meteor.Collection('features');
 
 if (Meteor.isClient) {
-  Template.featureComparison.tables = function () {
-    return Tables;
-  };
 
   var checkOrX = function (value) {
     var html;
@@ -28,32 +25,38 @@ if (Meteor.isClient) {
     return new Spacebars.SafeString(html);
   };
 
-  Template.featureComparison.tableSettings = function () {
-    return {
-      rowsPerPage: 5,
-      showNavigation: 'auto',
-      showColumnToggles: true,
-      fields: [
-        {
-          key: 'name',
-          label: 'Library',
-          fn: function (name, object) {
-            var html = '<a name="' + name +'" target="_blank" href="' + object.url + '">' + name + '</a>';
-            return new Spacebars.SafeString(html);
-          }
-        },
-        { key: 'sort', label: 'Sorting', fn: checkOrX },
-        { key: 'pages', label: 'Pagination', fn: checkOrX },
-        { key: 'filter', label: 'Filtering/Search', fn: checkOrX },
-        { key: 'resize', label: 'Resizable Columns', fn: checkOrX },
-        { key: 'edit', label: 'Inline Editing', fn: checkOrX },
-        { key: 'responsive', label: 'Mobile/Responsive', fn: checkOrX, hidden: true },
-        { key: 'i18n', label: 'Internationalization', fn: checkOrX, hidden: true },
-        { key: 'keyboard', label: 'Keyboard navigation', fn: checkOrX, hidden: true },
-        { key: 'meteor', label: 'Meteor Integration', fn: checkOrX, hidden: function () { return true; } }
-      ]
-    };
-  };
+  Template.featureComparison.helpers({
+    tables : function () {
+      return Tables;
+    },
+
+    tableSettings : function () {
+      return {
+        rowsPerPage: 5,
+        showNavigation: 'auto',
+        showColumnToggles: true,
+        fields: [
+          {
+            key: 'name',
+            label: 'Library',
+            fn: function (name, object) {
+              var html = '<a name="' + name +'" target="_blank" href="' + object.url + '">' + name + '</a>';
+              return new Spacebars.SafeString(html);
+            }
+          },
+          { key: 'sort', label: 'Sorting', fn: checkOrX },
+          { key: 'pages', label: 'Pagination', fn: checkOrX },
+          { key: 'filter', label: 'Filtering/Search', fn: checkOrX },
+          { key: 'resize', label: 'Resizable Columns', fn: checkOrX },
+          { key: 'edit', label: 'Inline Editing', fn: checkOrX },
+          { key: 'responsive', label: 'Mobile/Responsive', fn: checkOrX, hidden: true },
+          { key: 'i18n', label: 'Internationalization', fn: checkOrX, hidden: true },
+          { key: 'keyboard', label: 'Keyboard navigation', fn: checkOrX, hidden: true },
+          { key: 'meteor', label: 'Meteor Integration', fn: checkOrX, hidden: function () { return true; } }
+        ]
+      };
+    }
+  });
 }
 
 if (Meteor.isServer) {

diff --git a/lib/reactive_table.js b/lib/reactive_table.js
@@ -216,7 +216,7 @@ Template.reactiveTable.rendered = function () {
     }
 };
 
-Template.reactiveTable.getPageCount = function () {
+var getPageCount = function () {
     var rowsPerPage = this.rowsPerPage.get();
     var filterQuery = getFilterQuery(this.filter.get(), this.fields);
     var count = this.collection.find(filterQuery).count();
@@ -307,6 +307,8 @@ Template.reactiveTable.helpers({
         return this.filter.get() || '';
     },
 
+    'getPageCount' : getPageCount,
+
     'getRowsPerPage' : function () {
         return this.rowsPerPage.get();
     },
@@ -330,7 +332,7 @@ Template.reactiveTable.helpers({
     'showNavigation' : function () {
         if (this.showNavigation === 'always') return true;
         if (this.showNavigation === 'never') return false;
-        return Template.reactiveTable.getPageCount.call(this) > 1;
+        return getPageCount.call(this) > 1;
     }
 });
 
@@ -374,7 +376,7 @@ Template.reactiveTable.events({
 
     'change .reactive-table-navigation .page-number input': function (event) {
         var currentPage = Math.max(~~$(event.target).val(), 1);
-        var pageCount = Template.reactiveTable.getPageCount.call(this);
+        var pageCount = getPageCount.call(this);
         if (currentPage > pageCount) {
           currentPage = pageCount;
         }

diff --git a/package.js b/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "A reactive table designed for Meteor",
-  version: "0.5.1",
+  version: "0.5.2",
   name: "aslagle:reactive-table",
   git: "https://github.com/ecohealthalliance/reactive-table.git"
 });