From 9e95f47b9586e2c0a775cff1f40fff6e46730e45 Mon Sep 17 00:00:00 2001 From: Zibx Date: Tue, 3 Mar 2015 21:37:39 +0400 Subject: [PATCH 1/5] customRow --- lib/reactive_table.html | 14 +++++++++----- lib/reactive_table.js | 6 +++++- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/lib/reactive_table.html b/lib/reactive_table.html index 8df2a16..b33f6ac 100644 --- a/lib/reactive_table.html +++ b/lib/reactive_table.html @@ -80,11 +80,15 @@ {{#each sortedRows}} - {{#each ../fields}} - {{#if isVisible}} - {{#if tmpl}}{{#with ..}}{{> ../tmpl}}{{/with}}{{else}}{{getField ..}}{{/if}} - {{/if}} - {{/each}} + {{#if customRow this}} + {{> customRow this}} + {{else}} + {{#each ../fields}} + {{#if isVisible}} + {{#if tmpl}}{{#with ..}}{{> ../tmpl}}{{/with}}{{else}}{{getField ..}}{{/if}} + {{/if}} + {{/each}} + {{/if}} {{/each}} diff --git a/lib/reactive_table.js b/lib/reactive_table.js index 9a34434..7d5f8e0 100644 --- a/lib/reactive_table.js +++ b/lib/reactive_table.js @@ -264,7 +264,11 @@ var setup = function () { context.useFontAwesome = this.data.useFontAwesome; } context.enableRegex = getDefaultFalseSetting('enableRegex', this.data); - + + context.customRow = this.data.settings.customRow || function () { + return false; + }; + context.ready = new ReactiveVar(true); if (context.server) { From ab729c8fd9c18ddb2f66785ff041ecab744420a2 Mon Sep 17 00:00:00 2001 From: Zibx Date: Tue, 3 Mar 2015 21:47:35 +0400 Subject: [PATCH 2/5] fix --- .versions | 46 +++++++++++++++++++++++++++++++++++++++++ lib/reactive_table.html | 4 ++-- package.js | 6 +++--- 3 files changed, 51 insertions(+), 5 deletions(-) create mode 100644 .versions diff --git a/.versions b/.versions new file mode 100644 index 0000000..1f0b871 --- /dev/null +++ b/.versions @@ -0,0 +1,46 @@ +accounts-base@1.1.3 +accounts-password@1.0.6 +anti:i18n@0.4.3 +application-configuration@1.0.4 +base64@1.0.2 +binary-heap@1.0.2 +blaze@2.0.4 +blaze-tools@1.0.2 +callback-hook@1.0.2 +check@1.0.4 +dburles:collection-helpers@1.0.1 +ddp@1.0.14 +deps@1.0.6 +ejson@1.0.5 +email@1.0.5 +follower-livedata@1.0.3 +geojson-utils@1.0.2 +html-tools@1.0.3 +htmljs@1.0.3 +id-map@1.0.2 +jquery@1.11.3 +json@1.0.2 +local-test:zibx:reactive-table@0.6.15 +localstorage@1.0.2 +logging@1.0.6 +meteor@1.1.4 +minifiers@1.1.3 +minimongo@1.0.6 +mongo@1.0.11 +npm-bcrypt@0.7.7 +observe-sequence@1.0.4 +ordered-dict@1.0.2 +random@1.0.2 +reactive-var@1.0.4 +retry@1.0.2 +service-configuration@1.0.3 +sha@1.0.2 +spacebars-compiler@1.0.4 +srp@1.0.2 +templating@1.0.11 +test-helpers@1.0.3 +tinytest@1.0.4 +tracker@1.0.5 +ui@1.0.5 +underscore@1.0.2 +zibx:reactive-table@0.6.15 diff --git a/lib/reactive_table.html b/lib/reactive_table.html index b33f6ac..5769d54 100644 --- a/lib/reactive_table.html +++ b/lib/reactive_table.html @@ -80,8 +80,8 @@ {{#each sortedRows}} - {{#if customRow this}} - {{> customRow this}} + {{#if ../customRow this}} + {{> ../customRow this}} {{else}} {{#each ../fields}} {{#if isVisible}} diff --git a/package.js b/package.js index 53c94c2..518b983 100644 --- a/package.js +++ b/package.js @@ -1,8 +1,8 @@ Package.describe({ summary: "A reactive table designed for Meteor", - version: "0.6.14", - name: "aslagle:reactive-table", - git: "https://github.com/aslagle/reactive-table.git" + version: "0.6.16", + name: "zibx:reactive-table", + git: "https://github.com/Zibx/reactive-table.git" }); Package.on_use(function (api) { From dc195b290531529e08afb80a2892f6d582cc9774 Mon Sep 17 00:00:00 2001 From: Zibx Date: Wed, 4 Mar 2015 04:03:03 +0400 Subject: [PATCH 3/5] fix --- .versions | 4 ++-- lib/reactive_table.html | 2 +- package.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.versions b/.versions index 1f0b871..601dd79 100644 --- a/.versions +++ b/.versions @@ -20,7 +20,7 @@ htmljs@1.0.3 id-map@1.0.2 jquery@1.11.3 json@1.0.2 -local-test:zibx:reactive-table@0.6.15 +local-test:zibx:reactive-table@0.6.16 localstorage@1.0.2 logging@1.0.6 meteor@1.1.4 @@ -43,4 +43,4 @@ tinytest@1.0.4 tracker@1.0.5 ui@1.0.5 underscore@1.0.2 -zibx:reactive-table@0.6.15 +zibx:reactive-table@0.6.16 diff --git a/lib/reactive_table.html b/lib/reactive_table.html index 5769d54..e5a8e55 100644 --- a/lib/reactive_table.html +++ b/lib/reactive_table.html @@ -81,7 +81,7 @@ {{#each sortedRows}} {{#if ../customRow this}} - {{> ../customRow this}} + {{> ../customRow}} {{else}} {{#each ../fields}} {{#if isVisible}} diff --git a/package.js b/package.js index 518b983..54d9967 100644 --- a/package.js +++ b/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "A reactive table designed for Meteor", - version: "0.6.16", + version: "0.6.17", name: "zibx:reactive-table", git: "https://github.com/Zibx/reactive-table.git" }); From e34e194cee98d9ccc05a97731d1b912aaebce319 Mon Sep 17 00:00:00 2001 From: Zibx Date: Wed, 4 Mar 2015 04:40:37 +0400 Subject: [PATCH 4/5] undo fix --- .versions | 4 ++-- lib/reactive_table.html | 2 +- package.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.versions b/.versions index 601dd79..e2f173d 100644 --- a/.versions +++ b/.versions @@ -20,7 +20,7 @@ htmljs@1.0.3 id-map@1.0.2 jquery@1.11.3 json@1.0.2 -local-test:zibx:reactive-table@0.6.16 +local-test:zibx:reactive-table@0.6.17 localstorage@1.0.2 logging@1.0.6 meteor@1.1.4 @@ -43,4 +43,4 @@ tinytest@1.0.4 tracker@1.0.5 ui@1.0.5 underscore@1.0.2 -zibx:reactive-table@0.6.16 +zibx:reactive-table@0.6.17 diff --git a/lib/reactive_table.html b/lib/reactive_table.html index e5a8e55..5769d54 100644 --- a/lib/reactive_table.html +++ b/lib/reactive_table.html @@ -81,7 +81,7 @@ {{#each sortedRows}} {{#if ../customRow this}} - {{> ../customRow}} + {{> ../customRow this}} {{else}} {{#each ../fields}} {{#if isVisible}} diff --git a/package.js b/package.js index 54d9967..8ae7886 100644 --- a/package.js +++ b/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "A reactive table designed for Meteor", - version: "0.6.17", + version: "0.6.18", name: "zibx:reactive-table", git: "https://github.com/Zibx/reactive-table.git" }); From 4131d725a981a3356b17f5ddcbbeb91a17b379d7 Mon Sep 17 00:00:00 2001 From: Zibx Date: Wed, 4 Mar 2015 04:53:11 +0400 Subject: [PATCH 5/5] refix --- .versions | 4 ++-- lib/reactive_table.html | 2 +- lib/reactive_table.js | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.versions b/.versions index e2f173d..4b22f42 100644 --- a/.versions +++ b/.versions @@ -20,7 +20,7 @@ htmljs@1.0.3 id-map@1.0.2 jquery@1.11.3 json@1.0.2 -local-test:zibx:reactive-table@0.6.17 +local-test:zibx:reactive-table@0.6.18 localstorage@1.0.2 logging@1.0.6 meteor@1.1.4 @@ -43,4 +43,4 @@ tinytest@1.0.4 tracker@1.0.5 ui@1.0.5 underscore@1.0.2 -zibx:reactive-table@0.6.17 +zibx:reactive-table@0.6.18 diff --git a/lib/reactive_table.html b/lib/reactive_table.html index 5769d54..3f2f8d6 100644 --- a/lib/reactive_table.html +++ b/lib/reactive_table.html @@ -81,7 +81,7 @@ {{#each sortedRows}} {{#if ../customRow this}} - {{> ../customRow this}} + {{> ../customRowTpl}} {{else}} {{#each ../fields}} {{#if isVisible}} diff --git a/lib/reactive_table.js b/lib/reactive_table.js index 7d5f8e0..52da69f 100644 --- a/lib/reactive_table.js +++ b/lib/reactive_table.js @@ -268,6 +268,7 @@ var setup = function () { context.customRow = this.data.settings.customRow || function () { return false; }; + context.customRowTpl = this.data.settings.customRowTpl; context.ready = new ReactiveVar(true);