From ed25c759a814e6a5a5e4740b0c9a0fdc8e43860a Mon Sep 17 00:00:00 2001
From: bkovacik <varnishedgreen@aim.com>
Date: Fri, 3 Mar 2017 13:12:04 -0600
Subject: [PATCH] refactored table a little

---
 dist/.reporttable.js.swp | Bin 0 -> 36864 bytes
 dist/reporttable.js      |  64 ++++++++++++++++++++++++++++++---------
 2 files changed, 49 insertions(+), 15 deletions(-)
 create mode 100644 dist/.reporttable.js.swp

diff --git a/dist/.reporttable.js.swp b/dist/.reporttable.js.swp
new file mode 100644
index 0000000000000000000000000000000000000000..39d53ce134e69661dead12350ae5e66aa668b576
GIT binary patch
literal 36864
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

literal 0
HcmV?d00001

diff --git a/dist/reporttable.js b/dist/reporttable.js
index b670274..cb13110 100644
--- a/dist/reporttable.js
+++ b/dist/reporttable.js
@@ -33,11 +33,19 @@
         this.refreshFunct = $.proxy(this.scroll, this);
         this.resizeFunct = $.proxy(this.resize, this);
 
+        var that = this;
         $(window).scroll(this.refreshFunct);
         $(window).resize(this.resizeFunct);
+        this.scrollContainer.scroll(function() {
+            if (this.scrollHeight <= $(this).scrollTop() + $(this).height()) { 
+                that.parentContainer.trigger("needsMoreData", [that.parentContainer]);
+            }
+
+            that.frozenScrollContainer.scrollTop($(this).scrollTop());
+            that.regularTable.find(".headerFooterContainer").scrollLeft($(this).scrollLeft());
+        });
 
         var scrollEventObject;
-        var that = this;
         if (scrollEventObject = this.options.scrollEventObject)  {
             scrollEventObject.scroll(function() {that.scroll()});
         } else {
@@ -56,6 +64,7 @@
         this.frozenIndices = [];
         this.container.on("colFreezeToggle", function (event, index) {
             var widths = that.getOuterWidthsFromFirstRow();
+
             var headerHeight = that.getHeightFromHeader();
             var rowHeight = that.getHeightFromFirstRow();
             var frozenIndex = that.frozenIndices.indexOf(index);
@@ -77,12 +86,13 @@
             });
 
             that.parentContainer.find("tr").height(headerHeight);
-            that.parentContainer.find("tr").each(function () {
+            that.parentContainer.find("#frozenContainer tr").each(function () {
                 $(this).children("td,th").eq(index).width(widths[index]);
             });
 
             that.accommodateFrozen($('#frozenCols'));
             that.resize();
+            that.scrollContainer.scroll();
         });
 
         this.frozenCols.on("rowAdded", function (event, args) {
@@ -111,7 +121,9 @@
     {
         selectedRow = $(table).children().children().first();
 
-        this.regularTable.css({"left":this.parentContainer.find("#frozenContainer").width()});
+        var width = this.parentContainer.find("#frozenContainer").width();
+        this.regularTable.css("left", width);
+        this.scrollContainer.css("max-width", this.parentContainer.width() - width);
     }
 
     ReportTable.prototype.reset = function()
@@ -137,7 +149,7 @@
             .addClass(this.options.cssPrefix+"_footer")
             .css({
                 position:"relative",
-                "margin-top":-this.container.children("tfoot").height(),
+                //"margin-top":-this.container.children("tfoot").height(),
                 "table-layout":"fixed"
             })
             .append(this.container.children("tfoot").clone(true));
@@ -149,15 +161,17 @@
         if(this.options.scrollContainer != null)
             this.createFooterScrollbar();
 
-        this.frozenTable = $("<div>").addClass('inline-block').attr('id', 'frozenContainer');
-        this.regularTable = $("<div>").addClass('inline-block').attr('id', 'regularContainer');
+        this.frozenTable = $("<div>").attr("id", "frozenContainer");
+        this.regularTable = $("<div>").attr("id", "regularContainer");
 
-        this.frozenHeader = this.header.clone(true).attr("id", "frozenHeader");
+        this.frozenHeader = this.header.clone(true).attr("id", "frozenHeader").addClass("headerContainer");
         this.frozenHeader.find(".freeze-column").trigger("freezeToggle");
         this.frozenHeader.find("td,th").hide();
         this.frozenTable.append(this.frozenHeader);
 
-        this.frozenTable.append(this.frozenCols);
+        this.frozenScrollContainer = $("<div>").addClass("frozenScrollContainer");
+        this.frozenScrollContainer.append(this.frozenCols);
+        this.frozenTable.append(this.frozenScrollContainer);
         this.frozenTable.find("th").hide();
 
         this.frozenFooter = this.footer.clone()
@@ -168,13 +182,21 @@
         this.container.before(this.frozenTable);
         this.container.before(this.regularTable);
 
-        this.regularTable.append(this.container);
+        this.scrollContainer = $("<div>").addClass("reportScrollContainer");
+        this.scrollContainer.append(this.container);
+
+        this.regularTable.append($("<div>").addClass("headerFooterContainer headerContainer").append(this.header));
+        this.regularTable.append(this.scrollContainer);
+        this.regularTable.append($("<div>").addClass("headerFooterContainer").append(this.footer));
+
+        var frozenTableMain = this.frozenTable.find("table").eq(1);
+        frozenTableMain.find("thead").css("visibility", "hidden");
+        frozenTableMain.find("tfoot").hide();
 
-        this.container.before(this.header);
-        this.container.after(this.footer);
+        var regularTableMain = this.regularTable.find("table").eq(1);
+        regularTableMain.find("thead").css("visibility", "hidden");
+        regularTableMain.find("tfoot").hide();
 
-        this.frozenTable.find("table").eq(1).find("thead, tfoot").css("visibility", "hidden");
-        this.regularTable.find("table").eq(1).find("thead, tfoot").css("visibility", "hidden");
         this.refresh();
     }
 
@@ -187,8 +209,9 @@
     ReportTable.prototype.scroll = function()
     {
         if ($(window).scrollTop() + $(window).height() > $(document).height()) return;
-        this.moveHeader();
-        this.moveFooter();
+console.log("I'M SCROLLING");
+        //this.moveHeader();
+        //this.moveFooter();
     }
 
     ReportTable.prototype.moveHeader = function()
@@ -239,6 +262,7 @@
                 if(index >= widths.length) {
                     return false;
                 }
+
                 $(this).css("min-width", widths[index]);
                 $(this).css("max-width", widths[index]);
             });
@@ -319,6 +343,16 @@
         return widths;
     }
 
+    ReportTable.prototype.getOuterWidthsFromHeader = function ()
+    {
+        var widths = [];
+        this.header.find("tr").eq(1).find("td, th").each(function(index) {
+            widths.push($(this).outerWidth());
+        });
+
+        return widths;
+    } 
+
     ReportTable.prototype.getOuterWidthsFromFirstRow = function()
     {
         var firstRow = this.body.find("tr").eq(0);