From 170f183c798576e1d9e105a47834cb6bcb716ab8 Mon Sep 17 00:00:00 2001
From: Pat Buchanan <pat@datanotion.com>
Date: Mon, 11 Jan 2016 11:36:12 -0700
Subject: [PATCH 01/24] Added a noprint class to header and footer section

Added a noprint class to header and footer to allow the user to hide when printing.  Internal ticket LA-75.
---
 lib/reactive_table.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/reactive_table.html b/lib/reactive_table.html
index 9190be2..7a4159b 100644
--- a/lib/reactive_table.html
+++ b/lib/reactive_table.html
@@ -2,7 +2,7 @@
   {{#with context}}
   {{#if ready}}
     <div class="clearfix">
-      <div class="reactive-table-options col-sm-8 pull-right">
+      <div class="reactive-table-options col-sm-8 pull-right noprint">
         {{#if showFilter}}
           <div class="reactive-table-filter form-group col-sm-8 pull-right">
             {{> reactiveTableFilter id=getFilterId useFontAwesome=useFontAwesome}}
@@ -80,7 +80,7 @@
         </tbody>
       </table>
       {{#if showNavigation}}
-        <div class="reactive-table-navigation">
+        <div class="reactive-table-navigation noprint">
           {{#if showNavigationRowsPerPage}}
             <div class="form-inline form-group rows-per-page">
               <label>

From f87125da216e4369051125ecbe01587ad2380e3e Mon Sep 17 00:00:00 2001
From: Pat Buchanan <pat@datanotion.com>
Date: Mon, 11 Jan 2016 11:58:51 -0700
Subject: [PATCH 02/24] Revert "Added a noprint class to header and footer
 section"

This reverts commit 170f183c798576e1d9e105a47834cb6bcb716ab8.
---
 lib/reactive_table.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/reactive_table.html b/lib/reactive_table.html
index 7a4159b..9190be2 100644
--- a/lib/reactive_table.html
+++ b/lib/reactive_table.html
@@ -2,7 +2,7 @@
   {{#with context}}
   {{#if ready}}
     <div class="clearfix">
-      <div class="reactive-table-options col-sm-8 pull-right noprint">
+      <div class="reactive-table-options col-sm-8 pull-right">
         {{#if showFilter}}
           <div class="reactive-table-filter form-group col-sm-8 pull-right">
             {{> reactiveTableFilter id=getFilterId useFontAwesome=useFontAwesome}}
@@ -80,7 +80,7 @@
         </tbody>
       </table>
       {{#if showNavigation}}
-        <div class="reactive-table-navigation noprint">
+        <div class="reactive-table-navigation">
           {{#if showNavigationRowsPerPage}}
             <div class="form-inline form-group rows-per-page">
               <label>

From 97fdaad1bd8f41a9c2ed37d0404a66d994c5bed5 Mon Sep 17 00:00:00 2001
From: Clarence Liu <clarence.hl.liu@gmail.com>
Date: Mon, 2 May 2016 17:51:06 -0700
Subject: [PATCH 03/24] add .idea to ignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 677a6fc..b37e8ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 .build*
+.idea
\ No newline at end of file

From 02b965b9825b697a5d6ac0a9187392c5bd32f745 Mon Sep 17 00:00:00 2001
From: Clarence Liu <clarence.hl.liu@gmail.com>
Date: Tue, 3 May 2016 02:18:58 -0700
Subject: [PATCH 04/24] importing expandable rows code from previous pull
 request as a starting template

---
 README.md               |  5 +++
 lib/reactive_table.css  |  8 +++++
 lib/reactive_table.html | 51 ++++++++++++++++++++++++++-
 lib/reactive_table.js   | 76 +++++++++++++++++++++++++++++++++++++++++
 4 files changed, 139 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b5d91ee..8454959 100644
--- a/README.md
+++ b/README.md
@@ -211,6 +211,11 @@ You can specify a template to use to render cells in a column, by adding `tmpl`
 
 The template's context will be the full object, so it will have access to all fields.
 
+
+It's useful to note that irregardless of what's displayed by tmpl, the `fn` column field is what's used for sorting. 
+This allows you to handle situations where you want a custom value to sort on (`sortByValue` doesn't work) and still
+want the additional formatting provided by a template.
+
 #### Virtual columns
 
 You can also compute a function on the attribute's value to display in the table, by adding `fn` to the field.
diff --git a/lib/reactive_table.css b/lib/reactive_table.css
index 0b9e35e..4d6f5e0 100644
--- a/lib/reactive_table.css
+++ b/lib/reactive_table.css
@@ -69,3 +69,11 @@
 	position: relative;
 	top: 2px;
 }
+
+.reactive-table .reactive-table-children-container {
+    display: none;
+}
+
+.reactive-table-children {
+    width: 100%;
+}
\ No newline at end of file
diff --git a/lib/reactive_table.html b/lib/reactive_table.html
index 8f205ab..9c4b510 100644
--- a/lib/reactive_table.html
+++ b/lib/reactive_table.html
@@ -72,10 +72,59 @@
             <tr class="{{../rowClass this}}">
               {{#each ../fields}}
                 {{#if isVisible}}
-                  <td class="{{getCellClass ..}}">{{#if tmpl}}{{#with ..}}{{> ../tmpl}}{{/with}}{{else}}{{getField ..}}{{/if}}</td>
+                  <td class="{{getCellClass ..}}">
+                    {{#if tmpl}}
+                     {{#with ..}}
+                       {{> ../tmpl}}
+                     {{/with}}
+                    {{else}}
+                      {{#if addChildrenExpandIcon}}
+                        {{#if ../../useFontAwesome}}
+                          <i class="{{../../childrenExpandIconClass}} fa fa-plus-square-o"></i>
+                        {{else}}
+                          <label class="{{../../childrenExpandIconClass}}">&#10133;</label>
+                        {{/if}}
+                      {{/if}}
+                     {{getField ..}}
+                    {{/if}}
+                   </td>
                 {{/if}}
               {{/each}}
             </tr>
+            {{#if ../children}}
+              <tr class="reactive-table-children-container">
+                <td colspan="{{../fields.length}}">
+                  <table class="table reactive-table-children">
+                    <thead>
+                    <tr>
+                      {{#each ../children.fields}}
+                        <th class="{{getHeaderClass}}">
+                          {{label}}
+                        </th>
+                      {{/each}}
+                    </tr>
+                    </thead>
+                    <tbody>
+                    {{#each getChildrenRows}}
+                      <tr>
+                        {{#each ../../children.fields}}
+                          <td class="{{getCellClass ..}}">
+                            {{#if tmpl}}
+                              {{#with ..}}
+                                {{> ../tmpl}}
+                              {{/with}}
+                            {{else}}
+                              {{getField ..}}
+                            {{/if}}
+                          </td>
+                        {{/each}}
+                      </tr>
+                    {{/each}}
+                    </tbody>
+                  </table>
+                </td>
+               </tr>
+              {{/if}}
           {{/each}}
         </tbody>
       </table>
diff --git a/lib/reactive_table.js b/lib/reactive_table.js
index 8e51778..d580bd3 100644
--- a/lib/reactive_table.js
+++ b/lib/reactive_table.js
@@ -289,6 +289,11 @@ var setup = function () {
     }
     context.noDataTmpl = this.data.noDataTmpl || this.data.settings.noDataTmpl;
     context.enableRegex = getDefaultFalseSetting('enableRegex', this.data);
+
+    // TODO: add option for a colSpan container?
+    context.childrenExpandIconClass = this.data.settings.childrenExpandIconClass || 'reactive-table-children-expand';
+    context.children = this.data.settings.children;
+
     context.filterOperator = this.data.filterOperator || this.data.settings.filterOperator || '$and';
 
     var ready;
@@ -518,6 +523,28 @@ Template.reactiveTable.helpers({
         }
     },
 
+    'getChildrenRows': function() {
+        var childrenRows = this[ Template.parentData().children.key ];
+        return childrenRows instanceof Array ? childrenRows : [];
+    },
+    'getChildValue': function() {
+        var data = Template.parentData();
+        return data[ this.key ]
+    },
+    'addChildrenExpandIcon': function() {
+        var context = Template.instance().context;
+        if (context.children != null) {
+            if (context.children.expandFieldId != null) {
+                if (context.children.expandFieldId === this.fieldId) {
+                    return true;
+                }
+            }
+            else if (context.children.key != null && context.children.key === this.key) {
+                return true;
+            }
+        }
+    },
+
     'noData': function () {
         var pageCount = getPageCount.call(this);
         return (pageCount === 0) && this.noDataTmpl;
@@ -614,5 +641,54 @@ Template.reactiveTable.events({
         var currentPage = template.context.currentPage.get();
         template.context.currentPage.set(currentPage + 1);
         template.updateHandle(template.context);
+    },
+
+    'click .reactive-table > tbody > tr > td': function (event) {
+
+        var template = Template.instance();
+
+        var childrenExpandIconClass = template.context.childrenExpandIconClass;
+
+        if (childrenExpandIconClass == null) {
+            return
+        }
+
+        var iconExpand = $(event.currentTarget).find('.' + childrenExpandIconClass);
+
+        if (!iconExpand.length) {
+            return
+        }
+
+        var nextRow = iconExpand.closest( 'tr' ).next( '.reactive-table-children-container' );
+
+        // TODO: if it's a template we need to defer to the tmpl helper
+        if (this.tmpl != null) {
+
+        }
+        else {
+            if (template.context.useFontAwesome){
+                
+                if ( iconExpand.hasClass( 'fa-plus-square-o' ) ){
+                    iconExpand.removeClass( 'fa-plus-square-o' ).addClass( 'fa-minus-square-o' );
+                    nextRow.show();
+                }
+                else {
+                    iconExpand.removeClass( 'fa-minus-square-o' ).addClass( 'fa-plus-square-o' );
+                    nextRow.hide();
+                }
+            }
+            else {
+
+                if ( iconExpand.html() === '➕'){
+                    iconExpand.html('&#10134;');
+                    nextRow.show();
+                }
+                else {
+                    iconExpand.html('&#10133;');
+                    nextRow.hide();
+                }
+            }
+        }
+
     }
 });

From 6b9c6dd6a7ca6b10bb1cef13483c8c9e32a9c862 Mon Sep 17 00:00:00 2001
From: Clarence Liu <clarence.hl.liu@gmail.com>
Date: Sat, 7 May 2016 02:39:01 -0700
Subject: [PATCH 05/24] reactive table children rework

---
 SUBTABLE_README.md      | 11 +++++
 lib/reactive_table.css  |  8 ++--
 lib/reactive_table.html | 90 ++++++++++++++++++++++++-----------------
 lib/reactive_table.js   | 87 ++++++++++++++++++++++++---------------
 4 files changed, 122 insertions(+), 74 deletions(-)
 create mode 100644 SUBTABLE_README.md

diff --git a/SUBTABLE_README.md b/SUBTABLE_README.md
new file mode 100644
index 0000000..e1626e7
--- /dev/null
+++ b/SUBTABLE_README.md
@@ -0,0 +1,11 @@
+
+
+
+
+### Expand Button Setup
+
+There are 3 implementations of the expand button
+ 
+ 
+#### Simple Prepended Icon
+
diff --git a/lib/reactive_table.css b/lib/reactive_table.css
index 4d6f5e0..7a10d13 100644
--- a/lib/reactive_table.css
+++ b/lib/reactive_table.css
@@ -67,13 +67,13 @@
 
 .reactive-table .fa-sort-desc {
 	position: relative;
-	top: 2px;
+  top: 2px;
 }
 
-.reactive-table .reactive-table-children-container {
-    display: none;
+.reactive-table .reactive-table-children-container .error {
+  color: #d9534f;
 }
 
 .reactive-table-children {
-    width: 100%;
+  width: 100%;
 }
\ No newline at end of file
diff --git a/lib/reactive_table.html b/lib/reactive_table.html
index 9c4b510..ba43c62 100644
--- a/lib/reactive_table.html
+++ b/lib/reactive_table.html
@@ -69,61 +69,77 @@
         </thead>
         <tbody>
           {{#each sortedRows}}
-            <tr class="{{../rowClass this}}">
+            <tr class="{{../rowClass this}} reactive-table-row">
               {{#each ../fields}}
                 {{#if isVisible}}
                   <td class="{{getCellClass ..}}">
                     {{#if tmpl}}
-                     {{#with ..}}
-                       {{> ../tmpl}}
-                     {{/with}}
+                      {{#with ..}}
+                        {{#if ../expandButton}}
+                          {{#with extendExpandHelpers}}
+                            {{> ../../tmpl}}
+                          {{/with}}
+                        {{else}}
+                          {{> ../tmpl}}
+                        {{/if}}
+                      {{/with}}
                     {{else}}
-                      {{#if addChildrenExpandIcon}}
+                      {{#if expandButton}}
                         {{#if ../../useFontAwesome}}
                           <i class="{{../../childrenExpandIconClass}} fa fa-plus-square-o"></i>
                         {{else}}
                           <label class="{{../../childrenExpandIconClass}}">&#10133;</label>
                         {{/if}}
                       {{/if}}
-                     {{getField ..}}
+                      {{getField ..}}
                     {{/if}}
                    </td>
                 {{/if}}
               {{/each}}
             </tr>
             {{#if ../children}}
-              <tr class="reactive-table-children-container">
-                <td colspan="{{../fields.length}}">
-                  <table class="table reactive-table-children">
-                    <thead>
-                    <tr>
-                      {{#each ../children.fields}}
-                        <th class="{{getHeaderClass}}">
-                          {{label}}
-                        </th>
-                      {{/each}}
-                    </tr>
-                    </thead>
-                    <tbody>
-                    {{#each getChildrenRows}}
-                      <tr>
-                        {{#each ../../children.fields}}
-                          <td class="{{getCellClass ..}}">
-                            {{#if tmpl}}
-                              {{#with ..}}
-                                {{> ../tmpl}}
-                              {{/with}}
-                            {{else}}
-                              {{getField ..}}
-                            {{/if}}
-                          </td>
+              {{#if isVisibleChild}}
+                <tr class="reactive-table-children-container">
+                  <td colspan="{{../fields.length}}">
+                    {{#if ../children/fields}}
+                      <table class="table reactive-table-children">
+                        <thead>
+                        <tr>
+                          {{#each ../children.fields}}
+                            <th class="{{getHeaderClass}}">
+                              {{label}}
+                            </th>
+                          {{/each}}
+                        </tr>
+                        </thead>
+                        <tbody>
+                        {{#each getChildrenRows}}
+                          <tr>
+                            {{#each ../../children.fields}}
+                              <td class="{{getCellClass ..}}">
+                                {{#if tmpl}}
+                                  {{#with ..}}
+                                    {{> ../tmpl}}
+                                  {{/with}}
+                                {{else}}
+                                  {{getField ..}}
+                                {{/if}}
+                              </td>
+                            {{/each}}
+                          </tr>
                         {{/each}}
-                      </tr>
-                    {{/each}}
-                    </tbody>
-                  </table>
-                </td>
-               </tr>
+                        </tbody>
+                      </table>
+                    {{else}}
+                      {{#if getChildrenTmpl}}
+                        {{> getChildrenTmpl getChildrenTmplData}}
+                      {{else}}
+                        <span class="error">if children field exists, you must have defined either tmpl or fields</span>
+                      {{/if}}
+                    {{/if}}
+                  </td>
+                 </tr>
+                {{/if}}
               {{/if}}
           {{/each}}
         </tbody>
diff --git a/lib/reactive_table.js b/lib/reactive_table.js
index d580bd3..cb2bebe 100644
--- a/lib/reactive_table.js
+++ b/lib/reactive_table.js
@@ -107,6 +107,7 @@ var setup = function () {
     context.templateData = this.data;
     this.data.settings = this.data.settings || {};
     var collection = this.data.collection || this.data.settings.collection || this.data;
+    var hasChildren = false;
 
     if (!(collection instanceof Mongo.Collection)) {
         if (_.isArray(collection)) {
@@ -214,9 +215,15 @@ var setup = function () {
     var visibleFields = [];
     _.each(fields, function (field, i) {
         visibleFields.push({fieldId:field.fieldId, isVisible: getDefaultFieldVisibility(field)});
+        if (!!field.expandButton) {
+            hasChildren = true;
+        }
     });
     context.visibleFields = (!_.isUndefined(oldContext.visibleFields) && !_.isEmpty(oldContext.visibleFields)) ? oldContext.visibleFields : new ReactiveVar(visibleFields);
 
+    if (hasChildren) {
+        context.visibleChildren = new ReactiveVar([]);
+    }
 
     var rowClass = this.data.rowClass || this.data.settings.rowClass || function() {return '';};
     if (typeof rowClass === 'string') {
@@ -290,7 +297,6 @@ var setup = function () {
     context.noDataTmpl = this.data.noDataTmpl || this.data.settings.noDataTmpl;
     context.enableRegex = getDefaultFalseSetting('enableRegex', this.data);
 
-    // TODO: add option for a colSpan container?
     context.childrenExpandIconClass = this.data.settings.childrenExpandIconClass || 'reactive-table-children-expand';
     context.children = this.data.settings.children;
 
@@ -524,27 +530,13 @@ Template.reactiveTable.helpers({
     },
 
     'getChildrenRows': function() {
-        var childrenRows = this[ Template.parentData().children.key ];
+        var childrenRows = this[ Template.parentData().children.dataField ];
         return childrenRows instanceof Array ? childrenRows : [];
     },
     'getChildValue': function() {
         var data = Template.parentData();
         return data[ this.key ]
     },
-    'addChildrenExpandIcon': function() {
-        var context = Template.instance().context;
-        if (context.children != null) {
-            if (context.children.expandFieldId != null) {
-                if (context.children.expandFieldId === this.fieldId) {
-                    return true;
-                }
-            }
-            else if (context.children.key != null && context.children.key === this.key) {
-                return true;
-            }
-        }
-    },
-
     'noData': function () {
         var pageCount = getPageCount.call(this);
         return (pageCount === 0) && this.noDataTmpl;
@@ -575,7 +567,45 @@ Template.reactiveTable.helpers({
         if (this.showNavigation === 'never') return false;
         return getPageCount.call(this) > 1;
     },
-    'getRowCount': getRowCount
+    'getRowCount': getRowCount,
+
+    'getChildrenTmpl': function () {
+        return Template.instance().context.children != null &&
+            Template.instance().context.children.tmpl
+    },
+    'getChildrenTmplData': function () {
+        //debugger;
+        return {test: 'apple'}
+    },
+    'extendExpandHelpers': function () {
+
+        var template = Template.instance();
+
+        return _.extend({
+
+            'expandChildren': function () {
+                if (template.context.visibleChildren) {
+                    var visibleChildren = template.context.visibleChildren.get();
+                    visibleChildren.push(this._id);
+                    template.context.visibleChildren.set(visibleChildren);
+                }
+            },
+            'collapseChildren': function() {
+                if (template.context.visibleChildren) {
+                    var visibleChildren = template.context.visibleChildren.get();
+                    visibleChildren = _.without( visibleChildren, this._id );
+                    template.context.visibleChildren.set(visibleChildren);
+                }
+            }
+
+        }, this)
+    },
+    isVisibleChild: function () {
+        if (Template.instance().context.visibleChildren) {
+            var visibleChildren = Template.instance().context.visibleChildren.get();
+            return _.indexOf(visibleChildren, this._id) >= 0
+        }
+    }
 });
 
 Template.reactiveTable.events({
@@ -645,27 +675,18 @@ Template.reactiveTable.events({
 
     'click .reactive-table > tbody > tr > td': function (event) {
 
-        var template = Template.instance();
-
-        var childrenExpandIconClass = template.context.childrenExpandIconClass;
+        if (!this.tmpl){
 
-        if (childrenExpandIconClass == null) {
-            return
-        }
+            var template = Template.instance();
 
-        var iconExpand = $(event.currentTarget).find('.' + childrenExpandIconClass);
+            var iconExpand = $(event.currentTarget).find('.' + template.context.childrenExpandIconClass);
 
-        if (!iconExpand.length) {
-            return
-        }
-
-        var nextRow = iconExpand.closest( 'tr' ).next( '.reactive-table-children-container' );
+            if (!iconExpand.length) {
+                return
+            }
 
-        // TODO: if it's a template we need to defer to the tmpl helper
-        if (this.tmpl != null) {
+            var nextRow = iconExpand.closest( 'tr.reactive-table-row' ).next( '.reactive-table-children-container' );
 
-        }
-        else {
             if (template.context.useFontAwesome){
                 
                 if ( iconExpand.hasClass( 'fa-plus-square-o' ) ){

From a46e6fd40057ae16702943b291f74cdd6bffc687 Mon Sep 17 00:00:00 2001
From: Clarence Liu <clarence.hl.liu@gmail.com>
Date: Sat, 7 May 2016 03:52:39 -0700
Subject: [PATCH 06/24] bugs fixes and documentation

---
 CHILD_TABLE_README.md   | 187 ++++++++++++++++++++++++++++++++++++++++
 SUBTABLE_README.md      |  11 ---
 lib/reactive_table.css  |   4 +
 lib/reactive_table.html |   8 +-
 lib/reactive_table.js   |  42 ++++-----
 5 files changed, 216 insertions(+), 36 deletions(-)
 create mode 100644 CHILD_TABLE_README.md
 delete mode 100644 SUBTABLE_README.md

diff --git a/CHILD_TABLE_README.md b/CHILD_TABLE_README.md
new file mode 100644
index 0000000..8edda19
--- /dev/null
+++ b/CHILD_TABLE_README.md
@@ -0,0 +1,187 @@
+
+# Child (Sub) Tables
+
+This guide shows how to add child/sub tables, this simply inserts a new row when expanded.
+You can control the expand/collapse control and render an array on your data structure or
+simply pass in a template for the sub table and handle it yourself.
+
+*Note: This currently does not work with sorting or server side paging, only use this with static data*
+
+
+**Requirements:**
+
+- Your data must have a unique `_id` field, if you're using a Collection this shouldn't be an issue
+
+
+### Expand Button Setup
+
+There are 2 implementations of the expand button
+ 
+ 
+#### Simple Prepended Icon
+
+On any field you can add the setting `expandButton`
+
+Set `useFontAwesome = true` in the settings for a better icon
+[https://github.com/aslagle/reactive-table#settings](https://github.com/aslagle/reactive-table#settings)
+
+
+
+    fields: [
+    
+      {
+        key: 'store_name',
+        label: 'Store Name',
+        expandButton: true
+      },
+      ...
+    ]
+
+By itself this will prepend an expand/collapse icon to the cell.
+
+This respects the virtual column's `fn` function, if you use this it will prepend the icon to the result.
+
+
+
+#### Custom Expand Button Template
+
+First `expandButton` must be set to true, and if you are using a Template, 
+we will automatically pass in to the template data two helper functions
+ 
+- `expandChildren` - show the child / sub table
+- `collapseChildren` - hide the above
+
+For example I can pass in my own template:
+
+    fields: [
+        
+          {
+            key: 'store_name',
+            label: 'Store Name',
+            expandButton: true,
+            tmpl: Template.StoreExpandCell
+          },
+          ...
+        ]
+
+And then in my template I can create an event, where `this.expandChildren` and `this.collapseChildren()`
+are accessible. You can save your state however you wish, in my case I am using the DOM.
+    
+    
+    Template.StoreExpandCell.events({
+    
+      'click .my-expand-control': function( ev, t ){
+    
+        var divContainer = $(ev.currentTarget);
+        var iconExpand = divContainer.find('.expand-icon');
+    
+        if (!!divContainer.data('expanded')) {
+          iconExpand.removeClass( 'fa-minus-square-o' ).addClass( 'fa-plus-square-o' );
+          divContainer.data('expanded', false);
+          this.collapseChildren();
+        }
+        else {
+          iconExpand.removeClass( 'fa-plus-square-o' ).addClass( 'fa-minus-square-o' );
+          divContainer.data('expanded', true);
+          this.expandChildren();
+        }
+    
+      }
+    
+    });
+    
+    
+### Child/Sub Table Setup
+ 
+You have two options for the contents of the child table, either a simple table rendered with the default reactive-table fields options
+or a custom template
+
+The child table settings are added with the reactive-table setting `children` 
+
+
+#### Child Table
+
+For a child table you need two settings in `children`, these are `dataField` and `fields` 
+
+`dataField` - this must be a field referencing an array of structs, for example if I have the following data
+ 
+    [
+      {
+        _id: 1,
+        store_name: 'ABC Store',
+        store_locations: [
+          {
+            _id: 1000,
+            city: 'San Francisco'
+          },
+          ...
+        ]
+      },
+      {
+        _id: 2,
+        store_name: 'Tom\'s Hardware'
+        store_locations: [
+          {
+            _id: 1001,
+            city: 'New York'
+          }
+          ...
+        ]
+      }
+      ...
+    ]
+
+
+
+`fields` - similar to the `fields` setting on the parent table, all the same functionality is retained such as
+virtual columns, templates and styling options
+
+
+    fields: [
+        
+      {
+        key: 'store_name',
+        label: 'Store Name',
+        expandButton: true,
+        tmpl: Template.StoreExpandCell
+      },
+      ...
+    ],
+    
+    children: {
+      dataField: 'store_locations',
+      fields: [
+        {
+          key: 'city',
+          label: 'Location'
+        }
+        ...
+      ]
+    }
+
+
+
+#### Custom Template
+
+Simply add the template to a `children` field, and the entire data object will be passed into your specified template
+for you to reference
+
+    fields: [
+        
+      {
+        key: 'store_name',
+        label: 'Store Name',
+        expandButton: true,
+        tmpl: Template.StoreExpandCell
+      },
+      ...
+    ],
+    
+    children: {
+      tmpl: Template.StoreLocations
+    }
+    
+
+
+
+
diff --git a/SUBTABLE_README.md b/SUBTABLE_README.md
deleted file mode 100644
index e1626e7..0000000
--- a/SUBTABLE_README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-### Expand Button Setup
-
-There are 3 implementations of the expand button
- 
- 
-#### Simple Prepended Icon
-
diff --git a/lib/reactive_table.css b/lib/reactive_table.css
index 7a10d13..9ae6c38 100644
--- a/lib/reactive_table.css
+++ b/lib/reactive_table.css
@@ -70,6 +70,10 @@
   top: 2px;
 }
 
+.reactive-table .reactive-table-children-expand {
+    cursor: pointer;
+}
+
 .reactive-table .reactive-table-children-container .error {
   color: #d9534f;
 }
diff --git a/lib/reactive_table.html b/lib/reactive_table.html
index ba43c62..3d2591b 100644
--- a/lib/reactive_table.html
+++ b/lib/reactive_table.html
@@ -86,9 +86,9 @@
                     {{else}}
                       {{#if expandButton}}
                         {{#if ../../useFontAwesome}}
-                          <i class="{{../../childrenExpandIconClass}} fa fa-plus-square-o"></i>
+                          <i class="{{../../childrenExpandIconClass}} fa fa-plus-square-o" data-id="{{../_id}}"></i>
                         {{else}}
-                          <label class="{{../../childrenExpandIconClass}}">&#10133;</label>
+                          <label class="{{../../childrenExpandIconClass}}" data-id="{{../_id}}">&#10133;</label>
                         {{/if}}
                       {{/if}}
                       {{getField ..}}
@@ -131,8 +131,8 @@
                         </tbody>
                       </table>
                     {{else}}
-                      {{#if getChildrenTmpl}}
-                        {{> getChildrenTmpl getChildrenTmplData}}
+                      {{#if ../children/tmpl}}
+                        {{> ../children/tmpl}}
                       {{else}}
                         <span class="error">if children field exists, you must have defined either tmpl or fields</span>
                       {{/if}}
diff --git a/lib/reactive_table.js b/lib/reactive_table.js
index cb2bebe..0975b43 100644
--- a/lib/reactive_table.js
+++ b/lib/reactive_table.js
@@ -215,7 +215,7 @@ var setup = function () {
     var visibleFields = [];
     _.each(fields, function (field, i) {
         visibleFields.push({fieldId:field.fieldId, isVisible: getDefaultFieldVisibility(field)});
-        if (!!field.expandButton) {
+        if (!!field.expandButton && context.templateData.settings.children) {
             hasChildren = true;
         }
     });
@@ -223,6 +223,8 @@ var setup = function () {
 
     if (hasChildren) {
         context.visibleChildren = new ReactiveVar([]);
+        context.childrenExpandIconClass = this.data.settings.childrenExpandIconClass || 'reactive-table-children-expand';
+        context.children = this.data.settings.children;
     }
 
     var rowClass = this.data.rowClass || this.data.settings.rowClass || function() {return '';};
@@ -296,10 +298,6 @@ var setup = function () {
     }
     context.noDataTmpl = this.data.noDataTmpl || this.data.settings.noDataTmpl;
     context.enableRegex = getDefaultFalseSetting('enableRegex', this.data);
-
-    context.childrenExpandIconClass = this.data.settings.childrenExpandIconClass || 'reactive-table-children-expand';
-    context.children = this.data.settings.children;
-
     context.filterOperator = this.data.filterOperator || this.data.settings.filterOperator || '$and';
 
     var ready;
@@ -533,10 +531,6 @@ Template.reactiveTable.helpers({
         var childrenRows = this[ Template.parentData().children.dataField ];
         return childrenRows instanceof Array ? childrenRows : [];
     },
-    'getChildValue': function() {
-        var data = Template.parentData();
-        return data[ this.key ]
-    },
     'noData': function () {
         var pageCount = getPageCount.call(this);
         return (pageCount === 0) && this.noDataTmpl;
@@ -573,10 +567,6 @@ Template.reactiveTable.helpers({
         return Template.instance().context.children != null &&
             Template.instance().context.children.tmpl
     },
-    'getChildrenTmplData': function () {
-        //debugger;
-        return {test: 'apple'}
-    },
     'extendExpandHelpers': function () {
 
         var template = Template.instance();
@@ -605,7 +595,8 @@ Template.reactiveTable.helpers({
             var visibleChildren = Template.instance().context.visibleChildren.get();
             return _.indexOf(visibleChildren, this._id) >= 0
         }
-    }
+    },
+    getTest: function(){debugger}
 });
 
 Template.reactiveTable.events({
@@ -678,37 +669,46 @@ Template.reactiveTable.events({
         if (!this.tmpl){
 
             var template = Template.instance();
-
             var iconExpand = $(event.currentTarget).find('.' + template.context.childrenExpandIconClass);
-
             if (!iconExpand.length) {
                 return
             }
 
-            var nextRow = iconExpand.closest( 'tr.reactive-table-row' ).next( '.reactive-table-children-container' );
+            var dataId = iconExpand.data('id');
+            var visibleChildren = template.context.visibleChildren.get();
+            var show;
 
             if (template.context.useFontAwesome){
                 
                 if ( iconExpand.hasClass( 'fa-plus-square-o' ) ){
                     iconExpand.removeClass( 'fa-plus-square-o' ).addClass( 'fa-minus-square-o' );
-                    nextRow.show();
+                    show = true;
                 }
                 else {
                     iconExpand.removeClass( 'fa-minus-square-o' ).addClass( 'fa-plus-square-o' );
-                    nextRow.hide();
+                    show = false;
                 }
             }
             else {
 
                 if ( iconExpand.html() === '➕'){
                     iconExpand.html('&#10134;');
-                    nextRow.show();
+                    show = true;
                 }
                 else {
                     iconExpand.html('&#10133;');
-                    nextRow.hide();
+                    show = false;
                 }
             }
+
+            if (show) {
+                visibleChildren.push(dataId);
+            }
+            else {
+                visibleChildren = _.without(visibleChildren, dataId);
+            }
+
+            template.context.visibleChildren.set(visibleChildren);
         }
 
     }

From 334d0749e7e7bc731d7d8d72536f76645d3a2275 Mon Sep 17 00:00:00 2001
From: Clarence Liu <clarence.hl.liu@gmail.com>
Date: Sat, 7 May 2016 03:59:15 -0700
Subject: [PATCH 07/24] bugs fixes and documentation

---
 CHILD_TABLE_README.md | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/CHILD_TABLE_README.md b/CHILD_TABLE_README.md
index 8edda19..0940bd0 100644
--- a/CHILD_TABLE_README.md
+++ b/CHILD_TABLE_README.md
@@ -13,6 +13,8 @@ simply pass in a template for the sub table and handle it yourself.
 - Your data must have a unique `_id` field, if you're using a Collection this shouldn't be an issue
 
 
+---
+
 ### Expand Button Setup
 
 There are 2 implementations of the expand button
@@ -64,7 +66,7 @@ For example I can pass in my own template:
           ...
         ]
 
-And then in my template I can create an event, where `this.expandChildren` and `this.collapseChildren()`
+And then in my template I can create an event, where functions `this.expandChildren` and `this.collapseChildren`
 are accessible. You can save your state however you wish, in my case I am using the DOM.
     
     
@@ -91,6 +93,9 @@ are accessible. You can save your state however you wish, in my case I am using
     });
     
     
+---
+    
+    
 ### Child/Sub Table Setup
  
 You have two options for the contents of the child table, either a simple table rendered with the default reactive-table fields options
@@ -103,7 +108,9 @@ The child table settings are added with the reactive-table setting `children`
 
 For a child table you need two settings in `children`, these are `dataField` and `fields` 
 
-`dataField` - this must be a field referencing an array of structs, for example if I have the following data
+`dataField` - this must be a field referencing an array of structs, for example if I have the following data, 
+you may notice that `store_locations` is actually an array, I don't reference it in my parent table `fields`
+setting, and plan to use it to iterate over and generate my child table.
  
     [
       {
@@ -122,8 +129,16 @@ For a child table you need two settings in `children`, these are `dataField` and
         store_name: 'Tom\'s Hardware'
         store_locations: [
           {
-            _id: 1001,
+            _id: 2000
+            city: 'Chicago'
+          },
+          {
+            _id: 2001,
             city: 'New York'
+          },
+          {
+            _id: 2002,
+            city: 'Los Angeles'
           }
           ...
         ]
@@ -134,7 +149,8 @@ For a child table you need two settings in `children`, these are `dataField` and
 
 
 `fields` - similar to the `fields` setting on the parent table, all the same functionality is retained such as
-virtual columns, templates and styling options
+virtual columns, templates and styling options. It will iterate over the array referenced by the key `dataField`
+and generate a row for each iteration with the `children.fields` specification.
 
 
     fields: [

From 226af7851a7fbf6a4060d2bba0437cb45f41be3d Mon Sep 17 00:00:00 2001
From: Clarence Liu <clarence.hl.liu@gmail.com>
Date: Fri, 13 May 2016 14:08:52 -0700
Subject: [PATCH 08/24] readme

---
 CHILD_TABLE_README.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/CHILD_TABLE_README.md b/CHILD_TABLE_README.md
index 0940bd0..124a2c1 100644
--- a/CHILD_TABLE_README.md
+++ b/CHILD_TABLE_README.md
@@ -5,8 +5,6 @@ This guide shows how to add child/sub tables, this simply inserts a new row when
 You can control the expand/collapse control and render an array on your data structure or
 simply pass in a template for the sub table and handle it yourself.
 
-*Note: This currently does not work with sorting or server side paging, only use this with static data*
-
 
 **Requirements:**
 

From d93c644d4b1373cc8c101936807461e6d27215ff Mon Sep 17 00:00:00 2001
From: Clarence Liu <clarence.hl.liu@gmail.com>
Date: Mon, 30 May 2016 16:06:15 -0700
Subject: [PATCH 09/24] Rename

---
 lib/reactive_table.html | 2 +-
 lib/reactive_table.js   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/reactive_table.html b/lib/reactive_table.html
index 3d2591b..aff1ba7 100644
--- a/lib/reactive_table.html
+++ b/lib/reactive_table.html
@@ -1,4 +1,4 @@
-<template name="reactiveTable">
+<template name="reactiveTable2">
   {{#with context}}
   {{#if ready}}
     <div class="clearfix">
diff --git a/lib/reactive_table.js b/lib/reactive_table.js
index 0975b43..1356e28 100644
--- a/lib/reactive_table.js
+++ b/lib/reactive_table.js
@@ -345,7 +345,7 @@ var getPageCount = function () {
     return Math.ceil(count / rowsPerPage);
 };
 
-Template.reactiveTable.onCreated(function() {
+Template.reactiveTable2.onCreated(function() {
    this.updateHandle = _.debounce(updateHandle, 200);
 
    var rowsPerPage = this.data.rowsPerPage || (this.data.settings && this.data.settings.rowsPerPage);
@@ -374,13 +374,13 @@ Template.reactiveTable.onCreated(function() {
    });
 });
 
-Template.reactiveTable.onDestroyed(function() {
+Template.reactiveTable2.onDestroyed(function() {
   if (this.context.server && this.context.handle) {
     this.context.handle.stop();
   }
 });
 
-Template.reactiveTable.helpers({
+Template.reactiveTable2.helpers({
     'context': function () {
         if (!Template.instance().context ||
             !_.isEqual(this, Template.instance().context.templateData)) {
@@ -599,7 +599,7 @@ Template.reactiveTable.helpers({
     getTest: function(){debugger}
 });
 
-Template.reactiveTable.events({
+Template.reactiveTable2.events({
     'click .reactive-table .sortable': function (event) {
         var template = Template.instance();
         var target = $(event.currentTarget);

From 92f14abffcb66251a67d36d9f4abf4e0a2306080 Mon Sep 17 00:00:00 2001
From: Clarence Liu <clarence.hl.liu@gmail.com>
Date: Mon, 30 May 2016 16:08:32 -0700
Subject: [PATCH 10/24] Rename

---
 lib/filter.js         | 10 +++++-----
 lib/reactive_table.js |  6 +++---
 lib/server.js         |  6 +++---
 package.js            |  4 ++--
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/lib/filter.js b/lib/filter.js
index f1a2e11..ae6e4ef 100644
--- a/lib/filter.js
+++ b/lib/filter.js
@@ -131,12 +131,12 @@ getFilterQuery = function (filterInputs, filterFields, settings) {
 };
 
 if (Meteor.isClient) {
-  ReactiveTable = ReactiveTable || {};
+  ReactiveTable2 = ReactiveTable2 || {};
 
   var reactiveTableFilters = {};
   var callbacks = {};
 
-  ReactiveTable.Filter = function (id, fields) {
+  ReactiveTable2.Filter = function (id, fields) {
     if (reactiveTableFilters[id]) {
         return reactiveTableFilters[id];
     }
@@ -159,7 +159,7 @@ if (Meteor.isClient) {
     reactiveTableFilters[id] = this;
   };
     
-  ReactiveTable.clearFilters = function (filterIds) {
+  ReactiveTable2.clearFilters = function (filterIds) {
     _.each(filterIds, function (filterId) {
       if (reactiveTableFilters[filterId]) {
         reactiveTableFilters[filterId].set('');
@@ -179,7 +179,7 @@ if (Meteor.isClient) {
   getFilterStrings = function (filterIds) {
     return _.map(filterIds, function (filterId) {
       if (_.isUndefined(reactiveTableFilters[filterId])) {
-        reactiveTableFilters[filterId] = new ReactiveTable.Filter(filterId);
+        reactiveTableFilters[filterId] = new ReactiveTable2.Filter(filterId);
       }
       return reactiveTableFilters[filterId].get();
     });
@@ -204,7 +204,7 @@ if (Meteor.isClient) {
     
     'filter': function () {
       if (_.isUndefined(reactiveTableFilters[this.id])) {
-        new ReactiveTable.Filter(this.id, this.fields);
+        new ReactiveTable2.Filter(this.id, this.fields);
       } else if (_.isUndefined(reactiveTableFilters[this.id].fields)) {
         reactiveTableFilters[this.id].fields = this.fields;
       }
diff --git a/lib/reactive_table.js b/lib/reactive_table.js
index 1356e28..4eb61ae 100644
--- a/lib/reactive_table.js
+++ b/lib/reactive_table.js
@@ -1,4 +1,4 @@
-var ReactiveTableCounts = new Mongo.Collection("reactive-table-counts");
+var ReactiveTable2Counts = new Mongo.Collection("reactive-table-counts");
 
 get = function(obj, field) {
   var keys = field.split('.');
@@ -58,7 +58,7 @@ var updateHandle = function (set_context) {
             }
         };
         var onError = function (error) {
-            console.log("ReactiveTable subscription error: " + error);
+            console.log("ReactiveTable2 subscription error: " + error);
         };
         newHandle = Meteor.subscribe(
             "reactive-table-" + context.collection,
@@ -331,7 +331,7 @@ var getDefaultFieldVisibility = function (field) {
 
 var getRowCount = function () {
     if (this.server) {
-        var count = ReactiveTableCounts.findOne(this.publicationId.get());
+        var count = ReactiveTable2Counts.findOne(this.publicationId.get());
         return (count ? count.count : 0);
     } else {
         var filterQuery = getFilterQuery(getFilterStrings(this.filters.get()), getFilterFields(this.filters.get(), this.fields), {enableRegex: this.enableRegex, filterOperator: this.filterOperator});
diff --git a/lib/server.js b/lib/server.js
index 81da57b..09e426b 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -1,6 +1,6 @@
-ReactiveTable = {};
+ReactiveTable2 = {};
 
-ReactiveTable.publish = function (name, collectionOrFunction, selectorOrFunction, settings) {
+ReactiveTable2.publish = function (name, collectionOrFunction, selectorOrFunction, settings) {
     Meteor.publish("reactive-table-" + name, function (publicationId, filters, fields, options, rowsPerPage) {
       check(publicationId, String);
       check(filters, [Match.OneOf(String, Object, Mongo.ObjectID)]);
@@ -18,7 +18,7 @@ ReactiveTable.publish = function (name, collectionOrFunction, selectorOrFunction
       }
 
       if (!(collection instanceof Mongo.Collection)) {
-        console.log("ReactiveTable.publish: no collection to publish");
+        console.log("ReactiveTable2.publish: no collection to publish");
         return [];
       }
 
diff --git a/package.js b/package.js
index 55ccea4..4d95204 100644
--- a/package.js
+++ b/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   summary: "A reactive table designed for Meteor",
   version: "0.8.29",
-  name: "aslagle:reactive-table",
+  name: "aslagle:reactive-table-2",
   git: "https://github.com/aslagle/reactive-table.git"
 });
 
@@ -27,7 +27,7 @@ Package.on_use(function (api) {
     api.add_files('lib/filter.js', ['client', 'server']);
     api.add_files('lib/server.js', 'server');
 
-    api.export("ReactiveTable", ["client", "server"]);
+    api.export("ReactiveTable2", ["client", "server"]);
 });
 
 Package.on_test(function (api) {

From f1ab4c1b726e170f1d0bdcca66b74f677b9f9d7b Mon Sep 17 00:00:00 2001
From: Clarence Liu <clarence.hl.liu@gmail.com>
Date: Mon, 30 May 2016 16:18:41 -0700
Subject: [PATCH 11/24] more renaming

---
 lib/filter.html             |  2 +-
 lib/filter.js               |  4 ++--
 lib/reactive_table.html     |  2 +-
 lib/reactive_table.js       |  4 ++--
 lib/server.js               | 14 +++++++-------
 package.js                  |  3 +--
 test/test_custom_filters.js | 34 +++++++++++++++++-----------------
 7 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/lib/filter.html b/lib/filter.html
index 8534d07..f4a5dbc 100644
--- a/lib/filter.html
+++ b/lib/filter.html
@@ -1,4 +1,4 @@
-<template name="reactiveTableFilter">
+<template name="reactiveTableFilter2">
   <div id="{{id}}" class="{{class}}">
     <span class="input-group-addon">
       {{#if useFontAwesome}}
diff --git a/lib/filter.js b/lib/filter.js
index ae6e4ef..a99dba4 100644
--- a/lib/filter.js
+++ b/lib/filter.js
@@ -197,7 +197,7 @@ if (Meteor.isClient) {
     });
   };
 
-  Template.reactiveTableFilter.helpers({
+  Template.reactiveTableFilter2.helpers({
     'class': function () {
       return this.class || 'input-group';
     },
@@ -216,7 +216,7 @@ if (Meteor.isClient) {
     reactiveTableFilters[template.data.id].set(filterText);
   }, 200);
 
-  Template.reactiveTableFilter.events({
+  Template.reactiveTableFilter2.events({
     'keyup .reactive-table-input, input .reactive-table-input': function (event) {
       var template = Template.instance();
       var filterText = $(event.target).val();
diff --git a/lib/reactive_table.html b/lib/reactive_table.html
index aff1ba7..dfa7892 100644
--- a/lib/reactive_table.html
+++ b/lib/reactive_table.html
@@ -5,7 +5,7 @@
       <div class="reactive-table-options col-sm-8 pull-right">
         {{#if showFilter}}
           <div class="reactive-table-filter form-group col-sm-8 pull-right">
-            {{> reactiveTableFilter id=getFilterId useFontAwesome=useFontAwesome}}
+            {{> reactiveTableFilter2 id=getFilterId useFontAwesome=useFontAwesome}}
           </div>
         {{/if}}
         {{#if showColumnToggles}}
diff --git a/lib/reactive_table.js b/lib/reactive_table.js
index 4eb61ae..47c20e0 100644
--- a/lib/reactive_table.js
+++ b/lib/reactive_table.js
@@ -1,4 +1,4 @@
-var ReactiveTable2Counts = new Mongo.Collection("reactive-table-counts");
+var ReactiveTable2Counts = new Mongo.Collection("reactive-table-counts-2");
 
 get = function(obj, field) {
   var keys = field.split('.');
@@ -26,7 +26,7 @@ var updateHandle = function (set_context) {
         // page until the new data is ready, so it doesn't move around
         // while rows are added and removed
         var publicationId = _.uniqueId();
-        var newPublishedRows = new Mongo.Collection('reactive-table-rows-' + publicationId);
+        var newPublishedRows = new Mongo.Collection('reactive-table-rows-2-' + publicationId);
         context.nextPublicationId.set(publicationId);
 
         var rowsPerPage = context.rowsPerPage.get();
diff --git a/lib/server.js b/lib/server.js
index 09e426b..16dc55e 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -57,19 +57,19 @@ ReactiveTable2.publish = function (name, collectionOrFunction, selectorOrFunctio
           var oldRow = rows[row._id];
           if (oldRow) {
             if (!_.isEqual(oldRow, row)) {
-              self.changed("reactive-table-rows-" + publicationId, row._id, row);
+              self.changed("reactive-table-rows-2-" + publicationId, row._id, row);
               rows[row._id] = row;
             }
           } else {
-            self.added("reactive-table-rows-" + publicationId, row._id, row);
+            self.added("reactive-table-rows-2-" + publicationId, row._id, row);
             rows[row._id] = row;
           }
         });
       };
 
-      self.added("reactive-table-counts", publicationId, {count: count});
+      self.added("reactive-table-counts-2", publicationId, {count: count});
       _.each(rows, function (row) {
-        self.added("reactive-table-rows-" + publicationId, row._id, row);
+        self.added("reactive-table-rows-2-" + publicationId, row._id, row);
       });
 
       var initializing = true;
@@ -82,7 +82,7 @@ ReactiveTable2.publish = function (name, collectionOrFunction, selectorOrFunctio
         },
 
         removed: function (id, fields) {
-          self.removed("reactive-table-rows-" + publicationId, id);
+          self.removed("reactive-table-rows-2-" + publicationId, id);
           delete rows[id];
           updateRows();
         },
@@ -96,12 +96,12 @@ ReactiveTable2.publish = function (name, collectionOrFunction, selectorOrFunctio
       var countHandle = fullCursor.observeChanges({
           added: function (id, fields) {
               if (!initializing) {
-                  self.changed("reactive-table-counts", publicationId, {count: fullCursor.count()});                  
+                  self.changed("reactive-table-counts-2", publicationId, {count: fullCursor.count()});
               }
           },
 
           removed: function (id, fields) {
-              self.changed("reactive-table-counts", publicationId, {count: fullCursor.count()});          
+              self.changed("reactive-table-counts-2", publicationId, {count: fullCursor.count()});
           }
       });
       initializing = false;
diff --git a/package.js b/package.js
index 4d95204..7e1cf2a 100644
--- a/package.js
+++ b/package.js
@@ -1,8 +1,7 @@
 Package.describe({
   summary: "A reactive table designed for Meteor",
   version: "0.8.29",
-  name: "aslagle:reactive-table-2",
-  git: "https://github.com/aslagle/reactive-table.git"
+  name: "aslagle:reactive-table-2"
 });
 
 Package.on_use(function (api) {
diff --git a/test/test_custom_filters.js b/test/test_custom_filters.js
index 15fd6f7..12da924 100644
--- a/test/test_custom_filters.js
+++ b/test/test_custom_filters.js
@@ -1,6 +1,6 @@
 Tinytest.add('Custom Filters - reactiveTableFilter template rendering', function (test) {
   var filter = Blaze.renderWithData(
-    Template.reactiveTableFilter,
+    Template.reactiveTableFilter2,
     {id: 'test-id'},
     document.body
   );
@@ -11,7 +11,7 @@ Tinytest.add('Custom Filters - reactiveTableFilter template rendering', function
 
 Tinytest.add('Custom Filters - reactiveTableFilter template label', function (test) {
   var filter = Blaze.renderWithData(
-    Template.reactiveTableFilter,
+    Template.reactiveTableFilter2,
     {id: 'test-id', label: 'Test'},
     document.body
   );
@@ -19,7 +19,7 @@ Tinytest.add('Custom Filters - reactiveTableFilter template label', function (te
   Blaze.remove(filter);
   
   filter = Blaze.renderWithData(
-    Template.reactiveTableFilter,
+    Template.reactiveTableFilter2,
     {id: 'test-id'},
     document.body
   );
@@ -29,7 +29,7 @@ Tinytest.add('Custom Filters - reactiveTableFilter template label', function (te
 
 Tinytest.add('Custom Filters - reactiveTableFilter class', function (test) {
   var filter = Blaze.renderWithData(
-    Template.reactiveTableFilter,
+    Template.reactiveTableFilter2,
     {id: 'test-id', class: 'test-class'},
     document.body
   );
@@ -39,7 +39,7 @@ Tinytest.add('Custom Filters - reactiveTableFilter class', function (test) {
 
 testAsyncMulti('Custom Filters - reactiveTableFilter no fields', [function (test, expect) {
   var filter = Blaze.renderWithData(
-    Template.reactiveTableFilter,
+    Template.reactiveTableFilter2,
     {id: 'client-filter'},
     document.body
   );
@@ -78,7 +78,7 @@ testAsyncMulti('Custom Filters - reactiveTableFilter no fields', [function (test
 
 testAsyncMulti('Custom Filters - reactiveTableFilter in server-side table', [function (test, expect) {
   var filter = Blaze.renderWithData(
-    Template.reactiveTableFilter,
+    Template.reactiveTableFilter2,
     {id: 'server-filter'},
     document.body
   );
@@ -117,7 +117,7 @@ testAsyncMulti('Custom Filters - reactiveTableFilter in server-side table', [fun
 
 testAsyncMulti('Custom Filters - reactiveTableFilter one field', [function (test, expect) {
   var filter = Blaze.renderWithData(
-    Template.reactiveTableFilter,
+    Template.reactiveTableFilter2,
     {id: 'name-only', fields: ['name']},
     document.body
   );
@@ -156,7 +156,7 @@ testAsyncMulti('Custom Filters - reactiveTableFilter one field', [function (test
 
 testAsyncMulti('Custom Filters - reactiveTableFilter two fields', [function (test, expect) {
   var filter = Blaze.renderWithData(
-    Template.reactiveTableFilter,
+    Template.reactiveTableFilter2,
     {id: 'name-and-score'},
     document.body
   );
@@ -195,13 +195,13 @@ testAsyncMulti('Custom Filters - reactiveTableFilter two fields', [function (tes
 
 testAsyncMulti('Custom Filters - reactiveTableFilter two filters client-side', [function (test, expect) {
   var filter1 = Blaze.renderWithData(
-    Template.reactiveTableFilter,
+    Template.reactiveTableFilter2,
     {id: 'name-filter'},
     document.body
   );
   
   var filter2 = Blaze.renderWithData(
-    Template.reactiveTableFilter,
+    Template.reactiveTableFilter2,
     {id: 'score-filter'},
     document.body
   );
@@ -250,13 +250,13 @@ testAsyncMulti('Custom Filters - reactiveTableFilter two filters client-side', [
 
 testAsyncMulti('Custom Filters - reactiveTableFilter two filters with or client-side', [function (test, expect) {
   var filter1 = Blaze.renderWithData(
-    Template.reactiveTableFilter,
+    Template.reactiveTableFilter2,
     {id: 'name-filter'},
     document.body
   );
   
   var filter2 = Blaze.renderWithData(
-    Template.reactiveTableFilter,
+    Template.reactiveTableFilter2,
     {id: 'score-filter'},
     document.body
   );
@@ -305,13 +305,13 @@ testAsyncMulti('Custom Filters - reactiveTableFilter two filters with or client-
 
 testAsyncMulti('Custom Filters - reactiveTableFilter two filters server-side', [function (test, expect) {
   var filter1 = Blaze.renderWithData(
-    Template.reactiveTableFilter,
+    Template.reactiveTableFilter2,
     {id: 'name-filter'},
     document.body
   );
   
   var filter2 = Blaze.renderWithData(
-    Template.reactiveTableFilter,
+    Template.reactiveTableFilter2,
     {id: 'score-filter'},
     document.body
   );
@@ -358,15 +358,15 @@ testAsyncMulti('Custom Filters - reactiveTableFilter two filters server-side', [
   Meteor.setTimeout(expectInitialRows, 500);
 }]);
 
-testAsyncMulti('Custom Filters - reactiveTableFilter two filters with or server-side', [function (test, expect) {
+testAsyncMulti('Custom Filters - reactiveTableFilter2 two filters with or server-side', [function (test, expect) {
   var filter1 = Blaze.renderWithData(
-    Template.reactiveTableFilter,
+    Template.reactiveTableFilter2,
     {id: 'name-filter'},
     document.body
   );
   
   var filter2 = Blaze.renderWithData(
-    Template.reactiveTableFilter,
+    Template.reactiveTableFilter2,
     {id: 'score-filter'},
     document.body
   );

From d777f12d969c3e17ec71661c5e95532631a8a49c Mon Sep 17 00:00:00 2001
From: Clarence Liu <clarence.hl.liu@gmail.com>
Date: Mon, 30 May 2016 16:38:32 -0700
Subject: [PATCH 12/24] fix CSS renaming

---
 lib/reactive_table.css  | 12 ++++++------
 lib/reactive_table.html |  6 +++---
 lib/reactive_table.js   |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/reactive_table.css b/lib/reactive_table.css
index 9ae6c38..4c6bbe9 100644
--- a/lib/reactive_table.css
+++ b/lib/reactive_table.css
@@ -15,7 +15,7 @@
     float: right;
 }
 
-.reactive-table .sortable, .reactive-table-add-column {
+.reactive-table-2.sortable, .reactive-table-add-column {
     cursor: pointer;
     -webkit-user-select: none;
     -moz-user-select: none;
@@ -60,24 +60,24 @@
     cursor: pointer;
 }
 
-.reactive-table .fa-sort-asc {
+.reactive-table-2.fa-sort-asc {
 	position: relative;
 	top: -2px;
 }
 
-.reactive-table .fa-sort-desc {
+.reactive-table-2.fa-sort-desc {
 	position: relative;
   top: 2px;
 }
 
-.reactive-table .reactive-table-children-expand {
+.reactive-table-2.reactive-table-2-children-expand {
     cursor: pointer;
 }
 
-.reactive-table .reactive-table-children-container .error {
+.reactive-table-2.reactive-table-2-children-container .error {
   color: #d9534f;
 }
 
-.reactive-table-children {
+.reactive-table-2-children {
   width: 100%;
 }
\ No newline at end of file
diff --git a/lib/reactive_table.html b/lib/reactive_table.html
index dfa7892..229fca4 100644
--- a/lib/reactive_table.html
+++ b/lib/reactive_table.html
@@ -34,7 +34,7 @@
       </div>
     </div>
     {{#unless noData}}
-      <table id="{{id}}" class="{{class}} reactive-table">
+      <table id="{{id}}" class="{{class}} reactive-table-2">
         <thead>
           <tr>
             {{#each fields}}
@@ -99,10 +99,10 @@
             </tr>
             {{#if ../children}}
               {{#if isVisibleChild}}
-                <tr class="reactive-table-children-container">
+                <tr class="reactive-table-2-children-container">
                   <td colspan="{{../fields.length}}">
                     {{#if ../children/fields}}
-                      <table class="table reactive-table-children">
+                      <table class="table reactive-table-2-children">
                         <thead>
                         <tr>
                           {{#each ../children.fields}}
diff --git a/lib/reactive_table.js b/lib/reactive_table.js
index 47c20e0..fd265d4 100644
--- a/lib/reactive_table.js
+++ b/lib/reactive_table.js
@@ -223,7 +223,7 @@ var setup = function () {
 
     if (hasChildren) {
         context.visibleChildren = new ReactiveVar([]);
-        context.childrenExpandIconClass = this.data.settings.childrenExpandIconClass || 'reactive-table-children-expand';
+        context.childrenExpandIconClass = this.data.settings.childrenExpandIconClass || 'reactive-table-2-children-expand';
         context.children = this.data.settings.children;
     }
 

From ae86d4d550e6a3eb5b313c3becd8391e001f45a1 Mon Sep 17 00:00:00 2001
From: Clarence Liu <clarence.hl.liu@gmail.com>
Date: Mon, 30 May 2016 18:41:57 -0700
Subject: [PATCH 13/24] fixed expand/collapse

---
 lib/reactive_table.css | 60 ++++++++++++++++++++++--------------------
 lib/reactive_table.js  | 20 ++++++--------
 2 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/lib/reactive_table.css b/lib/reactive_table.css
index 4c6bbe9..7640d9b 100644
--- a/lib/reactive_table.css
+++ b/lib/reactive_table.css
@@ -1,83 +1,87 @@
 .reactive-table-options {
-    padding-right: 0px;
-    margin-right: -5px;
+  padding-right: 0px;
+  margin-right: -5px;
 }
 
 .reactive-table-filter {
-    float: right;
+  float: right;
 }
 
 .reactive-table-columns-dropdown {
-    float: right;
+  float: right;
 }
 
 .reactive-table-columns-dropdown button {
-    float: right;
+  float: right;
 }
 
 .reactive-table-2.sortable, .reactive-table-add-column {
-    cursor: pointer;
-    -webkit-user-select: none;
-    -moz-user-select: none;
-    -ms-user-select: none;
-    user-select: none;
+  cursor: pointer;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
 }
 
 .table > thead > tr > th.reactive-table-add-column {
-    border-bottom: none;
+  border-bottom: none;
 }
 
 .reactive-table-navigation {
-    display: inline-block;
-    width: 100%;
+  display: inline-block;
+  width: 100%;
 }
 
 .reactive-table-navigation .form-inline input {
-    width: 45px;
+  width: 45px;
 }
 
 .reactive-table-navigation .rows-per-page {
-    float: left;
+  float: left;
 }
 
 .reactive-table-navigation .page-number {
-    float: right;
+  float: right;
 }
 
 .reactive-table-navigation .previous-page,
 .reactive-table-navigation .next-page {
-    font-size: 130%;
-    margin: 0 5px;
+  font-size: 130%;
+  margin: 0 5px;
 }
 
 .reactive-table-navigation .previous-page.fa,
 .reactive-table-navigation .next-page.fa {
-    vertical-align: middle;
+  vertical-align: middle;
 }
 
 .reactive-table-navigation .previous-page:hover,
 .reactive-table-navigation .next-page:hover {
-    cursor: pointer;
+  cursor: pointer;
 }
 
-.reactive-table-2.fa-sort-asc {
-	position: relative;
-	top: -2px;
+.reactive-table-2 .fa-sort-asc {
+  position: relative;
+  top: -2px;
 }
 
-.reactive-table-2.fa-sort-desc {
-	position: relative;
+.reactive-table-2 .fa-sort-desc {
+  position: relative;
   top: 2px;
 }
 
-.reactive-table-2.reactive-table-2-children-expand {
-    cursor: pointer;
+.reactive-table-2 .reactive-table-2-children-expand {
+  cursor: pointer;
 }
 
-.reactive-table-2.reactive-table-2-children-container .error {
+.reactive-table-2 .reactive-table-2-children-container .error {
   color: #d9534f;
 }
 
+.reactive-table-2 .reactive-table-2-children-container td {
+  padding: 0;
+}
+
 .reactive-table-2-children {
   width: 100%;
 }
\ No newline at end of file
diff --git a/lib/reactive_table.js b/lib/reactive_table.js
index fd265d4..fc40895 100644
--- a/lib/reactive_table.js
+++ b/lib/reactive_table.js
@@ -600,7 +600,7 @@ Template.reactiveTable2.helpers({
 });
 
 Template.reactiveTable2.events({
-    'click .reactive-table .sortable': function (event) {
+    'click .reactive-table-2 .sortable': function (event) {
         var template = Template.instance();
         var target = $(event.currentTarget);
         var sortFieldId = target.attr('fieldid');
@@ -664,7 +664,7 @@ Template.reactiveTable2.events({
         template.updateHandle(template.context);
     },
 
-    'click .reactive-table > tbody > tr > td': function (event) {
+    'click .reactive-table-2 > tbody > tr > td': function (event) {
 
         if (!this.tmpl){
 
@@ -676,32 +676,28 @@ Template.reactiveTable2.events({
 
             var dataId = iconExpand.data('id');
             var visibleChildren = template.context.visibleChildren.get();
-            var show;
 
             if (template.context.useFontAwesome){
                 
-                if ( iconExpand.hasClass( 'fa-plus-square-o' ) ){
+                if (iconExpand.hasClass( 'fa-plus-square-o' )){
                     iconExpand.removeClass( 'fa-plus-square-o' ).addClass( 'fa-minus-square-o' );
-                    show = true;
                 }
-                else {
+                else if (iconExpand.hasClass( 'fa-minus-square-o' )){
                     iconExpand.removeClass( 'fa-minus-square-o' ).addClass( 'fa-plus-square-o' );
-                    show = false;
                 }
             }
             else {
 
-                if ( iconExpand.html() === '➕'){
+                if (iconExpand.html() === '➕'){
                     iconExpand.html('&#10134;');
-                    show = true;
                 }
-                else {
+                else if (iconExpand.html() === '➖'){
                     iconExpand.html('&#10133;');
-                    show = false;
                 }
             }
 
-            if (show) {
+
+            if (_.indexOf(visibleChildren, dataId) < 0){
                 visibleChildren.push(dataId);
             }
             else {

From 57feab353bebc3f0e1d667bb8943d2dd6e29edda Mon Sep 17 00:00:00 2001
From: Clarence Liu <clarence.hl.liu@gmail.com>
Date: Mon, 30 May 2016 21:15:11 -0700
Subject: [PATCH 14/24] add _expand/collapseChildren to tmpl too

---
 lib/reactive_table.html | 4 +++-
 lib/reactive_table.js   | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/reactive_table.html b/lib/reactive_table.html
index 229fca4..705b1ac 100644
--- a/lib/reactive_table.html
+++ b/lib/reactive_table.html
@@ -132,7 +132,9 @@
                       </table>
                     {{else}}
                       {{#if ../children/tmpl}}
-                        {{> ../children/tmpl}}
+                        {{#with extendExpandHelpers}}
+                          {{> ../../children/tmpl}}
+                        {{/with}}
                       {{else}}
                         <span class="error">if children field exists, you must have defined either tmpl or fields</span>
                       {{/if}}
diff --git a/lib/reactive_table.js b/lib/reactive_table.js
index fc40895..62f2ad1 100644
--- a/lib/reactive_table.js
+++ b/lib/reactive_table.js
@@ -573,14 +573,14 @@ Template.reactiveTable2.helpers({
 
         return _.extend({
 
-            'expandChildren': function () {
+            '_expandChildren': function () {
                 if (template.context.visibleChildren) {
                     var visibleChildren = template.context.visibleChildren.get();
                     visibleChildren.push(this._id);
                     template.context.visibleChildren.set(visibleChildren);
                 }
             },
-            'collapseChildren': function() {
+            '_collapseChildren': function() {
                 if (template.context.visibleChildren) {
                     var visibleChildren = template.context.visibleChildren.get();
                     visibleChildren = _.without( visibleChildren, this._id );

From 85e2b338194d97b31e204c02ff13d6e29b51aba4 Mon Sep 17 00:00:00 2001
From: Clarence Liu <clarence.hl.liu@gmail.com>
Date: Sun, 5 Jun 2016 12:00:35 -0600
Subject: [PATCH 15/24] rename

---
 lib/reactive_table.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/reactive_table.js b/lib/reactive_table.js
index 62f2ad1..dc8c2d7 100644
--- a/lib/reactive_table.js
+++ b/lib/reactive_table.js
@@ -666,6 +666,7 @@ Template.reactiveTable2.events({
 
     'click .reactive-table-2 > tbody > tr > td': function (event) {
 
+        // TODO: there is a bug if you call _collapseChildren elsewhere, the icons need to update
         if (!this.tmpl){
 
             var template = Template.instance();

From d787ce4859d302e9034b3c620c85ee78a97c0233 Mon Sep 17 00:00:00 2001
From: Clarence Liu <clarence.hl.liu@gmail.com>
Date: Sun, 19 Jun 2016 16:29:21 -0700
Subject: [PATCH 16/24] renaming back

---
 lib/filter.js           | 10 +++++-----
 lib/reactive_table.css  | 14 +++++++-------
 lib/reactive_table.html |  8 ++++----
 lib/reactive_table.js   | 22 +++++++++++-----------
 lib/server.js           |  6 +++---
 package.js              |  4 ++--
 6 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/lib/filter.js b/lib/filter.js
index a99dba4..7f355fd 100644
--- a/lib/filter.js
+++ b/lib/filter.js
@@ -131,12 +131,12 @@ getFilterQuery = function (filterInputs, filterFields, settings) {
 };
 
 if (Meteor.isClient) {
-  ReactiveTable2 = ReactiveTable2 || {};
+  ReactiveTable = ReactiveTable || {};
 
   var reactiveTableFilters = {};
   var callbacks = {};
 
-  ReactiveTable2.Filter = function (id, fields) {
+  ReactiveTable.Filter = function (id, fields) {
     if (reactiveTableFilters[id]) {
         return reactiveTableFilters[id];
     }
@@ -159,7 +159,7 @@ if (Meteor.isClient) {
     reactiveTableFilters[id] = this;
   };
     
-  ReactiveTable2.clearFilters = function (filterIds) {
+  ReactiveTable.clearFilters = function (filterIds) {
     _.each(filterIds, function (filterId) {
       if (reactiveTableFilters[filterId]) {
         reactiveTableFilters[filterId].set('');
@@ -179,7 +179,7 @@ if (Meteor.isClient) {
   getFilterStrings = function (filterIds) {
     return _.map(filterIds, function (filterId) {
       if (_.isUndefined(reactiveTableFilters[filterId])) {
-        reactiveTableFilters[filterId] = new ReactiveTable2.Filter(filterId);
+        reactiveTableFilters[filterId] = new ReactiveTable.Filter(filterId);
       }
       return reactiveTableFilters[filterId].get();
     });
@@ -204,7 +204,7 @@ if (Meteor.isClient) {
     
     'filter': function () {
       if (_.isUndefined(reactiveTableFilters[this.id])) {
-        new ReactiveTable2.Filter(this.id, this.fields);
+        new ReactiveTable.Filter(this.id, this.fields);
       } else if (_.isUndefined(reactiveTableFilters[this.id].fields)) {
         reactiveTableFilters[this.id].fields = this.fields;
       }
diff --git a/lib/reactive_table.css b/lib/reactive_table.css
index 7640d9b..bd993cd 100644
--- a/lib/reactive_table.css
+++ b/lib/reactive_table.css
@@ -15,7 +15,7 @@
   float: right;
 }
 
-.reactive-table-2.sortable, .reactive-table-add-column {
+.reactive-table.sortable, .reactive-table-add-column {
   cursor: pointer;
   -webkit-user-select: none;
   -moz-user-select: none;
@@ -60,28 +60,28 @@
   cursor: pointer;
 }
 
-.reactive-table-2 .fa-sort-asc {
+.reactive-table .fa-sort-asc {
   position: relative;
   top: -2px;
 }
 
-.reactive-table-2 .fa-sort-desc {
+.reactive-table .fa-sort-desc {
   position: relative;
   top: 2px;
 }
 
-.reactive-table-2 .reactive-table-2-children-expand {
+.reactive-table .reactive-table-children-expand {
   cursor: pointer;
 }
 
-.reactive-table-2 .reactive-table-2-children-container .error {
+.reactive-table .reactive-table-children-container .error {
   color: #d9534f;
 }
 
-.reactive-table-2 .reactive-table-2-children-container td {
+.reactive-table .reactive-table-children-container td {
   padding: 0;
 }
 
-.reactive-table-2-children {
+.reactive-table-children {
   width: 100%;
 }
\ No newline at end of file
diff --git a/lib/reactive_table.html b/lib/reactive_table.html
index 705b1ac..87b3c23 100644
--- a/lib/reactive_table.html
+++ b/lib/reactive_table.html
@@ -1,4 +1,4 @@
-<template name="reactiveTable2">
+<template name="reactiveTable">
   {{#with context}}
   {{#if ready}}
     <div class="clearfix">
@@ -34,7 +34,7 @@
       </div>
     </div>
     {{#unless noData}}
-      <table id="{{id}}" class="{{class}} reactive-table-2">
+      <table id="{{id}}" class="{{class}} reactive-table">
         <thead>
           <tr>
             {{#each fields}}
@@ -99,10 +99,10 @@
             </tr>
             {{#if ../children}}
               {{#if isVisibleChild}}
-                <tr class="reactive-table-2-children-container">
+                <tr class="reactive-table-children-container">
                   <td colspan="{{../fields.length}}">
                     {{#if ../children/fields}}
-                      <table class="table reactive-table-2-children">
+                      <table class="table reactive-table-children">
                         <thead>
                         <tr>
                           {{#each ../children.fields}}
diff --git a/lib/reactive_table.js b/lib/reactive_table.js
index dc8c2d7..0668a3b 100644
--- a/lib/reactive_table.js
+++ b/lib/reactive_table.js
@@ -1,4 +1,4 @@
-var ReactiveTable2Counts = new Mongo.Collection("reactive-table-counts-2");
+var ReactiveTableCounts = new Mongo.Collection("reactive-table-counts-2");
 
 get = function(obj, field) {
   var keys = field.split('.');
@@ -58,7 +58,7 @@ var updateHandle = function (set_context) {
             }
         };
         var onError = function (error) {
-            console.log("ReactiveTable2 subscription error: " + error);
+            console.log("ReactiveTable subscription error: " + error);
         };
         newHandle = Meteor.subscribe(
             "reactive-table-" + context.collection,
@@ -223,7 +223,7 @@ var setup = function () {
 
     if (hasChildren) {
         context.visibleChildren = new ReactiveVar([]);
-        context.childrenExpandIconClass = this.data.settings.childrenExpandIconClass || 'reactive-table-2-children-expand';
+        context.childrenExpandIconClass = this.data.settings.childrenExpandIconClass || 'reactive-table-children-expand';
         context.children = this.data.settings.children;
     }
 
@@ -331,7 +331,7 @@ var getDefaultFieldVisibility = function (field) {
 
 var getRowCount = function () {
     if (this.server) {
-        var count = ReactiveTable2Counts.findOne(this.publicationId.get());
+        var count = ReactiveTableCounts.findOne(this.publicationId.get());
         return (count ? count.count : 0);
     } else {
         var filterQuery = getFilterQuery(getFilterStrings(this.filters.get()), getFilterFields(this.filters.get(), this.fields), {enableRegex: this.enableRegex, filterOperator: this.filterOperator});
@@ -345,7 +345,7 @@ var getPageCount = function () {
     return Math.ceil(count / rowsPerPage);
 };
 
-Template.reactiveTable2.onCreated(function() {
+Template.reactiveTable.onCreated(function() {
    this.updateHandle = _.debounce(updateHandle, 200);
 
    var rowsPerPage = this.data.rowsPerPage || (this.data.settings && this.data.settings.rowsPerPage);
@@ -374,13 +374,13 @@ Template.reactiveTable2.onCreated(function() {
    });
 });
 
-Template.reactiveTable2.onDestroyed(function() {
+Template.reactiveTable.onDestroyed(function() {
   if (this.context.server && this.context.handle) {
     this.context.handle.stop();
   }
 });
 
-Template.reactiveTable2.helpers({
+Template.reactiveTable.helpers({
     'context': function () {
         if (!Template.instance().context ||
             !_.isEqual(this, Template.instance().context.templateData)) {
@@ -599,8 +599,8 @@ Template.reactiveTable2.helpers({
     getTest: function(){debugger}
 });
 
-Template.reactiveTable2.events({
-    'click .reactive-table-2 .sortable': function (event) {
+Template.reactiveTable.events({
+    'click .reactive-table .sortable': function (event) {
         var template = Template.instance();
         var target = $(event.currentTarget);
         var sortFieldId = target.attr('fieldid');
@@ -664,9 +664,9 @@ Template.reactiveTable2.events({
         template.updateHandle(template.context);
     },
 
-    'click .reactive-table-2 > tbody > tr > td': function (event) {
+    'click .reactive-table > tbody > tr > td': function (event) {
 
-        // TODO: there is a bug if you call _collapseChildren elsewhere, the icons need to update
+        // TODO: there is a bug if you call collapseChildren elsewhere, the icons need to update
         if (!this.tmpl){
 
             var template = Template.instance();
diff --git a/lib/server.js b/lib/server.js
index 16dc55e..dbb573a 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -1,6 +1,6 @@
-ReactiveTable2 = {};
+ReactiveTable = {};
 
-ReactiveTable2.publish = function (name, collectionOrFunction, selectorOrFunction, settings) {
+ReactiveTable.publish = function (name, collectionOrFunction, selectorOrFunction, settings) {
     Meteor.publish("reactive-table-" + name, function (publicationId, filters, fields, options, rowsPerPage) {
       check(publicationId, String);
       check(filters, [Match.OneOf(String, Object, Mongo.ObjectID)]);
@@ -18,7 +18,7 @@ ReactiveTable2.publish = function (name, collectionOrFunction, selectorOrFunctio
       }
 
       if (!(collection instanceof Mongo.Collection)) {
-        console.log("ReactiveTable2.publish: no collection to publish");
+        console.log("ReactiveTable.publish: no collection to publish");
         return [];
       }
 
diff --git a/package.js b/package.js
index 7e1cf2a..b8eb0d9 100644
--- a/package.js
+++ b/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   summary: "A reactive table designed for Meteor",
   version: "0.8.29",
-  name: "aslagle:reactive-table-2"
+  name: "aslagle:reactive-table"
 });
 
 Package.on_use(function (api) {
@@ -26,7 +26,7 @@ Package.on_use(function (api) {
     api.add_files('lib/filter.js', ['client', 'server']);
     api.add_files('lib/server.js', 'server');
 
-    api.export("ReactiveTable2", ["client", "server"]);
+    api.export("ReactiveTable", ["client", "server"]);
 });
 
 Package.on_test(function (api) {

From 2299f6501eb318804025a89ccae434d2e1c8e418 Mon Sep 17 00:00:00 2001
From: Clarence Liu <clarence.hl.liu@gmail.com>
Date: Sun, 19 Jun 2016 16:34:45 -0700
Subject: [PATCH 17/24] mark child tmpl feature as beta

---
 CHILD_TABLE_README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHILD_TABLE_README.md b/CHILD_TABLE_README.md
index 124a2c1..6962f9c 100644
--- a/CHILD_TABLE_README.md
+++ b/CHILD_TABLE_README.md
@@ -1,5 +1,5 @@
 
-# Child (Sub) Tables
+# Child (Sub) Tables <sup>BETA</sup>
 
 This guide shows how to add child/sub tables, this simply inserts a new row when expanded.
 You can control the expand/collapse control and render an array on your data structure or

From b85f2c42aa71b10be12b0db820d400c1a52c0961 Mon Sep 17 00:00:00 2001
From: Clarence Liu <clarence.hl.liu@gmail.com>
Date: Mon, 20 Jun 2016 04:46:10 -0700
Subject: [PATCH 18/24] added more instructions for nested reactive tables

---
 CHILD_TABLE_README.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/CHILD_TABLE_README.md b/CHILD_TABLE_README.md
index 6962f9c..c025407 100644
--- a/CHILD_TABLE_README.md
+++ b/CHILD_TABLE_README.md
@@ -195,6 +195,17 @@ for you to reference
       tmpl: Template.StoreLocations
     }
     
+    
+### Nested Reactive Tables
+
+You can definitely nest entire reactive tables now with the tmpl option, in the above example Template.StoreLocations could
+simple insert another reactive table
+
+*However if you use the `expandButton` option for controls, you need to a specify a new setting `childrenExpandIconClass` on the settings object
+you pass into reactive table, this ensures the expand icons don't conflict, I'm using a DOM $.find to toggle these for now*
+
+
+
 
 
 

From 29023d302d49cf3c4241794360e7f29c6a6be1d2 Mon Sep 17 00:00:00 2001
From: Clarence Liu <clarence.hl.liu@gmail.com>
Date: Mon, 20 Jun 2016 22:30:21 -0700
Subject: [PATCH 19/24] update readme for expand/collapseChildren helpers

---
 CHILD_TABLE_README.md | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/CHILD_TABLE_README.md b/CHILD_TABLE_README.md
index c025407..6d18c0e 100644
--- a/CHILD_TABLE_README.md
+++ b/CHILD_TABLE_README.md
@@ -46,10 +46,12 @@ This respects the virtual column's `fn` function, if you use this it will prepen
 #### Custom Expand Button Template
 
 First `expandButton` must be set to true, and if you are using a Template, 
-we will automatically pass in to the template data two helper functions
+we will automatically pass in to the template data two helper functions, please note the underscore prefix
+to avoid collisions. In fact the *\_.extend* I use to add these helpers prioritizes your data first, so you 
+can override these completely.
  
-- `expandChildren` - show the child / sub table
-- `collapseChildren` - hide the above
+- `_expandChildren` - show the child / sub table
+- `_collapseChildren` - hide the above
 
 For example I can pass in my own template:
 
@@ -64,7 +66,7 @@ For example I can pass in my own template:
           ...
         ]
 
-And then in my template I can create an event, where functions `this.expandChildren` and `this.collapseChildren`
+And then in my template I can create an event, where functions `this._expandChildren` and `this._collapseChildren`
 are accessible. You can save your state however you wish, in my case I am using the DOM.
     
     
@@ -78,12 +80,12 @@ are accessible. You can save your state however you wish, in my case I am using
         if (!!divContainer.data('expanded')) {
           iconExpand.removeClass( 'fa-minus-square-o' ).addClass( 'fa-plus-square-o' );
           divContainer.data('expanded', false);
-          this.collapseChildren();
+          this._collapseChildren();
         }
         else {
           iconExpand.removeClass( 'fa-plus-square-o' ).addClass( 'fa-minus-square-o' );
           divContainer.data('expanded', true);
-          this.expandChildren();
+          this._expandChildren();
         }
     
       }

From 0bae54cf6e1ae22b9233ef16cf9307fb946ca28b Mon Sep 17 00:00:00 2001
From: Clarence Liu <clarence.hl.liu@gmail.com>
Date: Mon, 20 Jun 2016 22:34:20 -0700
Subject: [PATCH 20/24] readme formatting

---
 CHILD_TABLE_README.md | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/CHILD_TABLE_README.md b/CHILD_TABLE_README.md
index 6d18c0e..c3d83bd 100644
--- a/CHILD_TABLE_README.md
+++ b/CHILD_TABLE_README.md
@@ -8,7 +8,8 @@ simply pass in a template for the sub table and handle it yourself.
 
 **Requirements:**
 
-- Your data must have a unique `_id` field, if you're using a Collection this shouldn't be an issue
+- Your data must have a unique `_id` field, if you're using a Collection this shouldn't be an issue, 
+otherwise add the field and you can use `Meteor.uuid()` for example. 
 
 
 ---
@@ -200,11 +201,11 @@ for you to reference
     
 ### Nested Reactive Tables
 
-You can definitely nest entire reactive tables now with the tmpl option, in the above example Template.StoreLocations could
-simple insert another reactive table
+You can definitely nest entire reactive tables now with the `tmpl` option, in the above example Template.StoreLocations could
+simply insert another reactive table
 
 *However if you use the `expandButton` option for controls, you need to a specify a new setting `childrenExpandIconClass` on the settings object
-you pass into reactive table, this ensures the expand icons don't conflict, I'm using a DOM $.find to toggle these for now*
+you pass into reactive table, this ensures the expand icons don't conflict, I'm using a DOM $.find CSS to toggle these for now*
 
 
 

From 83e11d6c39369dcd84b8963fbbde810920321104 Mon Sep 17 00:00:00 2001
From: Clarence Liu <clarence.hl.liu@gmail.com>
Date: Mon, 20 Jun 2016 23:20:38 -0700
Subject: [PATCH 21/24] fixed misnamed template

---
 lib/filter.html             |  2 +-
 lib/filter.js               |  4 ++--
 lib/reactive_table.html     |  2 +-
 test/test_custom_filters.js | 34 +++++++++++++++++-----------------
 4 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/lib/filter.html b/lib/filter.html
index f4a5dbc..8534d07 100644
--- a/lib/filter.html
+++ b/lib/filter.html
@@ -1,4 +1,4 @@
-<template name="reactiveTableFilter2">
+<template name="reactiveTableFilter">
   <div id="{{id}}" class="{{class}}">
     <span class="input-group-addon">
       {{#if useFontAwesome}}
diff --git a/lib/filter.js b/lib/filter.js
index 43ff514..64cba1f 100644
--- a/lib/filter.js
+++ b/lib/filter.js
@@ -198,7 +198,7 @@ if (Meteor.isClient) {
     });
   };
 
-  Template.reactiveTableFilter2.helpers({
+  Template.reactiveTableFilter.helpers({
     'class': function () {
       return this.class || 'input-group';
     },
@@ -217,7 +217,7 @@ if (Meteor.isClient) {
     reactiveTableFilters[template.data.id].set(filterText);
   }, 200);
 
-  Template.reactiveTableFilter2.events({
+  Template.reactiveTableFilter.events({
     'keyup .reactive-table-input, input .reactive-table-input': function (event) {
       var template = Template.instance();
       var filterText = $(event.target).val();
diff --git a/lib/reactive_table.html b/lib/reactive_table.html
index 87b3c23..e5d9717 100644
--- a/lib/reactive_table.html
+++ b/lib/reactive_table.html
@@ -5,7 +5,7 @@
       <div class="reactive-table-options col-sm-8 pull-right">
         {{#if showFilter}}
           <div class="reactive-table-filter form-group col-sm-8 pull-right">
-            {{> reactiveTableFilter2 id=getFilterId useFontAwesome=useFontAwesome}}
+            {{> reactiveTableFilter id=getFilterId useFontAwesome=useFontAwesome}}
           </div>
         {{/if}}
         {{#if showColumnToggles}}
diff --git a/test/test_custom_filters.js b/test/test_custom_filters.js
index 12da924..15fd6f7 100644
--- a/test/test_custom_filters.js
+++ b/test/test_custom_filters.js
@@ -1,6 +1,6 @@
 Tinytest.add('Custom Filters - reactiveTableFilter template rendering', function (test) {
   var filter = Blaze.renderWithData(
-    Template.reactiveTableFilter2,
+    Template.reactiveTableFilter,
     {id: 'test-id'},
     document.body
   );
@@ -11,7 +11,7 @@ Tinytest.add('Custom Filters - reactiveTableFilter template rendering', function
 
 Tinytest.add('Custom Filters - reactiveTableFilter template label', function (test) {
   var filter = Blaze.renderWithData(
-    Template.reactiveTableFilter2,
+    Template.reactiveTableFilter,
     {id: 'test-id', label: 'Test'},
     document.body
   );
@@ -19,7 +19,7 @@ Tinytest.add('Custom Filters - reactiveTableFilter template label', function (te
   Blaze.remove(filter);
   
   filter = Blaze.renderWithData(
-    Template.reactiveTableFilter2,
+    Template.reactiveTableFilter,
     {id: 'test-id'},
     document.body
   );
@@ -29,7 +29,7 @@ Tinytest.add('Custom Filters - reactiveTableFilter template label', function (te
 
 Tinytest.add('Custom Filters - reactiveTableFilter class', function (test) {
   var filter = Blaze.renderWithData(
-    Template.reactiveTableFilter2,
+    Template.reactiveTableFilter,
     {id: 'test-id', class: 'test-class'},
     document.body
   );
@@ -39,7 +39,7 @@ Tinytest.add('Custom Filters - reactiveTableFilter class', function (test) {
 
 testAsyncMulti('Custom Filters - reactiveTableFilter no fields', [function (test, expect) {
   var filter = Blaze.renderWithData(
-    Template.reactiveTableFilter2,
+    Template.reactiveTableFilter,
     {id: 'client-filter'},
     document.body
   );
@@ -78,7 +78,7 @@ testAsyncMulti('Custom Filters - reactiveTableFilter no fields', [function (test
 
 testAsyncMulti('Custom Filters - reactiveTableFilter in server-side table', [function (test, expect) {
   var filter = Blaze.renderWithData(
-    Template.reactiveTableFilter2,
+    Template.reactiveTableFilter,
     {id: 'server-filter'},
     document.body
   );
@@ -117,7 +117,7 @@ testAsyncMulti('Custom Filters - reactiveTableFilter in server-side table', [fun
 
 testAsyncMulti('Custom Filters - reactiveTableFilter one field', [function (test, expect) {
   var filter = Blaze.renderWithData(
-    Template.reactiveTableFilter2,
+    Template.reactiveTableFilter,
     {id: 'name-only', fields: ['name']},
     document.body
   );
@@ -156,7 +156,7 @@ testAsyncMulti('Custom Filters - reactiveTableFilter one field', [function (test
 
 testAsyncMulti('Custom Filters - reactiveTableFilter two fields', [function (test, expect) {
   var filter = Blaze.renderWithData(
-    Template.reactiveTableFilter2,
+    Template.reactiveTableFilter,
     {id: 'name-and-score'},
     document.body
   );
@@ -195,13 +195,13 @@ testAsyncMulti('Custom Filters - reactiveTableFilter two fields', [function (tes
 
 testAsyncMulti('Custom Filters - reactiveTableFilter two filters client-side', [function (test, expect) {
   var filter1 = Blaze.renderWithData(
-    Template.reactiveTableFilter2,
+    Template.reactiveTableFilter,
     {id: 'name-filter'},
     document.body
   );
   
   var filter2 = Blaze.renderWithData(
-    Template.reactiveTableFilter2,
+    Template.reactiveTableFilter,
     {id: 'score-filter'},
     document.body
   );
@@ -250,13 +250,13 @@ testAsyncMulti('Custom Filters - reactiveTableFilter two filters client-side', [
 
 testAsyncMulti('Custom Filters - reactiveTableFilter two filters with or client-side', [function (test, expect) {
   var filter1 = Blaze.renderWithData(
-    Template.reactiveTableFilter2,
+    Template.reactiveTableFilter,
     {id: 'name-filter'},
     document.body
   );
   
   var filter2 = Blaze.renderWithData(
-    Template.reactiveTableFilter2,
+    Template.reactiveTableFilter,
     {id: 'score-filter'},
     document.body
   );
@@ -305,13 +305,13 @@ testAsyncMulti('Custom Filters - reactiveTableFilter two filters with or client-
 
 testAsyncMulti('Custom Filters - reactiveTableFilter two filters server-side', [function (test, expect) {
   var filter1 = Blaze.renderWithData(
-    Template.reactiveTableFilter2,
+    Template.reactiveTableFilter,
     {id: 'name-filter'},
     document.body
   );
   
   var filter2 = Blaze.renderWithData(
-    Template.reactiveTableFilter2,
+    Template.reactiveTableFilter,
     {id: 'score-filter'},
     document.body
   );
@@ -358,15 +358,15 @@ testAsyncMulti('Custom Filters - reactiveTableFilter two filters server-side', [
   Meteor.setTimeout(expectInitialRows, 500);
 }]);
 
-testAsyncMulti('Custom Filters - reactiveTableFilter2 two filters with or server-side', [function (test, expect) {
+testAsyncMulti('Custom Filters - reactiveTableFilter two filters with or server-side', [function (test, expect) {
   var filter1 = Blaze.renderWithData(
-    Template.reactiveTableFilter2,
+    Template.reactiveTableFilter,
     {id: 'name-filter'},
     document.body
   );
   
   var filter2 = Blaze.renderWithData(
-    Template.reactiveTableFilter2,
+    Template.reactiveTableFilter,
     {id: 'score-filter'},
     document.body
   );

From 66a1f2bc49a664fd5346717aa5fa165698f3dcf8 Mon Sep 17 00:00:00 2001
From: Clarence Liu <clarence.hl.liu@gmail.com>
Date: Mon, 20 Jun 2016 23:22:43 -0700
Subject: [PATCH 22/24] left a debugger in

---
 lib/reactive_table.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/reactive_table.js b/lib/reactive_table.js
index 42050fc..e8b3a2f 100644
--- a/lib/reactive_table.js
+++ b/lib/reactive_table.js
@@ -595,8 +595,7 @@ Template.reactiveTable.helpers({
             var visibleChildren = Template.instance().context.visibleChildren.get();
             return _.indexOf(visibleChildren, this._id) >= 0
         }
-    },
-    getTest: function(){debugger}
+    }
 });
 
 Template.reactiveTable.events({

From 8fae5e6f785fcb69f7a7d2ae0492176e890d93a1 Mon Sep 17 00:00:00 2001
From: Aysel Afsar <aysel.afsar@gmail.com>
Date: Thu, 1 Dec 2016 15:13:44 -0500
Subject: [PATCH 23/24] Add expandIcon and collapseIcon properties to have
 dynamic icons, Expand/Collapse the row if the row is clicked

---
 CHILD_TABLE_README.md   | 75 +++++++++++++++----------------
 lib/reactive_table.html | 10 ++++-
 lib/reactive_table.js   | 97 +++++++++++++++++++++++++++--------------
 3 files changed, 108 insertions(+), 74 deletions(-)

diff --git a/CHILD_TABLE_README.md b/CHILD_TABLE_README.md
index c3d83bd..d878570 100644
--- a/CHILD_TABLE_README.md
+++ b/CHILD_TABLE_README.md
@@ -8,8 +8,8 @@ simply pass in a template for the sub table and handle it yourself.
 
 **Requirements:**
 
-- Your data must have a unique `_id` field, if you're using a Collection this shouldn't be an issue, 
-otherwise add the field and you can use `Meteor.uuid()` for example. 
+- Your data must have a unique `_id` field, if you're using a Collection this shouldn't be an issue,
+otherwise add the field and you can use `Meteor.uuid()` for example.
 
 
 ---
@@ -17,8 +17,8 @@ otherwise add the field and you can use `Meteor.uuid()` for example.
 ### Expand Button Setup
 
 There are 2 implementations of the expand button
- 
- 
+
+
 #### Simple Prepended Icon
 
 On any field you can add the setting `expandButton`
@@ -29,7 +29,7 @@ Set `useFontAwesome = true` in the settings for a better icon
 
 
     fields: [
-    
+
       {
         key: 'store_name',
         label: 'Store Name',
@@ -46,18 +46,18 @@ This respects the virtual column's `fn` function, if you use this it will prepen
 
 #### Custom Expand Button Template
 
-First `expandButton` must be set to true, and if you are using a Template, 
+First `expandButton` must be set to true, and if you are using a Template,
 we will automatically pass in to the template data two helper functions, please note the underscore prefix
-to avoid collisions. In fact the *\_.extend* I use to add these helpers prioritizes your data first, so you 
+to avoid collisions. In fact the *\_.extend* I use to add these helpers prioritizes your data first, so you
 can override these completely.
- 
+
 - `_expandChildren` - show the child / sub table
 - `_collapseChildren` - hide the above
 
 For example I can pass in my own template:
 
     fields: [
-        
+
           {
             key: 'store_name',
             label: 'Store Name',
@@ -69,15 +69,15 @@ For example I can pass in my own template:
 
 And then in my template I can create an event, where functions `this._expandChildren` and `this._collapseChildren`
 are accessible. You can save your state however you wish, in my case I am using the DOM.
-    
-    
+
+
     Template.StoreExpandCell.events({
-    
+
       'click .my-expand-control': function( ev, t ){
-    
+
         var divContainer = $(ev.currentTarget);
         var iconExpand = divContainer.find('.expand-icon');
-    
+
         if (!!divContainer.data('expanded')) {
           iconExpand.removeClass( 'fa-minus-square-o' ).addClass( 'fa-plus-square-o' );
           divContainer.data('expanded', false);
@@ -88,31 +88,31 @@ are accessible. You can save your state however you wish, in my case I am using
           divContainer.data('expanded', true);
           this._expandChildren();
         }
-    
+
       }
-    
+
     });
-    
-    
+
+
 ---
-    
-    
+
+
 ### Child/Sub Table Setup
- 
+
 You have two options for the contents of the child table, either a simple table rendered with the default reactive-table fields options
 or a custom template
 
-The child table settings are added with the reactive-table setting `children` 
+The child table settings are added with the reactive-table setting `children`
 
 
 #### Child Table
 
-For a child table you need two settings in `children`, these are `dataField` and `fields` 
+For a child table you need two settings in `children`, these are `dataField` and `fields`
 
-`dataField` - this must be a field referencing an array of structs, for example if I have the following data, 
+`dataField` - this must be a field referencing an array of structs, for example if I have the following data,
 you may notice that `store_locations` is actually an array, I don't reference it in my parent table `fields`
 setting, and plan to use it to iterate over and generate my child table.
- 
+
     [
       {
         _id: 1,
@@ -153,9 +153,11 @@ setting, and plan to use it to iterate over and generate my child table.
 virtual columns, templates and styling options. It will iterate over the array referenced by the key `dataField`
 and generate a row for each iteration with the `children.fields` specification.
 
+`expandIcon` - Make expand icon customizable.<br>
+`collapseIcon` - Make collapse icon customizable.
 
     fields: [
-        
+
       {
         key: 'store_name',
         label: 'Store Name',
@@ -164,7 +166,7 @@ and generate a row for each iteration with the `children.fields` specification.
       },
       ...
     ],
-    
+
     children: {
       dataField: 'store_locations',
       fields: [
@@ -173,7 +175,9 @@ and generate a row for each iteration with the `children.fields` specification.
           label: 'Location'
         }
         ...
-      ]
+      ],
+      expandIcon: 'fa fa-angle-down',
+      collapseIcon: 'fa fa-angle-up',
     }
 
 
@@ -184,7 +188,7 @@ Simply add the template to a `children` field, and the entire data object will b
 for you to reference
 
     fields: [
-        
+
       {
         key: 'store_name',
         label: 'Store Name',
@@ -193,12 +197,12 @@ for you to reference
       },
       ...
     ],
-    
+
     children: {
       tmpl: Template.StoreLocations
     }
-    
-    
+
+
 ### Nested Reactive Tables
 
 You can definitely nest entire reactive tables now with the `tmpl` option, in the above example Template.StoreLocations could
@@ -206,10 +210,3 @@ simply insert another reactive table
 
 *However if you use the `expandButton` option for controls, you need to a specify a new setting `childrenExpandIconClass` on the settings object
 you pass into reactive table, this ensures the expand icons don't conflict, I'm using a DOM $.find CSS to toggle these for now*
-
-
-
-
-
-
-
diff --git a/lib/reactive_table.html b/lib/reactive_table.html
index e5d9717..ed3a553 100644
--- a/lib/reactive_table.html
+++ b/lib/reactive_table.html
@@ -69,7 +69,7 @@
         </thead>
         <tbody>
           {{#each sortedRows}}
-            <tr class="{{../rowClass this}} reactive-table-row">
+              <tr class="{{../rowClass this}} reactive-table-row">
               {{#each ../fields}}
                 {{#if isVisible}}
                   <td class="{{getCellClass ..}}">
@@ -86,7 +86,13 @@
                     {{else}}
                       {{#if expandButton}}
                         {{#if ../../useFontAwesome}}
-                          <i class="{{../../childrenExpandIconClass}} fa fa-plus-square-o" data-id="{{../_id}}"></i>
+                            {{#if ../../children}}
+                                {{#if isVisibleChild ../_id}}
+                                    <i class="{{../../childrenExpandIconClass}} {{getCollapseIcon}}" data-id="{{../_id}}"></i>
+                                {{else}}
+                                    <i class="{{../../childrenExpandIconClass}} {{getExpandIcon}}" data-id="{{../_id}}"></i>
+                                {{/if}}
+                            {{/if}}
                         {{else}}
                           <label class="{{../../childrenExpandIconClass}}" data-id="{{../_id}}">&#10133;</label>
                         {{/if}}
diff --git a/lib/reactive_table.js b/lib/reactive_table.js
index e8b3a2f..0ff7b8c 100644
--- a/lib/reactive_table.js
+++ b/lib/reactive_table.js
@@ -590,12 +590,41 @@ Template.reactiveTable.helpers({
 
         }, this)
     },
-    isVisibleChild: function () {
+    'isVisibleChild': function (id) {
         if (Template.instance().context.visibleChildren) {
             var visibleChildren = Template.instance().context.visibleChildren.get();
-            return _.indexOf(visibleChildren, this._id) >= 0
+            if (id) {
+                return _.indexOf(visibleChildren, id) >= 0;
+            }
+            return _.indexOf(visibleChildren, this._id) >= 0;
         }
-    }
+    },
+    'getExpandIcon': function() {
+        var instance = Template.instance();
+        var useFontAwesome = instance.context.useFontAwesome;
+        if (!useFontAwesome) {
+            return;
+        }
+        var children = instance.context.children;
+        if (children && children.expandIcon) {
+            return children.expandIcon;
+        }
+
+        return 'fa fa-plus-square-o';
+    },
+    'getCollapseIcon': function() {
+        var instance = Template.instance();
+        var useFontAwesome = instance.context.useFontAwesome;
+        if (!useFontAwesome) {
+            return;
+        }
+        var children = instance.context.children;
+        if (children && children.collapseIcon) {
+            return children.collapseIcon;
+        }
+
+        return 'fa fa-minus-square-o';
+    },
 });
 
 Template.reactiveTable.events({
@@ -664,48 +693,50 @@ Template.reactiveTable.events({
     },
 
     'click .reactive-table > tbody > tr > td': function (event) {
-
+        var $target = $(event.target);
+        var iconExpand;
+        var template = Template.instance();
         // TODO: there is a bug if you call collapseChildren elsewhere, the icons need to update
-        if (!this.tmpl){
-
-            var template = Template.instance();
-            var iconExpand = $(event.currentTarget).find('.' + template.context.childrenExpandIconClass);
-            if (!iconExpand.length) {
-                return
+        if (this.tmpl) {
+            if (!$target.is('td')) {
+                return;
             }
+            // Find iconExpand
+            const $parentRow = $target.parent('tr');
+            iconExpand = $parentRow.find('.' + template.context.childrenExpandIconClass);
 
-            var dataId = iconExpand.data('id');
-            var visibleChildren = template.context.visibleChildren.get();
-
-            if (template.context.useFontAwesome){
-                
-                if (iconExpand.hasClass( 'fa-plus-square-o' )){
-                    iconExpand.removeClass( 'fa-plus-square-o' ).addClass( 'fa-minus-square-o' );
-                }
-                else if (iconExpand.hasClass( 'fa-minus-square-o' )){
-                    iconExpand.removeClass( 'fa-minus-square-o' ).addClass( 'fa-plus-square-o' );
+        } else {
+            iconExpand = $(event.currentTarget).find('.' + template.context.childrenExpandIconClass);
+            if (!iconExpand.length) {
+                if (!$target.is('td')) {
+                    return;
                 }
-            }
-            else {
 
-                if (iconExpand.html() === '➕'){
-                    iconExpand.html('&#10134;');
-                }
-                else if (iconExpand.html() === '➖'){
-                    iconExpand.html('&#10133;');
-                }
+                // Find iconExpand
+                const $parentRow = $target.parent('tr');
+                iconExpand = $parentRow.find('.' + template.context.childrenExpandIconClass);
             }
+        }
 
+        var dataId = iconExpand.data('id');
+        var visibleChildren = template.context.visibleChildren.get();
 
-            if (_.indexOf(visibleChildren, dataId) < 0){
-                visibleChildren.push(dataId);
+        if (!template.context.useFontAwesome){
+            if (iconExpand.html() === '➕'){
+                iconExpand.html('&#10134;');
             }
-            else {
-                visibleChildren = _.without(visibleChildren, dataId);
+            else if (iconExpand.html() === '➖'){
+                iconExpand.html('&#10133;');
             }
+        }
 
-            template.context.visibleChildren.set(visibleChildren);
+        if (_.indexOf(visibleChildren, dataId) < 0){
+            visibleChildren.push(dataId);
+        }
+        else {
+            visibleChildren = _.without(visibleChildren, dataId);
         }
 
+        template.context.visibleChildren.set(visibleChildren);
     }
 });

From 81955836098412b011d076f25df5ee00f9bdbbef Mon Sep 17 00:00:00 2001
From: Aysel Afsar <aysel.afsar@gmail.com>
Date: Fri, 2 Dec 2016 17:36:21 -0500
Subject: [PATCH 24/24] Check template has visible children

---
 lib/reactive_table.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/reactive_table.js b/lib/reactive_table.js
index 0ff7b8c..d317c16 100644
--- a/lib/reactive_table.js
+++ b/lib/reactive_table.js
@@ -696,6 +696,10 @@ Template.reactiveTable.events({
         var $target = $(event.target);
         var iconExpand;
         var template = Template.instance();
+        if (!template.context.visibleChildren) {
+            return;
+        }
+
         // TODO: there is a bug if you call collapseChildren elsewhere, the icons need to update
         if (this.tmpl) {
             if (!$target.is('td')) {
@@ -718,6 +722,7 @@ Template.reactiveTable.events({
             }
         }
 
+
         var dataId = iconExpand.data('id');
         var visibleChildren = template.context.visibleChildren.get();