@datarailsshared/dr_renderer 1.4.97 → 1.4.99

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datarailsshared/dr_renderer",
-  "version": "1.4.97",
+  "version": "1.4.99",
   "description": "DataRails charts and tables renderer",
   "keywords": [
     "datarails",

package/src/highcharts_renderer.js

@@ -4839,6 +4839,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             dateValuesDictionary: pivotOptions ? pivotOptions.dateValuesDictionary : null,
             keysObject: pivotOptions ? pivotOptions.keysObject : null,
             isDrillDownDisabled: pivotOptions ? pivotOptions.isDrillDownDisabled : false,
+            pivotUiFnRemoved: pivotOptions ? pivotOptions.pivotUiFnRemoved : false,
         };
 
         if (!subopts.rendererOptions) {

package/src/pivottable.js

@@ -665,6 +665,7 @@ let initPivotTable = function($, window, document) {
             this.getFormattedColKeys = (keys) => opts.getFormattedColKeys(this, keys);
             this.getFormattedRowKeys = (keys) => opts.getFormattedRowKeys(this, keys);
             this.isDrillDownDisabled = opts.isDrillDownDisabled;
+            this.pivotUiFnRemoved = opts.pivotUiFnRemoved;
 
             PivotData.forEachRecord(this.input, this.derivedAttributes, (function(_this) {
                 return function(record) {
@@ -1214,500 +1215,502 @@ let initPivotTable = function($, window, document) {
     Pivot Table UI: calls Pivot Table core above with options set by user
      */
     $.fn.pivotUI = function(input, inputOpts, overwrite, locale) {
-        var a, aggregator, attr, attrLength, attrValues, c, colOrderArrow, defaults, e, existingOpts, fn1, i, initialRender, l, len1, len2, len3, localeDefaults, localeStrings, materializedInput, n, o, opts, ordering, pivotTable, recordsProcessed, ref, ref1, ref2, ref3, refresh, refreshDelayed, renderer, rendererControl, rowOrderArrow, shownAttributes, shownInAggregators, shownInDragDrop, tr1, tr2, uiTable, unused, unusedAttrsVerticalAutoCutoff, unusedAttrsVerticalAutoOverride, x;
-        if (overwrite == null) {
-            overwrite = false;
-        }
-        if (locale == null) {
-            locale = "en";
-        }
-        if (locales[locale] == null) {
-            locale = "en";
-        }
-        defaults = {
-            derivedAttributes: {},
-            aggregators: locales[locale].aggregators,
-            renderers: locales[locale].renderers,
-            hiddenAttributes: [],
-            hiddenFromAggregators: [],
-            hiddenFromDragDrop: [],
-            menuLimit: 500,
-            cols: [],
-            rows: [],
-            vals: [],
-            rowOrder: "key_a_to_z",
-            colOrder: "key_a_to_z",
-            dataClass: PivotData,
-            exclusions: {},
-            inclusions: {},
-            unusedAttrsVertical: 85,
-            autoSortUnusedAttrs: false,
-            onRefresh: null,
-            showUI: true,
-            filter: function() {
-                return true;
-            },
-            sorters: {}
-        };
-        localeStrings = $.extend(true, {}, locales.en.localeStrings, locales[locale].localeStrings);
-        localeDefaults = {
-            rendererOptions: {
+        if (!this.pivotUiFnRemoved) {
+            var a, aggregator, attr, attrLength, attrValues, c, colOrderArrow, defaults, e, existingOpts, fn1, i, initialRender, l, len1, len2, len3, localeDefaults, localeStrings, materializedInput, n, o, opts, ordering, pivotTable, recordsProcessed, ref, ref1, ref2, ref3, refresh, refreshDelayed, renderer, rendererControl, rowOrderArrow, shownAttributes, shownInAggregators, shownInDragDrop, tr1, tr2, uiTable, unused, unusedAttrsVerticalAutoCutoff, unusedAttrsVerticalAutoOverride, x;
+            if (overwrite == null) {
+                overwrite = false;
+            }
+            if (locale == null) {
+                locale = "en";
+            }
+            if (locales[locale] == null) {
+                locale = "en";
+            }
+            defaults = {
+                derivedAttributes: {},
+                aggregators: locales[locale].aggregators,
+                renderers: locales[locale].renderers,
+                hiddenAttributes: [],
+                hiddenFromAggregators: [],
+                hiddenFromDragDrop: [],
+                menuLimit: 500,
+                cols: [],
+                rows: [],
+                vals: [],
+                rowOrder: "key_a_to_z",
+                colOrder: "key_a_to_z",
+                dataClass: PivotData,
+                exclusions: {},
+                inclusions: {},
+                unusedAttrsVertical: 85,
+                autoSortUnusedAttrs: false,
+                onRefresh: null,
+                showUI: true,
+                filter: function() {
+                    return true;
+                },
+                sorters: {}
+            };
+            localeStrings = $.extend(true, {}, locales.en.localeStrings, locales[locale].localeStrings);
+            localeDefaults = {
+                rendererOptions: {
+                    localeStrings: localeStrings
+                },
                 localeStrings: localeStrings
-            },
-            localeStrings: localeStrings
-        };
-        existingOpts = this.data("pivotUIOptions");
-        if ((existingOpts == null) || overwrite) {
-            opts = $.extend(true, {}, localeDefaults, $.extend({}, defaults, inputOpts));
-        } else {
-            opts = existingOpts;
-        }
-        try {
-            attrValues = {};
-            materializedInput = [];
-            recordsProcessed = 0;
-            PivotData.forEachRecord(input, opts.derivedAttributes, function(record) {
-                var attr, base, ref, value;
-                if (!opts.filter(record)) {
-                    return;
-                }
-                materializedInput.push(record);
-                for (attr in record) {
-                    if (!hasProp.call(record, attr)) continue;
-                    if (attrValues[attr] == null) {
-                        attrValues[attr] = {};
-                        if (recordsProcessed > 0) {
-                            attrValues[attr]["null"] = recordsProcessed;
-                        }
+            };
+            existingOpts = this.data("pivotUIOptions");
+            if ((existingOpts == null) || overwrite) {
+                opts = $.extend(true, {}, localeDefaults, $.extend({}, defaults, inputOpts));
+            } else {
+                opts = existingOpts;
+            }
+            try {
+                attrValues = {};
+                materializedInput = [];
+                recordsProcessed = 0;
+                PivotData.forEachRecord(input, opts.derivedAttributes, function(record) {
+                    var attr, base, ref, value;
+                    if (!opts.filter(record)) {
+                        return;
                     }
-                }
-                for (attr in attrValues) {
-                    value = (ref = record[attr]) != null ? ref : "null";
-                    if ((base = attrValues[attr])[value] == null) {
-                        base[value] = 0;
+                    materializedInput.push(record);
+                    for (attr in record) {
+                        if (!hasProp.call(record, attr)) continue;
+                        if (attrValues[attr] == null) {
+                            attrValues[attr] = {};
+                            if (recordsProcessed > 0) {
+                                attrValues[attr]["null"] = recordsProcessed;
+                            }
+                        }
                     }
-                    attrValues[attr][value]++;
-                }
-                return recordsProcessed++;
-            });
-            uiTable = $("<table>", {
-                "class": "pvtUi"
-            }).attr("cellpadding", 5);
-            rendererControl = $("<td>").addClass("pvtUiCell");
-            renderer = $("<select>").addClass('pvtRenderer').appendTo(rendererControl).bind("change", function() {
-                return refresh();
-            });
-            ref = opts.renderers;
-            for (x in ref) {
-                if (!hasProp.call(ref, x)) continue;
-                $("<option>").val(x).html(x).appendTo(renderer);
-            }
-            unused = $("<td>").addClass('pvtAxisContainer pvtUnused pvtUiCell');
-            shownAttributes = (function() {
-                var results;
-                results = [];
-                for (a in attrValues) {
-                    if (indexOf.call(opts.hiddenAttributes, a) < 0) {
-                        results.push(a);
+                    for (attr in attrValues) {
+                        value = (ref = record[attr]) != null ? ref : "null";
+                        if ((base = attrValues[attr])[value] == null) {
+                            base[value] = 0;
+                        }
+                        attrValues[attr][value]++;
                     }
+                    return recordsProcessed++;
+                });
+                uiTable = $("<table>", {
+                    "class": "pvtUi"
+                }).attr("cellpadding", 5);
+                rendererControl = $("<td>").addClass("pvtUiCell");
+                renderer = $("<select>").addClass('pvtRenderer').appendTo(rendererControl).bind("change", function() {
+                    return refresh();
+                });
+                ref = opts.renderers;
+                for (x in ref) {
+                    if (!hasProp.call(ref, x)) continue;
+                    $("<option>").val(x).html(x).appendTo(renderer);
                 }
-                return results;
-            })();
-            shownInAggregators = (function() {
-                var l, len1, results;
-                results = [];
-                for (l = 0, len1 = shownAttributes.length; l < len1; l++) {
-                    c = shownAttributes[l];
-                    if (indexOf.call(opts.hiddenFromAggregators, c) < 0) {
-                        results.push(c);
+                unused = $("<td>").addClass('pvtAxisContainer pvtUnused pvtUiCell');
+                shownAttributes = (function() {
+                    var results;
+                    results = [];
+                    for (a in attrValues) {
+                        if (indexOf.call(opts.hiddenAttributes, a) < 0) {
+                            results.push(a);
+                        }
                     }
-                }
-                return results;
-            })();
-            shownInDragDrop = (function() {
-                var l, len1, results;
-                results = [];
-                for (l = 0, len1 = shownAttributes.length; l < len1; l++) {
-                    c = shownAttributes[l];
-                    if (indexOf.call(opts.hiddenFromDragDrop, c) < 0) {
-                        results.push(c);
+                    return results;
+                })();
+                shownInAggregators = (function() {
+                    var l, len1, results;
+                    results = [];
+                    for (l = 0, len1 = shownAttributes.length; l < len1; l++) {
+                        c = shownAttributes[l];
+                        if (indexOf.call(opts.hiddenFromAggregators, c) < 0) {
+                            results.push(c);
+                        }
                     }
-                }
-                return results;
-            })();
-            unusedAttrsVerticalAutoOverride = false;
-            if (opts.unusedAttrsVertical === "auto") {
-                unusedAttrsVerticalAutoCutoff = 120;
-            } else {
-                unusedAttrsVerticalAutoCutoff = parseInt(opts.unusedAttrsVertical);
-            }
-            if (!isNaN(unusedAttrsVerticalAutoCutoff)) {
-                attrLength = 0;
-                for (l = 0, len1 = shownInDragDrop.length; l < len1; l++) {
-                    a = shownInDragDrop[l];
-                    attrLength += a.length;
-                }
-                unusedAttrsVerticalAutoOverride = attrLength > unusedAttrsVerticalAutoCutoff;
-            }
-            if (opts.unusedAttrsVertical === true || unusedAttrsVerticalAutoOverride) {
-                unused.addClass('pvtVertList');
-            } else {
-                unused.addClass('pvtHorizList');
-            }
-            fn1 = function(attr) {
-                var attrElem, checkContainer, closeFilterBox, controls, filterItem, filterItemExcluded, finalButtons, hasExcludedItem, len2, n, placeholder, ref1, sorter, triangleLink, v, value, valueCount, valueList, values;
-                values = (function() {
-                    var results;
+                    return results;
+                })();
+                shownInDragDrop = (function() {
+                    var l, len1, results;
                     results = [];
-                    for (v in attrValues[attr]) {
-                        results.push(v);
+                    for (l = 0, len1 = shownAttributes.length; l < len1; l++) {
+                        c = shownAttributes[l];
+                        if (indexOf.call(opts.hiddenFromDragDrop, c) < 0) {
+                            results.push(c);
+                        }
                     }
                     return results;
                 })();
-                hasExcludedItem = false;
-                valueList = $("<div>").addClass('pvtFilterBox').hide();
-                valueList.append($("<h4>").append($("<span>").text(attr), $("<span>").addClass("count").text("(" + values.length + ")")));
-                if (values.length > opts.menuLimit) {
-                    valueList.append($("<p>").html(opts.localeStrings.tooMany));
+                unusedAttrsVerticalAutoOverride = false;
+                if (opts.unusedAttrsVertical === "auto") {
+                    unusedAttrsVerticalAutoCutoff = 120;
+                } else {
+                    unusedAttrsVerticalAutoCutoff = parseInt(opts.unusedAttrsVertical);
+                }
+                if (!isNaN(unusedAttrsVerticalAutoCutoff)) {
+                    attrLength = 0;
+                    for (l = 0, len1 = shownInDragDrop.length; l < len1; l++) {
+                        a = shownInDragDrop[l];
+                        attrLength += a.length;
+                    }
+                    unusedAttrsVerticalAutoOverride = attrLength > unusedAttrsVerticalAutoCutoff;
+                }
+                if (opts.unusedAttrsVertical === true || unusedAttrsVerticalAutoOverride) {
+                    unused.addClass('pvtVertList');
                 } else {
-                    if (values.length > 5) {
-                        controls = $("<p>").appendTo(valueList);
-                        sorter = getSort(opts.sorters, attr);
-                        placeholder = opts.localeStrings.filterResults;
-                        $("<input>", {
-                            type: "text"
-                        }).appendTo(controls).attr({
-                            placeholder: placeholder,
-                            "class": "pvtSearch"
-                        }).bind("keyup", function() {
-                            var accept, accept_gen, filter;
-                            filter = $(this).val().toLowerCase().trim();
-                            accept_gen = function(prefix, accepted) {
-                                return function(v) {
-                                    var real_filter, ref1;
-                                    real_filter = filter.substring(prefix.length).trim();
-                                    if (real_filter.length === 0) {
+                    unused.addClass('pvtHorizList');
+                }
+                fn1 = function(attr) {
+                    var attrElem, checkContainer, closeFilterBox, controls, filterItem, filterItemExcluded, finalButtons, hasExcludedItem, len2, n, placeholder, ref1, sorter, triangleLink, v, value, valueCount, valueList, values;
+                    values = (function() {
+                        var results;
+                        results = [];
+                        for (v in attrValues[attr]) {
+                            results.push(v);
+                        }
+                        return results;
+                    })();
+                    hasExcludedItem = false;
+                    valueList = $("<div>").addClass('pvtFilterBox').hide();
+                    valueList.append($("<h4>").append($("<span>").text(attr), $("<span>").addClass("count").text("(" + values.length + ")")));
+                    if (values.length > opts.menuLimit) {
+                        valueList.append($("<p>").html(opts.localeStrings.tooMany));
+                    } else {
+                        if (values.length > 5) {
+                            controls = $("<p>").appendTo(valueList);
+                            sorter = getSort(opts.sorters, attr);
+                            placeholder = opts.localeStrings.filterResults;
+                            $("<input>", {
+                                type: "text"
+                            }).appendTo(controls).attr({
+                                placeholder: placeholder,
+                                "class": "pvtSearch"
+                            }).bind("keyup", function() {
+                                var accept, accept_gen, filter;
+                                filter = $(this).val().toLowerCase().trim();
+                                accept_gen = function(prefix, accepted) {
+                                    return function(v) {
+                                        var real_filter, ref1;
+                                        real_filter = filter.substring(prefix.length).trim();
+                                        if (real_filter.length === 0) {
+                                            return true;
+                                        }
+                                        return ref1 = Math.sign(sorter(v.toLowerCase(), real_filter)), indexOf.call(accepted, ref1) >= 0;
+                                    };
+                                };
+                                accept = filter.indexOf(">=") === 0 ? accept_gen(">=", [1, 0]) : filter.indexOf("<=") === 0 ? accept_gen("<=", [-1, 0]) : filter.indexOf(">") === 0 ? accept_gen(">", [1]) : filter.indexOf("<") === 0 ? accept_gen("<", [-1]) : filter.indexOf("~") === 0 ? function(v) {
+                                    if (filter.substring(1).trim().length === 0) {
                                         return true;
                                     }
-                                    return ref1 = Math.sign(sorter(v.toLowerCase(), real_filter)), indexOf.call(accepted, ref1) >= 0;
+                                    return v.toLowerCase().match(filter.substring(1));
+                                } : function(v) {
+                                    return v.toLowerCase().indexOf(filter) !== -1;
                                 };
-                            };
-                            accept = filter.indexOf(">=") === 0 ? accept_gen(">=", [1, 0]) : filter.indexOf("<=") === 0 ? accept_gen("<=", [-1, 0]) : filter.indexOf(">") === 0 ? accept_gen(">", [1]) : filter.indexOf("<") === 0 ? accept_gen("<", [-1]) : filter.indexOf("~") === 0 ? function(v) {
-                                if (filter.substring(1).trim().length === 0) {
-                                    return true;
-                                }
-                                return v.toLowerCase().match(filter.substring(1));
-                            } : function(v) {
-                                return v.toLowerCase().indexOf(filter) !== -1;
-                            };
-                            return valueList.find('.pvtCheckContainer p label span.value').each(function() {
-                                if (accept($(this).text())) {
-                                    return $(this).parent().parent().show();
-                                } else {
-                                    return $(this).parent().parent().hide();
-                                }
+                                return valueList.find('.pvtCheckContainer p label span.value').each(function() {
+                                    if (accept($(this).text())) {
+                                        return $(this).parent().parent().show();
+                                    } else {
+                                        return $(this).parent().parent().hide();
+                                    }
+                                });
                             });
-                        });
-                        controls.append($("<br>"));
-                        $("<button>", {
-                            type: "button"
-                        }).appendTo(controls).html(opts.localeStrings.selectAll).bind("click", function() {
-                            valueList.find("input:visible:not(:checked)").prop("checked", true).toggleClass("changed");
-                            return false;
-                        });
-                        $("<button>", {
-                            type: "button"
-                        }).appendTo(controls).html(opts.localeStrings.selectNone).bind("click", function() {
-                            valueList.find("input:visible:checked").prop("checked", false).toggleClass("changed");
-                            return false;
-                        });
+                            controls.append($("<br>"));
+                            $("<button>", {
+                                type: "button"
+                            }).appendTo(controls).html(opts.localeStrings.selectAll).bind("click", function() {
+                                valueList.find("input:visible:not(:checked)").prop("checked", true).toggleClass("changed");
+                                return false;
+                            });
+                            $("<button>", {
+                                type: "button"
+                            }).appendTo(controls).html(opts.localeStrings.selectNone).bind("click", function() {
+                                valueList.find("input:visible:checked").prop("checked", false).toggleClass("changed");
+                                return false;
+                            });
+                        }
+                        checkContainer = $("<div>").addClass("pvtCheckContainer").appendTo(valueList);
+                        ref1 = values.sort(getSort(opts.sorters, attr));
+                        for (n = 0, len2 = ref1.length; n < len2; n++) {
+                            value = ref1[n];
+                            valueCount = attrValues[attr][value];
+                            filterItem = $("<label>");
+                            filterItemExcluded = false;
+                            if (opts.inclusions[attr]) {
+                                filterItemExcluded = (indexOf.call(opts.inclusions[attr], value) < 0);
+                            } else if (opts.exclusions[attr]) {
+                                filterItemExcluded = (indexOf.call(opts.exclusions[attr], value) >= 0);
+                            }
+                            hasExcludedItem || (hasExcludedItem = filterItemExcluded);
+                            $("<input>").attr("type", "checkbox").addClass('pvtFilter').attr("checked", !filterItemExcluded).data("filter", [attr, value]).appendTo(filterItem).bind("change", function() {
+                                return $(this).toggleClass("changed");
+                            });
+                            filterItem.append($("<span>").addClass("value").text(value));
+                            filterItem.append($("<span>").addClass("count").text("(" + valueCount + ")"));
+                            checkContainer.append($("<p>").append(filterItem));
+                        }
                     }
-                    checkContainer = $("<div>").addClass("pvtCheckContainer").appendTo(valueList);
-                    ref1 = values.sort(getSort(opts.sorters, attr));
-                    for (n = 0, len2 = ref1.length; n < len2; n++) {
-                        value = ref1[n];
-                        valueCount = attrValues[attr][value];
-                        filterItem = $("<label>");
-                        filterItemExcluded = false;
-                        if (opts.inclusions[attr]) {
-                            filterItemExcluded = (indexOf.call(opts.inclusions[attr], value) < 0);
-                        } else if (opts.exclusions[attr]) {
-                            filterItemExcluded = (indexOf.call(opts.exclusions[attr], value) >= 0);
+                    closeFilterBox = function() {
+                        if (valueList.find("[type='checkbox']").length > valueList.find("[type='checkbox']:checked").length) {
+                            attrElem.addClass("pvtFilteredAttribute");
+                        } else {
+                            attrElem.removeClass("pvtFilteredAttribute");
                         }
-                        hasExcludedItem || (hasExcludedItem = filterItemExcluded);
-                        $("<input>").attr("type", "checkbox").addClass('pvtFilter').attr("checked", !filterItemExcluded).data("filter", [attr, value]).appendTo(filterItem).bind("change", function() {
-                            return $(this).toggleClass("changed");
+                        valueList.find('.pvtSearch').val('');
+                        valueList.find('.pvtCheckContainer p').show();
+                        return valueList.hide();
+                    };
+                    finalButtons = $("<p>").appendTo(valueList);
+                    if (values.length <= opts.menuLimit) {
+                        $("<button>", {
+                            type: "button"
+                        }).text(opts.localeStrings.apply).appendTo(finalButtons).bind("click", function() {
+                            if (valueList.find(".changed").removeClass("changed").length) {
+                                refresh();
+                            }
+                            return closeFilterBox();
                         });
-                        filterItem.append($("<span>").addClass("value").text(value));
-                        filterItem.append($("<span>").addClass("count").text("(" + valueCount + ")"));
-                        checkContainer.append($("<p>").append(filterItem));
-                    }
-                }
-                closeFilterBox = function() {
-                    if (valueList.find("[type='checkbox']").length > valueList.find("[type='checkbox']:checked").length) {
-                        attrElem.addClass("pvtFilteredAttribute");
-                    } else {
-                        attrElem.removeClass("pvtFilteredAttribute");
                     }
-                    valueList.find('.pvtSearch').val('');
-                    valueList.find('.pvtCheckContainer p').show();
-                    return valueList.hide();
-                };
-                finalButtons = $("<p>").appendTo(valueList);
-                if (values.length <= opts.menuLimit) {
                     $("<button>", {
                         type: "button"
-                    }).text(opts.localeStrings.apply).appendTo(finalButtons).bind("click", function() {
-                        if (valueList.find(".changed").removeClass("changed").length) {
-                            refresh();
-                        }
+                    }).text(opts.localeStrings.cancel).appendTo(finalButtons).bind("click", function() {
+                        valueList.find(".changed:checked").removeClass("changed").prop("checked", false);
+                        valueList.find(".changed:not(:checked)").removeClass("changed").prop("checked", true);
                         return closeFilterBox();
                     });
+                    triangleLink = $("<span>").addClass('pvtTriangle').html(" &#x25BE;").bind("click", function(e) {
+                        var left, ref2, top;
+                        ref2 = $(e.currentTarget).position(), left = ref2.left, top = ref2.top;
+                        return valueList.css({
+                            left: left + 10,
+                            top: top + 10
+                        }).show();
+                    });
+                    attrElem = $("<li>").addClass("axis_" + i).append($("<span>").addClass('pvtAttr').text(attr).data("attrName", attr).append(triangleLink));
+                    if (hasExcludedItem) {
+                        attrElem.addClass('pvtFilteredAttribute');
+                    }
+                    return unused.append(attrElem).append(valueList);
+                };
+                for (i in shownInDragDrop) {
+                    if (!hasProp.call(shownInDragDrop, i)) continue;
+                    attr = shownInDragDrop[i];
+                    fn1(attr);
+                }
+                tr1 = $("<tr>").appendTo(uiTable);
+                aggregator = $("<select>").addClass('pvtAggregator').bind("change", function() {
+                    return refresh();
+                });
+                ref1 = opts.aggregators;
+                for (x in ref1) {
+                    if (!hasProp.call(ref1, x)) continue;
+                    aggregator.append($("<option>").val(x).html(x));
                 }
-                $("<button>", {
-                    type: "button"
-                }).text(opts.localeStrings.cancel).appendTo(finalButtons).bind("click", function() {
-                    valueList.find(".changed:checked").removeClass("changed").prop("checked", false);
-                    valueList.find(".changed:not(:checked)").removeClass("changed").prop("checked", true);
-                    return closeFilterBox();
+                ordering = {
+                    key_a_to_z: {
+                        rowSymbol: "&varr;",
+                        colSymbol: "&harr;",
+                        next: "value_a_to_z"
+                    },
+                    value_a_to_z: {
+                        rowSymbol: "&darr;",
+                        colSymbol: "&rarr;",
+                        next: "value_z_to_a"
+                    },
+                    value_z_to_a: {
+                        rowSymbol: "&uarr;",
+                        colSymbol: "&larr;",
+                        next: "key_a_to_z"
+                    }
+                };
+                rowOrderArrow = $("<a>", {
+                    role: "button"
+                }).addClass("pvtRowOrder").data("order", opts.rowOrder).html(ordering[opts.rowOrder].rowSymbol).bind("click", function() {
+                    $(this).data("order", ordering[$(this).data("order")].next);
+                    $(this).html(ordering[$(this).data("order")].rowSymbol);
+                    return refresh();
                 });
-                triangleLink = $("<span>").addClass('pvtTriangle').html(" &#x25BE;").bind("click", function(e) {
-                    var left, ref2, top;
-                    ref2 = $(e.currentTarget).position(), left = ref2.left, top = ref2.top;
-                    return valueList.css({
-                        left: left + 10,
-                        top: top + 10
-                    }).show();
+                colOrderArrow = $("<a>", {
+                    role: "button"
+                }).addClass("pvtColOrder").data("order", opts.colOrder).html(ordering[opts.colOrder].colSymbol).bind("click", function() {
+                    $(this).data("order", ordering[$(this).data("order")].next);
+                    $(this).html(ordering[$(this).data("order")].colSymbol);
+                    return refresh();
                 });
-                attrElem = $("<li>").addClass("axis_" + i).append($("<span>").addClass('pvtAttr').text(attr).data("attrName", attr).append(triangleLink));
-                if (hasExcludedItem) {
-                    attrElem.addClass('pvtFilteredAttribute');
+                $("<td>").addClass('pvtVals pvtUiCell').appendTo(tr1).append(aggregator).append(rowOrderArrow).append(colOrderArrow).append($("<br>"));
+                $("<td>").addClass('pvtAxisContainer pvtHorizList pvtCols pvtUiCell').appendTo(tr1);
+                tr2 = $("<tr>").appendTo(uiTable);
+                tr2.append($("<td>").addClass('pvtAxisContainer pvtRows pvtUiCell').attr("valign", "top"));
+                pivotTable = $("<td>").attr("valign", "top").addClass('pvtRendererArea').appendTo(tr2);
+                if (opts.unusedAttrsVertical === true || unusedAttrsVerticalAutoOverride) {
+                    uiTable.find('tr:nth-child(1)').prepend(rendererControl);
+                    uiTable.find('tr:nth-child(2)').prepend(unused);
+                } else {
+                    uiTable.prepend($("<tr>").append(rendererControl).append(unused));
                 }
-                return unused.append(attrElem).append(valueList);
-            };
-            for (i in shownInDragDrop) {
-                if (!hasProp.call(shownInDragDrop, i)) continue;
-                attr = shownInDragDrop[i];
-                fn1(attr);
-            }
-            tr1 = $("<tr>").appendTo(uiTable);
-            aggregator = $("<select>").addClass('pvtAggregator').bind("change", function() {
-                return refresh();
-            });
-            ref1 = opts.aggregators;
-            for (x in ref1) {
-                if (!hasProp.call(ref1, x)) continue;
-                aggregator.append($("<option>").val(x).html(x));
-            }
-            ordering = {
-                key_a_to_z: {
-                    rowSymbol: "&varr;",
-                    colSymbol: "&harr;",
-                    next: "value_a_to_z"
-                },
-                value_a_to_z: {
-                    rowSymbol: "&darr;",
-                    colSymbol: "&rarr;",
-                    next: "value_z_to_a"
-                },
-                value_z_to_a: {
-                    rowSymbol: "&uarr;",
-                    colSymbol: "&larr;",
-                    next: "key_a_to_z"
+                this.html(uiTable);
+                ref2 = opts.cols;
+                for (n = 0, len2 = ref2.length; n < len2; n++) {
+                    x = ref2[n];
+                    this.find(".pvtCols").append(this.find(".axis_" + ($.inArray(x, shownInDragDrop))));
                 }
-            };
-            rowOrderArrow = $("<a>", {
-                role: "button"
-            }).addClass("pvtRowOrder").data("order", opts.rowOrder).html(ordering[opts.rowOrder].rowSymbol).bind("click", function() {
-                $(this).data("order", ordering[$(this).data("order")].next);
-                $(this).html(ordering[$(this).data("order")].rowSymbol);
-                return refresh();
-            });
-            colOrderArrow = $("<a>", {
-                role: "button"
-            }).addClass("pvtColOrder").data("order", opts.colOrder).html(ordering[opts.colOrder].colSymbol).bind("click", function() {
-                $(this).data("order", ordering[$(this).data("order")].next);
-                $(this).html(ordering[$(this).data("order")].colSymbol);
-                return refresh();
-            });
-            $("<td>").addClass('pvtVals pvtUiCell').appendTo(tr1).append(aggregator).append(rowOrderArrow).append(colOrderArrow).append($("<br>"));
-            $("<td>").addClass('pvtAxisContainer pvtHorizList pvtCols pvtUiCell').appendTo(tr1);
-            tr2 = $("<tr>").appendTo(uiTable);
-            tr2.append($("<td>").addClass('pvtAxisContainer pvtRows pvtUiCell').attr("valign", "top"));
-            pivotTable = $("<td>").attr("valign", "top").addClass('pvtRendererArea').appendTo(tr2);
-            if (opts.unusedAttrsVertical === true || unusedAttrsVerticalAutoOverride) {
-                uiTable.find('tr:nth-child(1)').prepend(rendererControl);
-                uiTable.find('tr:nth-child(2)').prepend(unused);
-            } else {
-                uiTable.prepend($("<tr>").append(rendererControl).append(unused));
-            }
-            this.html(uiTable);
-            ref2 = opts.cols;
-            for (n = 0, len2 = ref2.length; n < len2; n++) {
-                x = ref2[n];
-                this.find(".pvtCols").append(this.find(".axis_" + ($.inArray(x, shownInDragDrop))));
-            }
-            ref3 = opts.rows;
-            for (o = 0, len3 = ref3.length; o < len3; o++) {
-                x = ref3[o];
-                this.find(".pvtRows").append(this.find(".axis_" + ($.inArray(x, shownInDragDrop))));
-            }
-            if (opts.aggregatorName != null) {
-                this.find(".pvtAggregator").val(opts.aggregatorName);
-            }
-            if (opts.rendererName != null) {
-                this.find(".pvtRenderer").val(opts.rendererName);
-            }
-            if (!opts.showUI) {
-                this.find(".pvtUiCell").hide();
-            }
-            initialRender = true;
-            refreshDelayed = (function(_this) {
-                return function() {
-                    var exclusions, inclusions, len4, newDropdown, numInputsToProcess, pivotUIOptions, pvtVals, ref4, ref5, subopts, t, u, unusedAttrsContainer, vals;
-                    subopts = {
-                        derivedAttributes: opts.derivedAttributes,
-                        localeStrings: opts.localeStrings,
-                        rendererOptions: opts.rendererOptions,
-                        sorters: opts.sorters,
-                        cols: [],
-                        rows: [],
-                        dataClass: opts.dataClass
-                    };
-                    numInputsToProcess = (ref4 = opts.aggregators[aggregator.val()]([])().numInputs) != null ? ref4 : 0;
-                    vals = [];
-                    _this.find(".pvtRows li span.pvtAttr").each(function() {
-                        return subopts.rows.push($(this).data("attrName"));
-                    });
-                    _this.find(".pvtCols li span.pvtAttr").each(function() {
-                        return subopts.cols.push($(this).data("attrName"));
-                    });
-                    _this.find(".pvtVals select.pvtAttrDropdown").each(function() {
-                        if (numInputsToProcess === 0) {
-                            return $(this).remove();
-                        } else {
-                            numInputsToProcess--;
-                            if ($(this).val() !== "") {
-                                return vals.push($(this).val());
+                ref3 = opts.rows;
+                for (o = 0, len3 = ref3.length; o < len3; o++) {
+                    x = ref3[o];
+                    this.find(".pvtRows").append(this.find(".axis_" + ($.inArray(x, shownInDragDrop))));
+                }
+                if (opts.aggregatorName != null) {
+                    this.find(".pvtAggregator").val(opts.aggregatorName);
+                }
+                if (opts.rendererName != null) {
+                    this.find(".pvtRenderer").val(opts.rendererName);
+                }
+                if (!opts.showUI) {
+                    this.find(".pvtUiCell").hide();
+                }
+                initialRender = true;
+                refreshDelayed = (function(_this) {
+                    return function() {
+                        var exclusions, inclusions, len4, newDropdown, numInputsToProcess, pivotUIOptions, pvtVals, ref4, ref5, subopts, t, u, unusedAttrsContainer, vals;
+                        subopts = {
+                            derivedAttributes: opts.derivedAttributes,
+                            localeStrings: opts.localeStrings,
+                            rendererOptions: opts.rendererOptions,
+                            sorters: opts.sorters,
+                            cols: [],
+                            rows: [],
+                            dataClass: opts.dataClass
+                        };
+                        numInputsToProcess = (ref4 = opts.aggregators[aggregator.val()]([])().numInputs) != null ? ref4 : 0;
+                        vals = [];
+                        _this.find(".pvtRows li span.pvtAttr").each(function() {
+                            return subopts.rows.push($(this).data("attrName"));
+                        });
+                        _this.find(".pvtCols li span.pvtAttr").each(function() {
+                            return subopts.cols.push($(this).data("attrName"));
+                        });
+                        _this.find(".pvtVals select.pvtAttrDropdown").each(function() {
+                            if (numInputsToProcess === 0) {
+                                return $(this).remove();
+                            } else {
+                                numInputsToProcess--;
+                                if ($(this).val() !== "") {
+                                    return vals.push($(this).val());
+                                }
                             }
-                        }
-                    });
-                    if (numInputsToProcess !== 0) {
-                        pvtVals = _this.find(".pvtVals");
-                        for (x = t = 0, ref5 = numInputsToProcess; 0 <= ref5 ? t < ref5 : t > ref5; x = 0 <= ref5 ? ++t : --t) {
-                            newDropdown = $("<select>").addClass('pvtAttrDropdown').append($("<option>")).bind("change", function() {
-                                return refresh();
-                            });
-                            for (u = 0, len4 = shownInAggregators.length; u < len4; u++) {
-                                attr = shownInAggregators[u];
-                                newDropdown.append($("<option>").val(attr).text(attr));
+                        });
+                        if (numInputsToProcess !== 0) {
+                            pvtVals = _this.find(".pvtVals");
+                            for (x = t = 0, ref5 = numInputsToProcess; 0 <= ref5 ? t < ref5 : t > ref5; x = 0 <= ref5 ? ++t : --t) {
+                                newDropdown = $("<select>").addClass('pvtAttrDropdown').append($("<option>")).bind("change", function() {
+                                    return refresh();
+                                });
+                                for (u = 0, len4 = shownInAggregators.length; u < len4; u++) {
+                                    attr = shownInAggregators[u];
+                                    newDropdown.append($("<option>").val(attr).text(attr));
+                                }
+                                pvtVals.append(newDropdown);
                             }
-                            pvtVals.append(newDropdown);
                         }
-                    }
-                    if (initialRender) {
-                        vals = opts.vals;
-                        i = 0;
-                        _this.find(".pvtVals select.pvtAttrDropdown").each(function() {
-                            $(this).val(vals[i]);
-                            return i++;
-                        });
-                        initialRender = false;
-                    }
-                    subopts.aggregatorName = aggregator.val();
-                    subopts.vals = vals;
-                    subopts.aggregator = opts.aggregators[aggregator.val()](vals);
-                    subopts.renderer = opts.renderers[renderer.val()];
-                    subopts.rowOrder = rowOrderArrow.data("order");
-                    subopts.colOrder = colOrderArrow.data("order");
-                    exclusions = {};
-                    _this.find('input.pvtFilter').not(':checked').each(function() {
-                        var filter;
-                        filter = $(this).data("filter");
-                        if (exclusions[filter[0]] != null) {
-                            return exclusions[filter[0]].push(filter[1]);
-                        } else {
-                            return exclusions[filter[0]] = [filter[1]];
+                        if (initialRender) {
+                            vals = opts.vals;
+                            i = 0;
+                            _this.find(".pvtVals select.pvtAttrDropdown").each(function() {
+                                $(this).val(vals[i]);
+                                return i++;
+                            });
+                            initialRender = false;
                         }
-                    });
-                    inclusions = {};
-                    _this.find('input.pvtFilter:checked').each(function() {
-                        var filter;
-                        filter = $(this).data("filter");
-                        if (exclusions[filter[0]] != null) {
-                            if (inclusions[filter[0]] != null) {
-                                return inclusions[filter[0]].push(filter[1]);
+                        subopts.aggregatorName = aggregator.val();
+                        subopts.vals = vals;
+                        subopts.aggregator = opts.aggregators[aggregator.val()](vals);
+                        subopts.renderer = opts.renderers[renderer.val()];
+                        subopts.rowOrder = rowOrderArrow.data("order");
+                        subopts.colOrder = colOrderArrow.data("order");
+                        exclusions = {};
+                        _this.find('input.pvtFilter').not(':checked').each(function() {
+                            var filter;
+                            filter = $(this).data("filter");
+                            if (exclusions[filter[0]] != null) {
+                                return exclusions[filter[0]].push(filter[1]);
                             } else {
-                                return inclusions[filter[0]] = [filter[1]];
+                                return exclusions[filter[0]] = [filter[1]];
                             }
-                        }
-                    });
-                    subopts.filter = function(record) {
-                        var excludedItems, k, ref6, ref7;
-                        if (!opts.filter(record)) {
-                            return false;
-                        }
-                        for (k in exclusions) {
-                            excludedItems = exclusions[k];
-                            if (ref6 = "" + ((ref7 = record[k]) != null ? ref7 : 'null'), indexOf.call(excludedItems, ref6) >= 0) {
+                        });
+                        inclusions = {};
+                        _this.find('input.pvtFilter:checked').each(function() {
+                            var filter;
+                            filter = $(this).data("filter");
+                            if (exclusions[filter[0]] != null) {
+                                if (inclusions[filter[0]] != null) {
+                                    return inclusions[filter[0]].push(filter[1]);
+                                } else {
+                                    return inclusions[filter[0]] = [filter[1]];
+                                }
+                            }
+                        });
+                        subopts.filter = function(record) {
+                            var excludedItems, k, ref6, ref7;
+                            if (!opts.filter(record)) {
                                 return false;
                             }
+                            for (k in exclusions) {
+                                excludedItems = exclusions[k];
+                                if (ref6 = "" + ((ref7 = record[k]) != null ? ref7 : 'null'), indexOf.call(excludedItems, ref6) >= 0) {
+                                    return false;
+                                }
+                            }
+                            return true;
+                        };
+                        pivotTable.pivot(materializedInput, subopts);
+                        pivotUIOptions = $.extend({}, opts, {
+                            cols: subopts.cols,
+                            rows: subopts.rows,
+                            colOrder: subopts.colOrder,
+                            rowOrder: subopts.rowOrder,
+                            vals: vals,
+                            exclusions: exclusions,
+                            inclusions: inclusions,
+                            inclusionsInfo: inclusions,
+                            aggregatorName: aggregator.val(),
+                            rendererName: renderer.val()
+                        });
+                        _this.data("pivotUIOptions", pivotUIOptions);
+                        if (opts.autoSortUnusedAttrs) {
+                            unusedAttrsContainer = _this.find("td.pvtUnused.pvtAxisContainer");
+                            $(unusedAttrsContainer).children("li").sort(function(a, b) {
+                                return naturalSort($(a).text(), $(b).text());
+                            }).appendTo(unusedAttrsContainer);
+                        }
+                        pivotTable.css("opacity", 1);
+                        if (opts.onRefresh != null) {
+                            return opts.onRefresh(pivotUIOptions);
                         }
-                        return true;
                     };
-                    pivotTable.pivot(materializedInput, subopts);
-                    pivotUIOptions = $.extend({}, opts, {
-                        cols: subopts.cols,
-                        rows: subopts.rows,
-                        colOrder: subopts.colOrder,
-                        rowOrder: subopts.rowOrder,
-                        vals: vals,
-                        exclusions: exclusions,
-                        inclusions: inclusions,
-                        inclusionsInfo: inclusions,
-                        aggregatorName: aggregator.val(),
-                        rendererName: renderer.val()
-                    });
-                    _this.data("pivotUIOptions", pivotUIOptions);
-                    if (opts.autoSortUnusedAttrs) {
-                        unusedAttrsContainer = _this.find("td.pvtUnused.pvtAxisContainer");
-                        $(unusedAttrsContainer).children("li").sort(function(a, b) {
-                            return naturalSort($(a).text(), $(b).text());
-                        }).appendTo(unusedAttrsContainer);
-                    }
-                    pivotTable.css("opacity", 1);
-                    if (opts.onRefresh != null) {
-                        return opts.onRefresh(pivotUIOptions);
-                    }
-                };
-            })(this);
-            refresh = (function(_this) {
-                return function() {
-                    pivotTable.css("opacity", 0.5);
-                    return setTimeout(refreshDelayed, 10);
-                };
-            })(this);
-            refresh();
-            this.find(".pvtAxisContainer").sortable({
-                update: function(e, ui) {
-                    if (ui.sender == null) {
-                        return refresh();
-                    }
-                },
-                connectWith: this.find(".pvtAxisContainer"),
-                items: 'li',
-                placeholder: 'pvtPlaceholder'
-            });
-        } catch (error) {
-            e = error;
-            if (typeof console !== "undefined" && console !== null) {
-                console.error(e.stack);
+                })(this);
+                refresh = (function(_this) {
+                    return function() {
+                        pivotTable.css("opacity", 0.5);
+                        return setTimeout(refreshDelayed, 10);
+                    };
+                })(this);
+                refresh();
+                this.find(".pvtAxisContainer").sortable({
+                    update: function(e, ui) {
+                        if (ui.sender == null) {
+                            return refresh();
+                        }
+                    },
+                    connectWith: this.find(".pvtAxisContainer"),
+                    items: 'li',
+                    placeholder: 'pvtPlaceholder'
+                });
+            } catch (error) {
+                e = error;
+                if (typeof console !== "undefined" && console !== null) {
+                    console.error(e.stack);
+                }
+                // This function is not used internally or in webclient_angular/export_widget_service
+                // TODO if it not removed in DR-39041, upgrade the error propagation
+                this.html("An error occurred rendering the PivotTable UI.");
             }
-            // This function is not used internally or in webclient_angular/export_widget_service
-            // TODO if it not removed in DR-39041, upgrade the error propagation
-            this.html("An error occurred rendering the PivotTable UI.");
+            return this;
         }
-        return this;
     };
 
     /*