From 2b1f4b6495c8b9c12aa4544594e2652c77d752a9 Mon Sep 17 00:00:00 2001 From: Bruce McPherson Date: Fri, 24 Jun 2016 18:10:40 +0100 Subject: [PATCH] updated by GasGit automation --- scripts/Sankey.js | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/scripts/Sankey.js b/scripts/Sankey.js index 169b261..aa7ca17 100644 --- a/scripts/Sankey.js +++ b/scripts/Sankey.js @@ -134,7 +134,10 @@ var Sankey = (function(sankey) { template: "dividerTemplate", label: "Source data" }, - + filterDivider: { + template: "dividerTemplate", + label: "Filtering" + }, columnDivider: { template: "dividerTemplate", label: "Columns" @@ -361,6 +364,7 @@ var Sankey = (function(sankey) { } } }, + weightColumn: { template: "selectTemplate", label: "Weight column", @@ -375,6 +379,20 @@ var Sankey = (function(sankey) { } }, + applyFilters: { + template: "checkboxTemplate", + label: "Respect filters in data", + icon: "filter_list", + values:{ + resetable:true + }, + on: { + change: function (elementer, branch , ob,e) { + elementer.getElements().controls.resetButton_dataSettings.disabled = false; + } + } + }, + previewWidth: { template: "numberTemplate", label: "Width", @@ -784,7 +802,8 @@ var Sankey = (function(sankey) { dataSettings: { label: "Data", - items: ["sourceDivider", "wholeSheet", "selectedRange", "columnDivider", "fromColumn", "toColumn", "weightColumn","resetButton_dataSettings"], + items: ["sourceDivider", "wholeSheet", "selectedRange", "columnDivider", + "fromColumn", "toColumn", "weightColumn","filterDivider","applyFilters","resetButton_dataSettings"], on:{ enter:function (elementer,branch) { elementer.getElements().controls.resetButton_dataSettings.disabled = true;