From 1e50d1bc0f81d387c6a3a363e52790fbbe2b08e1 Mon Sep 17 00:00:00 2001
From: Max Guglielmi <max.guglielmi@nearmap.com>
Date: Mon, 22 Sep 2014 09:18:17 +1000
Subject: [PATCH 1/3] Code formatting

---
 src/tablefilter_all.js | 191 ++++++++++++++++++++++++-----------------
 1 file changed, 113 insertions(+), 78 deletions(-)

diff --git a/src/tablefilter_all.js b/src/tablefilter_all.js
index c7de9078..ce66a9b3 100644
--- a/src/tablefilter_all.js
+++ b/src/tablefilter_all.js
@@ -1,4 +1,4 @@
-/*------------------------------------------------------------------------
+------------------------------------------------------------------------
     - HTML Table Filter Generator v2.5
     - By Max Guglielmi (tablefilter.free.fr)
     - Licensed under the MIT License
@@ -2259,25 +2259,30 @@ TF.prototype = {
             var o = this;
             this.Evt._Paging = {// paging buttons events
                 slcIndex: function(){
-                    return (o.pageSelectorType==o.fltTypeSlc) ?
+                    return (o.pageSelectorType===o.fltTypeSlc) ?
                         o.pagingSlc.options.selectedIndex :
                         parseInt(o.pagingSlc.value,10)-1;
                 },
                 nbOpts: function(){
-                    return (o.pageSelectorType==o.fltTypeSlc)
-                    ? parseInt(o.pagingSlc.options.length)-1
-                    : (o.nbPages-1);
+                    return (o.pageSelectorType===o.fltTypeSlc) ?
+                        parseInt(o.pagingSlc.options.length,10)-1 :
+                        (o.nbPages-1);
                 },
                 next: function(){
-                    if(o.Evt._Paging.nextEvt) o.Evt._Paging.nextEvt();
-                    var nextIndex = (o.Evt._Paging.slcIndex()<o.Evt._Paging.nbOpts())
-                        ? o.Evt._Paging.slcIndex()+1 : 0;
+                    if(o.Evt._Paging.nextEvt){
+                        o.Evt._Paging.nextEvt();
+                    }
+                    var nextIndex =
+                        o.Evt._Paging.slcIndex()<o.Evt._Paging.nbOpts() ?
+                        o.Evt._Paging.slcIndex()+1 : 0;
                     o.ChangePage(nextIndex);
                 },
                 prev: function(){
-                    if(o.Evt._Paging.prevEvt) o.Evt._Paging.prevEvt();
-                    var prevIndex = o.Evt._Paging.slcIndex()>0
-                        ? o.Evt._Paging.slcIndex()-1 : o.Evt._Paging.nbOpts();
+                    if(o.Evt._Paging.prevEvt){
+                        o.Evt._Paging.prevEvt();
+                    }
+                    var prevIndex = o.Evt._Paging.slcIndex()>0 ?
+                        o.Evt._Paging.slcIndex()-1 : o.Evt._Paging.nbOpts();
                     o.ChangePage(prevIndex);
                 },
                 last: function(){
@@ -2285,22 +2290,25 @@ TF.prototype = {
                     o.ChangePage(o.Evt._Paging.nbOpts());
                 },
                 first: function(){
-                    if(o.Evt._Paging.firstEvt)  o.Evt._Paging.firstEvt();
+                    if(o.Evt._Paging.firstEvt){
+                        o.Evt._Paging.firstEvt();
+                    }
                     o.ChangePage(0);
                 },
-                _detectKey: function(e)
-                {
-                    var evt=(e)?e:(window.event)?window.event:null;
-                    if(evt)
-                    {
-                        var key=(evt.charCode)?evt.charCode:
-                            ((evt.keyCode)?evt.keyCode:((evt.which)?evt.which:0));
-                        if(key=='13'){
-                            if(o.sorted){ o.Filter(); o.ChangePage(o.Evt._Paging.slcIndex()); }
-                            else o.ChangePage();
+                _detectKey: function(e){
+                    var evt = e || window.event;
+                    if(evt){
+                        var key = o.Evt.getKeyCode(e);
+                        if(key===13){
+                            if(o.sorted){
+                                o.Filter();
+                                o.ChangePage(o.Evt._Paging.slcIndex());
+                            } else{
+                                o.ChangePage();
+                            }
                             this.blur();
                         }
-                    }//if evt
+                    }
                 },
                 nextEvt: null,
                 prevEvt: null,
@@ -2309,33 +2317,33 @@ TF.prototype = {
             };
         }
 
-        if(!this.Evt._OnSlcPagesChange)
-        {
-            this.Evt._OnSlcPagesChange = function()
-            /*====================================================
-                - onchange event for paging select
-            =====================================================*/
-            {
-                if(o.Evt._Paging._OnSlcPagesChangeEvt)
+        /*====================================================
+            - onchange event for paging select
+        =====================================================*/
+        if(!this.Evt._OnSlcPagesChange){
+            this.Evt._OnSlcPagesChange = function(){
+                if(o.Evt._Paging._OnSlcPagesChangeEvt){
                     o.Evt._Paging._OnSlcPagesChangeEvt();
+                }
                 o.ChangePage();
                 this.blur();
                 //ie only: blur is not enough...
-                if(this.parentNode && tf_isIE)
+                if(this.parentNode && tf_isIE){
                     this.parentNode.focus();
-            }
+                }
+            };
         }
 
         // Paging drop-down list selector
-        if(this.pageSelectorType == this.fltTypeSlc)
-        {
-            var slcPages = tf_CreateElm( this.fltTypeSlc, ['id',this.prfxSlcPages+this.id] );
+        if(this.pageSelectorType === this.fltTypeSlc){
+            var slcPages = tf_CreateElm(
+                this.fltTypeSlc, ['id',this.prfxSlcPages+this.id]);
             slcPages.className = this.pgSlcCssClass;
             slcPages.onchange = this.Evt._OnSlcPagesChange;
         }
+
         // Paging input selector
-        if(this.pageSelectorType == this.fltTypeInp)
-        {
+        if(this.pageSelectorType === this.fltTypeInp){
             var slcPages = tf_CreateElm(
                 this.fltTypeInp,
                 ['id',this.prfxSlcPages+this.id],
@@ -2345,18 +2353,25 @@ TF.prototype = {
             slcPages.onkeypress = this.Evt._Paging._detectKey;
         }
 
-        var btnNextSpan, btnPrevSpan, btnLastSpan, btnFirstSpan;// btns containers
-        btnNextSpan = tf_CreateElm('span',['id',this.prfxBtnNextSpan+this.id]);
-        btnPrevSpan = tf_CreateElm('span',['id',this.prfxBtnPrevSpan+this.id]);
-        btnLastSpan = tf_CreateElm('span',['id',this.prfxBtnLastSpan+this.id]);
-        btnFirstSpan = tf_CreateElm('span',['id',this.prfxBtnFirstSpan+this.id]);
+        // btns containers
+        var btnNextSpan = tf_CreateElm(
+            'span',['id',this.prfxBtnNextSpan+this.id]);
+        var btnPrevSpan = tf_CreateElm(
+            'span',['id',this.prfxBtnPrevSpan+this.id]);
+        var btnLastSpan = tf_CreateElm(
+            'span',['id',this.prfxBtnLastSpan+this.id]);
+        var btnFirstSpan = tf_CreateElm(
+            'span',['id',this.prfxBtnFirstSpan+this.id]);
 
-        if(this.hasPagingBtns)
-        {
-            if(this.btnNextPageHtml==null)
-            {// Next button
-                var btn_next = tf_CreateElm( this.fltTypeInp,['id',this.prfxBtnNext+this.id],
-                    ['type','button'],['value',this.btnNextPageText],['title','Next'] );
+        if(this.hasPagingBtns){
+            // Next button
+            if(!this.btnNextPageHtml){
+                var btn_next = tf_CreateElm(
+                    this.fltTypeInp,['id',this.prfxBtnNext+this.id],
+                    ['type','button'],
+                    ['value',this.btnNextPageText],
+                    ['title','Next']
+                );
                 btn_next.className = this.btnPageCssClass;
                 btn_next.onclick = this.Evt._Paging.next;
                 btnNextSpan.appendChild(btn_next);
@@ -2364,11 +2379,15 @@ TF.prototype = {
                 btnNextSpan.innerHTML = this.btnNextPageHtml;
                 btnNextSpan.onclick = this.Evt._Paging.next;
             }
-
-            if(this.btnPrevPageHtml==null)
-            {// Previous button
-                var btn_prev = tf_CreateElm( this.fltTypeInp,['id',this.prfxBtnPrev+this.id],
-                    ['type','button'],['value',this.btnPrevPageText],['title','Previous'] );
+            // Previous button
+            if(!this.btnPrevPageHtml){
+                var btn_prev = tf_CreateElm(
+                    this.fltTypeInp,
+                    ['id',this.prfxBtnPrev+this.id],
+                    ['type','button'],
+                    ['value',this.btnPrevPageText],
+                    ['title','Previous']
+                );
                 btn_prev.className = this.btnPageCssClass;
                 btn_prev.onclick = this.Evt._Paging.prev;
                 btnPrevSpan.appendChild(btn_prev);
@@ -2376,11 +2395,15 @@ TF.prototype = {
                 btnPrevSpan.innerHTML = this.btnPrevPageHtml;
                 btnPrevSpan.onclick = this.Evt._Paging.prev;
             }
-
-            if(this.btnLastPageHtml==null)
-            {// Last button
-                var btn_last = tf_CreateElm( this.fltTypeInp,['id',this.prfxBtnLast+this.id],
-                    ['type','button'],['value',this.btnLastPageText],['title','Last'] );
+            // Last button
+            if(!this.btnLastPageHtml){
+                var btn_last = tf_CreateElm(
+                    this.fltTypeInp,
+                    ['id',this.prfxBtnLast+this.id],
+                    ['type','button'],
+                    ['value',this.btnLastPageText],
+                    ['title','Last']
+                );
                 btn_last.className = this.btnPageCssClass;
                 btn_last.onclick = this.Evt._Paging.last;
                 btnLastSpan.appendChild(btn_last);
@@ -2388,11 +2411,15 @@ TF.prototype = {
                 btnLastSpan.innerHTML = this.btnLastPageHtml;
                 btnLastSpan.onclick = this.Evt._Paging.last;
             }
-
-            if(this.btnFirstPageHtml==null)
-            {// First button
-                var btn_first = tf_CreateElm( this.fltTypeInp,['id',this.prfxBtnFirst+this.id],
-                    ['type','button'],['value',this.btnFirstPageText],['title','First'] );
+            // First button
+            if(!this.btnFirstPageHtml){
+                var btn_first = tf_CreateElm(
+                    this.fltTypeInp,
+                    ['id',this.prfxBtnFirst+this.id],
+                    ['type','button'],
+                    ['value',this.btnFirstPageText],
+                    ['title','First']
+                );
                 btn_first.className = this.btnPageCssClass;
                 btn_first.onclick = this.Evt._Paging.first;
                 btnFirstSpan.appendChild(btn_first);
@@ -2400,27 +2427,35 @@ TF.prototype = {
                 btnFirstSpan.innerHTML = this.btnFirstPageHtml;
                 btnFirstSpan.onclick = this.Evt._Paging.first;
             }
-        }//if this.hasPagingBtns
+        }
 
         // paging elements (buttons+drop-down list) are added to defined element
-        if(this.pagingTgtId==null) this.SetTopDiv();
-        var targetEl = ( this.pagingTgtId==null ) ? this.mDiv : tf_Id( this.pagingTgtId );
+        if(!this.pagingTgtId){
+            this.SetTopDiv();
+        }
+        var targetEl = !this.pagingTgtId ? this.mDiv : tf_Id(this.pagingTgtId);
 
-        /***    if paging previously removed this prevents IE memory leak with removeChild
-                used in RemovePaging method. For more info refer to
-                http://forums.microsoft.com/MSDN/ShowPost.aspx?PostID=2840253&SiteID=1  ***/
-        if ( targetEl.innerHTML!='' ) targetEl.innerHTML = '';
+        /***
+        if paging previously removed this prevents IE memory leak with
+        removeChild used in RemovePaging method. For more info refer to
+        http://forums.microsoft.com/MSDN/ShowPost.aspx?PostID=2840253&SiteID=1
+        ***/
+        if (targetEl.innerHTML!==''){
+            targetEl.innerHTML = '';
+        }
         /*** ***/
 
         targetEl.appendChild(btnFirstSpan);
         targetEl.appendChild(btnPrevSpan);
 
-        var pgBeforeSpan = tf_CreateElm( 'span',['id',this.prfxPgBeforeSpan+this.id] );
+        var pgBeforeSpan = tf_CreateElm(
+            'span',['id',this.prfxPgBeforeSpan+this.id] );
         pgBeforeSpan.appendChild( tf_CreateText(this.pageText) );
         pgBeforeSpan.className = this.nbPgSpanCssClass;
         targetEl.appendChild(pgBeforeSpan);
         targetEl.appendChild(slcPages);
-        var pgAfterSpan = tf_CreateElm( 'span',['id',this.prfxPgAfterSpan+this.id] );
+        var pgAfterSpan = tf_CreateElm(
+            'span',['id',this.prfxPgAfterSpan+this.id]);
         pgAfterSpan.appendChild( tf_CreateText(this.ofText) );
         pgAfterSpan.className = this.nbPgSpanCssClass;
         targetEl.appendChild(pgAfterSpan)
@@ -2430,14 +2465,14 @@ TF.prototype = {
         targetEl.appendChild(pgspan);
         targetEl.appendChild(btnNextSpan);
         targetEl.appendChild(btnLastSpan);
-        this.pagingSlc = tf_Id(this.prfxSlcPages+this.id); //to be easily re-used
+        this.pagingSlc = tf_Id(this.prfxSlcPages+this.id);
 
         // if this.rememberGridValues==true this.SetPagingInfo() is called
         // in ResetGridValues() method
-        if( !this.rememberGridValues || this.isPagingRemoved )
+        if(!this.rememberGridValues || this.isPagingRemoved){
             this.SetPagingInfo();
-        if( !this.fltGrid )
-        {
+        }
+        if(!this.fltGrid){
             this.ValidateAllRows();
             this.SetPagingInfo(this.validRowsIndex);
         }
@@ -6469,4 +6504,4 @@ function tf_hasClass(elm,cl){ return tf_HasClass(elm,cl); }
 function tf_isValidDate(dateStr,format){ return tf_IsValidDate(dateStr,format); }
 function tf_formatDate(dateStr,format){ return tf_FormatDate(dateStr,format); }
 function tf_removeNbFormat(data,format){ return tf_RemoveNbFormat(data,format); }
-/* --- */
\ No newline at end of file
+/* ---
\ No newline at end of file

From 40ec690dbc524b2771807d5308ce48a0bbf3447f Mon Sep 17 00:00:00 2001
From: Max Guglielmi <max.guglielmi@nearmap.com>
Date: Wed, 24 Sep 2014 16:06:12 +1000
Subject: [PATCH 2/3] Code formatting

---
 src/tablefilter_all.js | 261 ++++++++++++++++++++++++-----------------
 1 file changed, 153 insertions(+), 108 deletions(-)

diff --git a/src/tablefilter_all.js b/src/tablefilter_all.js
index ce66a9b3..47f5bcbb 100644
--- a/src/tablefilter_all.js
+++ b/src/tablefilter_all.js
@@ -1,8 +1,8 @@
-------------------------------------------------------------------------
+/* ------------------------------------------------------------------------
     - HTML Table Filter Generator v2.5
     - By Max Guglielmi (tablefilter.free.fr)
     - Licensed under the MIT License
---------------------------------------------------------------------------
+---------------------------------------------------------------------------
 Copyright (c) 2009-2014 Max Guglielmi
 
 Permission is hereby granted, free of charge, to any person obtaining
@@ -23,13 +23,13 @@ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
 CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
---------------------------------------------------------------------------
+---------------------------------------------------------------------------
     - Special credit to:
     Cedric Wartel, cnx.claude@free.fr, Florent Hirchy, Váry Péter,
     Anthony Maes, Nuovella Williams, Fuggerbit, Venkata Seshagiri Rao
     Raya, Piepiax, Manuel Kern, Baladhandayutham for active contribution
     and/or inspiration
-------------------------------------------------------------------------*/
+------------------------------------------------------------------------ */
 
 /**
  * TF object constructor
@@ -2334,9 +2334,11 @@ TF.prototype = {
             };
         }
 
+        var slcPages;
+
         // Paging drop-down list selector
         if(this.pageSelectorType === this.fltTypeSlc){
-            var slcPages = tf_CreateElm(
+            slcPages = tf_CreateElm(
                 this.fltTypeSlc, ['id',this.prfxSlcPages+this.id]);
             slcPages.className = this.pgSlcCssClass;
             slcPages.onchange = this.Evt._OnSlcPagesChange;
@@ -2344,7 +2346,7 @@ TF.prototype = {
 
         // Paging input selector
         if(this.pageSelectorType === this.fltTypeInp){
-            var slcPages = tf_CreateElm(
+            slcPages = tf_CreateElm(
                 this.fltTypeInp,
                 ['id',this.prfxSlcPages+this.id],
                 ['value',this.currentPageNb]
@@ -2481,196 +2483,239 @@ TF.prototype = {
         this.isPagingRemoved = false;
     },
 
-    RemovePaging: function()
     /*====================================================
         - Removes paging elements
     =====================================================*/
-    {
-        if(!this.hasGrid) return;
-        if( this.pagingSlc==null ) return;
-        var btnNextSpan, btnPrevSpan, btnLastSpan, btnFirstSpan;// btns containers
+    RemovePaging: function(){
+        if(!this.hasGrid || !this.pagingSlc){
+            return;
+        }
+
+        // btns containers
+        var btnNextSpan, btnPrevSpan, btnLastSpan, btnFirstSpan;
         var pgBeforeSpan, pgAfterSpan, pgspan;
         btnNextSpan = tf_Id(this.prfxBtnNextSpan+this.id);
         btnPrevSpan = tf_Id(this.prfxBtnPrevSpan+this.id);
         btnLastSpan = tf_Id(this.prfxBtnLastSpan+this.id);
         btnFirstSpan = tf_Id(this.prfxBtnFirstSpan+this.id);
-        pgBeforeSpan = tf_Id(this.prfxPgBeforeSpan+this.id);//span containing 'Page' text
-        pgAfterSpan = tf_Id(this.prfxPgAfterSpan+this.id);//span containing 'of' text
-        pgspan = tf_Id(this.prfxPgSpan+this.id);//span containing nb of pages
+        //span containing 'Page' text
+        pgBeforeSpan = tf_Id(this.prfxPgBeforeSpan+this.id);
+        //span containing 'of' text
+        pgAfterSpan = tf_Id(this.prfxPgAfterSpan+this.id);
+        //span containing nb of pages
+        pgspan = tf_Id(this.prfxPgSpan+this.id);
 
         this.pagingSlc.parentNode.removeChild(this.pagingSlc);
 
-        if( btnNextSpan!=null )
+        if(btnNextSpan){
             btnNextSpan.parentNode.removeChild( btnNextSpan );
+        }
 
-        if( btnPrevSpan!=null )
+        if(btnPrevSpan){
             btnPrevSpan.parentNode.removeChild( btnPrevSpan );
+        }
 
-        if( btnLastSpan!=null )
+        if(btnLastSpan){
             btnLastSpan.parentNode.removeChild( btnLastSpan );
+        }
 
-        if( btnFirstSpan!=null )
+        if(btnFirstSpan){
             btnFirstSpan.parentNode.removeChild( btnFirstSpan );
+        }
 
-        if( pgBeforeSpan!=null )
+        if(pgBeforeSpan){
             pgBeforeSpan.parentNode.removeChild( pgBeforeSpan );
+        }
 
-        if( pgAfterSpan!=null )
+        if(pgAfterSpan){
             pgAfterSpan.parentNode.removeChild( pgAfterSpan );
+        }
 
-        if( pgspan!=null )
+        if(pgspan){
             pgspan.parentNode.removeChild( pgspan );
+        }
 
         this.pagingBtnEvents = null;
         this.pagingSlc = null;
         this.isPagingRemoved = true;
     },
 
-    SetPagingInfo: function( validRows )
     /*====================================================
         - calculates page # according to valid rows
         - refreshes paging select according to page #
         - Calls GroupByPage method
     =====================================================*/
-    {
-        var row = this.tbl.rows;
-        var mdiv = ( this.pagingTgtId==null ) ? this.mDiv : tf_Id( this.pagingTgtId );
+    SetPagingInfo: function(validRows){
+        var rows = this.tbl.rows;
+        var mdiv = !this.pagingTgtId ? this.mDiv : tf_Id(this.pagingTgtId);
         var pgspan = tf_Id(this.prfxPgSpan+this.id);
+        //stores valid rows indexes
+        if(validRows && validRows.length>0){
+            this.validRowsIndex = validRows;
+        } else {
+            //re-sets valid rows indexes array
+            this.validRowsIndex = [];
 
-        if( validRows!=undefined ) this.validRowsIndex = validRows;//stores valid rows index
-        else
-        {
-            this.validRowsIndex = [];//re-sets valid rows index
-
-            for(var j=this.refRow; j<this.nbRows; j++)//counts rows to be grouped
-            {
-                if(!row[j]) continue;
-                var isRowValid = row[j].getAttribute('validRow');
-                if(isRowValid=='true' || isRowValid==null)
-                        this.validRowsIndex.push(j);
-            }//for j
+            //counts rows to be grouped
+            for(var j=this.refRow; j<this.nbRows; j++){
+                var row = rows[j];
+                if(!row){
+                    continue;
+                }
+                var isRowValid = row.getAttribute('validRow');
+                if(isRowValid==='true' || !isRowValid){
+                    this.validRowsIndex.push(j);
+                }
+            }
         }
 
-        this.nbPages = Math.ceil( this.validRowsIndex.length/this.pagingLength );//calculates nb of pages
-        pgspan.innerHTML = this.nbPages; //refresh page nb span
-        if(this.pageSelectorType==this.fltTypeSlc)
-            this.pagingSlc.innerHTML = '';//select clearing shortcut
+        //calculate nb of pages
+        this.nbPages = Math.ceil(this.validRowsIndex.length/this.pagingLength);
+        //refresh page nb span
+        pgspan.innerHTML = this.nbPages;
+        //select clearing shortcut
+        if(this.pageSelectorType===this.fltTypeSlc){
+            this.pagingSlc.innerHTML = '';
+        }
 
-        if( this.nbPages>0 )
-        {
+        if(this.nbPages>0){
             mdiv.style.visibility = 'visible';
-            if(this.pageSelectorType==this.fltTypeSlc)
-                for(var z=0; z<this.nbPages; z++)
-                {
-                    var currOpt = new Option((z+1),z*this.pagingLength,false,false);
+            if(this.pageSelectorType===this.fltTypeSlc){
+                for(var z=0; z<this.nbPages; z++){
+                    var currOpt = new Option(
+                        (z+1),
+                        z*this.pagingLength,
+                        false,
+                        false
+                    );
                     this.pagingSlc.options[z] = currOpt;
                 }
-            else this.pagingSlc.value = this.currentPageNb; //input type
+            } else{
+                //input type
+                this.pagingSlc.value = this.currentPageNb;
+            }
 
-        } else {/*** if no results paging select and buttons are hidden ***/
+        } else {
+            /*** if no results paging select and buttons are hidden ***/
             mdiv.style.visibility = 'hidden';
         }
-        this.GroupByPage( this.validRowsIndex );
+        this.GroupByPage(this.validRowsIndex);
     },
 
-    GroupByPage: function( validRows )
     /*====================================================
         - Displays current page rows
     =====================================================*/
-    {
-        var row = this.tbl.rows;
-        var paging_end_row = parseInt( this.startPagingRow ) + parseInt( this.pagingLength );
+    GroupByPage: function(validRows){
+        var rows = this.tbl.rows;
+        var paging_end_row = parseInt(this.startPagingRow, 10) +
+            parseInt(this.pagingLength, 10);
 
-        if( validRows!=undefined ) this.validRowsIndex = validRows;//stores valid rows index
+        //store valid rows indexes
+        if(validRows){
+            this.validRowsIndex = validRows;
+        }
 
-        for(h=0; h<this.validRowsIndex.length; h++)
-        {//this loop shows valid rows of current page
-            if( h>=this.startPagingRow && h<paging_end_row )
-            {
-                var r = row[ this.validRowsIndex[h] ];
-                if(r.getAttribute('validRow')=='true' || r.getAttribute('validRow')==undefined)
+        //this loop shows valid rows of current page
+        for(var h=0; h<this.validRowsIndex.length; h++){
+            var r = rows[ this.validRowsIndex[h] ];
+            if(h>=this.startPagingRow && h<paging_end_row){
+                if(r.getAttribute('validRow')==='true' ||
+                    !r.getAttribute('validRow')){
                     r.style.display = '';
-                if(this.alternateBgs) this.SetRowBg(this.validRowsIndex[h],h);
+                }
+                if(this.alternateBgs){
+                    this.SetRowBg(this.validRowsIndex[h], h);
+                }
             } else {
-                row[ this.validRowsIndex[h] ].style.display = 'none';
-                if(this.alternateBgs) this.RemoveRowBg(this.validRowsIndex[h]);
+                r.style.display = 'none';
+                if(this.alternateBgs){
+                    this.RemoveRowBg(this.validRowsIndex[h]);
+                }
             }
         }
 
         this.nbVisibleRows = this.validRowsIndex.length;
         this.isStartBgAlternate = false;
-        this.ApplyGridProps();//re-applies filter behaviours after filtering process
+        //re-applies filter behaviours after filtering process
+        this.ApplyGridProps();
     },
 
-    SetPage: function( cmd )
     /*====================================================
         - If paging set true shows page according to
         param value (string or number):
             - strings: 'next','previous','last','first' or
             - number: page number
     =====================================================*/
-    {
-        if( this.hasGrid && this.paging )
-        {
-            var btnEvt = this.pagingBtnEvents, cmdtype = typeof cmd;
-            if(cmdtype=='string')
-            {
-                switch(cmd.tf_LCase())
-                {
-                    case 'next':
-                        btnEvt.next();
-                    break;
-                    case 'previous':
-                        btnEvt.prev();
-                    break;
-                    case 'last':
-                        btnEvt.last();
-                    break;
-                    case 'first':
-                        btnEvt.first();
-                    break;
-                    default:
-                        btnEvt.next();
-                    break;
-                }//switch
+    SetPage: function(cmd){
+        if(!this.hasGrid || !this.paging){
+            return;
+        }
+        var btnEvt = this.pagingBtnEvents,
+            cmdtype = typeof cmd;
+        if(cmdtype==='string'){
+            switch(cmd.tf_LCase()){
+                case 'next':
+                    btnEvt.next();
+                break;
+                case 'previous':
+                    btnEvt.prev();
+                break;
+                case 'last':
+                    btnEvt.last();
+                break;
+                case 'first':
+                    btnEvt.first();
+                break;
+                default:
+                    btnEvt.next();
+                break;
             }
-            if(cmdtype=='number') this.ChangePage( (cmd-1) );
-        }// this.hasGrid
+        }
+        if(cmdtype==='number'){
+            this.ChangePage(cmd-1);
+        }
     },
 
-    SetResultsPerPage: function()
     /*====================================================
         - Generates results per page select + label
     =====================================================*/
-    {
-        if(!this.hasGrid && !this.isFirstLoad) return;
-        if( this.resultsPerPageSlc!=null || this.resultsPerPage==null ) return;
+    SetResultsPerPage: function(){
+        if(!this.hasGrid && !this.isFirstLoad){
+            return;
+        }
+        if(this.resultsPerPageSlc || !this.resultsPerPage){
+            return;
+        }
 
         //Change nb results per page event
-        if(!this.Evt._OnSlcResultsChange)
-        {
+        if(!this.Evt._OnSlcResultsChange){
             var o = this;
-            this.Evt._OnSlcResultsChange = function()
             /*====================================================
                 - onchange event for results per page select
             =====================================================*/
-            {
+            this.Evt._OnSlcResultsChange = function(){
                 o.ChangeResultsPerPage();
                 this.blur();
                 //ie only: blur is not enough...
-                if(this.parentNode && tf_isIE)
+                if(this.parentNode && tf_isIE){
                     this.parentNode.focus();
-            }
+                }
+            };
         }
 
-        var slcR = tf_CreateElm( this.fltTypeSlc,['id',this.prfxSlcResults+this.id] );
+        var slcR = tf_CreateElm(
+            this.fltTypeSlc, ['id',this.prfxSlcResults+this.id]);
         slcR.className = this.resultsSlcCssClass;
-        var slcRText = this.resultsPerPage[0], slcROpts = this.resultsPerPage[1];
-        var slcRSpan = tf_CreateElm( 'span',['id',this.prfxSlcResultsTxt+this.id] );
+        var slcRText = this.resultsPerPage[0],
+            slcROpts = this.resultsPerPage[1];
+        var slcRSpan = tf_CreateElm(
+            'span',['id',this.prfxSlcResultsTxt+this.id]);
         slcRSpan.className = this.resultsSpanCssClass;
 
-        // results per page select is added to defined element
-        if(this.resultsPerPageTgtId==null) this.SetTopDiv();
+        // results per page select is added to external element
+        if(!this.resultsPerPageTgtId){
+            this.SetTopDiv();
+        }
         var targetEl = ( this.resultsPerPageTgtId==null ) ? this.rDiv : tf_Id( this.resultsPerPageTgtId );
         slcRSpan.appendChild(tf_CreateText(slcRText));
         targetEl.appendChild(slcRSpan);
@@ -6504,4 +6549,4 @@ function tf_hasClass(elm,cl){ return tf_HasClass(elm,cl); }
 function tf_isValidDate(dateStr,format){ return tf_IsValidDate(dateStr,format); }
 function tf_formatDate(dateStr,format){ return tf_FormatDate(dateStr,format); }
 function tf_removeNbFormat(data,format){ return tf_RemoveNbFormat(data,format); }
-/* ---
\ No newline at end of file
+/* --- */
\ No newline at end of file

From fef259dbdbeee85f53166e654561795797a7fc44 Mon Sep 17 00:00:00 2001
From: Max Guglielmi <max.guglielmi@nearmap.com>
Date: Wed, 24 Sep 2014 17:10:31 +1000
Subject: [PATCH 3/3] Code formatting

---
 src/index.html         |   7 +-
 src/tablefilter_all.js | 545 ++++++++++++++++++++++++-----------------
 2 files changed, 327 insertions(+), 225 deletions(-)

diff --git a/src/index.html b/src/index.html
index d44fe4a8..31769f78 100644
--- a/src/index.html
+++ b/src/index.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-    <link href="filtergrid.css">
+    <title>HTML Table Filter Generator</title>
 </head>
 <body>
     <table id="demo" cellpadding="0" cellspacing="0">
@@ -68,8 +68,9 @@
     <script type="text/javascript" src="tablefilter_all.js"></script>
     <script>
         var tf = setFilterGrid("demo", {
-            base_path: '',
-            enable_default_theme: true
+            base_path: './',
+            enable_default_theme: true,
+            paging: true
         });
     </script>
 </body>
diff --git a/src/tablefilter_all.js b/src/tablefilter_all.js
index 47f5bcbb..d370a6aa 100644
--- a/src/tablefilter_all.js
+++ b/src/tablefilter_all.js
@@ -2731,71 +2731,90 @@ TF.prototype = {
         slcR.onchange = this.Evt._OnSlcResultsChange;
     },
 
-    RemoveResultsPerPage: function()
     /*====================================================
         - Removes results per page select + label
     =====================================================*/
-    {
-        if(!this.hasGrid) return;
-        if( this.resultsPerPageSlc==null || this.resultsPerPage==null ) return;
-        var slcR, slcRSpan;
-        slcR = this.resultsPerPageSlc;
-        slcRSpan = tf_Id( this.prfxSlcResultsTxt+this.id );
-        if( slcR!=null )
+    RemoveResultsPerPage: function(){
+        if(!this.hasGrid || !this.resultsPerPageSlc || !this.resultsPerPage){
+            return;
+        }
+        var slcR = this.resultsPerPageSlc,
+            slcRSpan = tf_Id(this.prfxSlcResultsTxt+this.id);
+        if(slcR){
             slcR.parentNode.removeChild( slcR );
-        if( slcRSpan!=null )
+        }
+        if(slcRSpan){
             slcRSpan.parentNode.removeChild( slcRSpan );
+        }
         this.resultsPerPageSlc = null;
     },
 
-    SetHelpInstructions: function()
     /*====================================================
         - Generates help instructions
     =====================================================*/
-    {
-        if( this.helpInstrBtnEl!=null ) return;
+    SetHelpInstructions: function(){
+        if(this.helpInstrBtnEl){
+            return;
+        }
         var f = this.fObj;
-        this.helpInstrTgtId =       f.help_instructions_target_id!=undefined //id of custom container element for instructions
-                                        ? f.help_instructions_target_id : null;
-        this.helpInstrContTgtId =   f.help_instructions_container_target_id!=undefined //id of custom container element for instructions
-                                        ? f.help_instructions_container_target_id : null;
-        this.helpInstrText =        f.help_instructions_text //defines help text
-                                        ? f.help_instructions_text : 'Use the filters above each column to filter and limit table data. ' +
-                                        'Avanced searches can be performed by using the following operators: <br />' +
-                                        '<b>&lt;</b>, <b>&lt;=</b>, <b>&gt;</b>, <b>&gt;=</b>, <b>=</b>, <b>*</b>, <b>!</b>, <b>{</b>, <b>}</b>, <b>||</b>, ' +
-                                        '<b>&amp;&amp;</b>, <b>[empty]</b>, <b>[nonempty]</b>, <b>rgx:</b><br/> These operators are described here:<br/>' +
-                                        '<a href="http://tablefilter.free.fr/#operators" target="_blank">http://tablefilter.free.fr/#operators</a><hr/>';
-        this.helpInstrHtml =        f.help_instructions_html!=undefined
-                                        ? f.help_instructions_html : null; //defines help innerHtml
-        this.helpInstrBtnText =     f.help_instructions_btn_text!=undefined
-                                        ? f.help_instructions_btn_text : '?'; //defines reset button text
-        this.helpInstrBtnHtml =     f.help_instructions_btn_html!=undefined
-                                        ? f.help_instructions_btn_html : null; //defines reset button innerHtml
-        this.helpInstrBtnCssClass = f.help_instructions_btn_css_class!=undefined //defines css class for help button
-                                        ? f.help_instructions_btn_css_class : 'helpBtn';
-        this.helpInstrContCssClass = f.help_instructions_container_css_class!=undefined //defines css class for help container
-                                        ? f.help_instructions_container_css_class : 'helpCont';
-        this.helpInstrBtnEl =       null; //help button element
-        this.helpInstrContEl =      null; //help content div
-        this.helpInstrDefaultHtml = '<div class="helpFooter"><h4>HTML Table Filter Generator v. '+ this.version +'</h4>' +
-                                    '<a href="http://tablefilter.free.fr" target="_blank">http://tablefilter.free.fr</a><br/>' +
-                                    '<span>&copy;2009-'+ this.year +' Max Guglielmi.</span><div align="center" style="margin-top:8px;">' +
-                                    '<a href="javascript:;" onclick="window[\'tf_'+ this.id +'\']._ToggleHelp();">Close</a></div></div>';
+        //id of custom container element for instructions
+        this.helpInstrTgtId = f.help_instructions_target_id || null;
+        //id of custom container element for instructions
+        this.helpInstrContTgtId = f.help_instructions_container_target_id ||
+            null;
+        //defines help text
+        this.helpInstrText = f.help_instructions_text  ?
+            f.help_instructions_text :
+            'Use the filters above each column to filter and limit table ' +
+            'data. Avanced searches can be performed by using the following ' +
+            'operators: <br /><b>&lt;</b>, <b>&lt;=</b>, <b>&gt;</b>, ' +
+            '<b>&gt;=</b>, <b>=</b>, <b>*</b>, <b>!</b>, <b>{</b>, <b>}</b>, ' +
+            '<b>||</b>,<b>&amp;&amp;</b>, <b>[empty]</b>, <b>[nonempty]</b>, ' +
+            '<b>rgx:</b><br/> These operators are described here:<br/>' +
+            '<a href="http://tablefilter.free.fr/#operators" ' +
+            'target="_blank">http://tablefilter.free.fr/#operators</a><hr/>';
+        //defines help innerHtml
+        this.helpInstrHtml = f.help_instructions_html || null;
+        //defines reset button text
+        this.helpInstrBtnText = f.help_instructions_btn_text || '?';
+        //defines reset button innerHtml
+        this.helpInstrBtnHtml = f.help_instructions_btn_html || null;
+        //defines css class for help button
+        this.helpInstrBtnCssClass = f.help_instructions_btn_css_class ||
+            'helpBtn';
+        //defines css class for help container
+        this.helpInstrContCssClass = f.help_instructions_container_css_class ||
+            'helpCont';
+        //help button element
+        this.helpInstrBtnEl = null;
+         //help content div
+        this.helpInstrContEl = null;
+        this.helpInstrDefaultHtml = '<div class="helpFooter"><h4>HTML Table ' +
+            'Filter Generator v. '+ this.version +'</h4>' +
+            '<a href="http://tablefilter.free.fr" target="_blank">' +
+            'http://tablefilter.free.fr</a><br/>' +
+            '<span>&copy;2009-'+ this.year +' Max Guglielmi.</span>' +
+            '<div align="center" style="margin-top:8px;">' +
+            '<a href="javascript:;" onclick="window[\'tf_'+ this.id +
+            '\']._ToggleHelp();">Close</a></div></div>';
 
         var helpspan = tf_CreateElm('span',['id',this.prfxHelpSpan+this.id]);
         var helpdiv = tf_CreateElm('div',['id',this.prfxHelpDiv+this.id]);
 
         //help button is added to defined element
-        if(this.helpInstrTgtId==null) this.SetTopDiv();
-        var targetEl = ( this.helpInstrTgtId==null ) ? this.rDiv : tf_Id( this.helpInstrTgtId );
+        if(!this.helpInstrTgtId){
+            this.SetTopDiv();
+        }
+        var targetEl = !this.helpInstrTgtId ?
+            this.rDiv : tf_Id(this.helpInstrTgtId);
         targetEl.appendChild(helpspan);
 
-        var divContainer = ( this.helpInstrContTgtId==null ) ? helpspan : tf_Id( this.helpInstrContTgtId );
+        var divContainer = !this.helpInstrContTgtId ?
+            helpspan : tf_Id( this.helpInstrContTgtId );
 
-        if(this.helpInstrBtnHtml == null)
-        {
+        if(!this.helpInstrBtnHtml){
             divContainer.appendChild(helpdiv);
-            var helplink = tf_CreateElm( 'a', ['href','javascript:void(0);'] );
+            var helplink = tf_CreateElm( 'a', ['href','javascript:void(0);']);
             helplink.className = this.helpInstrBtnCssClass;
             helplink.appendChild(tf_CreateText(this.helpInstrBtnText));
             helpspan.appendChild(helplink);
@@ -2807,9 +2826,7 @@ TF.prototype = {
             divContainer.appendChild(helpdiv);
         }
 
-        if(this.helpInstrHtml == null)
-        {
-            //helpdiv.appendChild(tf_CreateText(this.helpInstrText));
+        if(!this.helpInstrHtml){
             helpdiv.innerHTML = this.helpInstrText;
             helpdiv.className = this.helpInstrContCssClass;
             helpdiv.ondblclick = this.Evt._OnHelpBtnClick;
@@ -2826,139 +2843,154 @@ TF.prototype = {
         this.helpInstrBtnEl = helpspan;
     },
 
-    RemoveHelpInstructions: function()
     /*====================================================
         - Removes help instructions
     =====================================================*/
-    {
-        if(this.helpInstrBtnEl==null) return;
+    RemoveHelpInstructions: function() {
+        if(!this.helpInstrBtnEl){
+            return;
+        }
         this.helpInstrBtnEl.parentNode.removeChild(this.helpInstrBtnEl);
         this.helpInstrBtnEl = null;
-        if(this.helpInstrContEl==null) return;
+        if(!this.helpInstrContEl){
+            return;
+        }
         this.helpInstrContEl.parentNode.removeChild(this.helpInstrContEl);
         this.helpInstrContEl = null;
     },
 
-    _ToggleHelp: function()
     /*====================================================
         - Toggles help div
     =====================================================*/
-    {
-        if(!this.helpInstrContEl) return;
-        var divDisplay = this.helpInstrContEl.style.display;
-        if(divDisplay == '' || divDisplay == 'none'){
-            this.helpInstrContEl.style.display = 'block';
-            var btnLeft = tf_ObjPosition(this.helpInstrBtnEl, [this.helpInstrBtnEl.nodeName])[0];
-            if(!this.helpInstrContTgtId)
-                this.helpInstrContEl.style.left = (btnLeft - this.helpInstrContEl.clientWidth + 25) + 'px';
+    _ToggleHelp: function(){
+        if(!this.helpInstrContEl){
+            return;
+        }
+        var divDisplay = this.helpInstrContEl.style.display;
+        if(divDisplay==='' || divDisplay==='none'){
+            this.helpInstrContEl.style.display = 'block';
+            var btnLeft = tf_ObjPosition(
+                this.helpInstrBtnEl, [this.helpInstrBtnEl.nodeName])[0];
+            if(!this.helpInstrContTgtId){
+                this.helpInstrContEl.style.left =
+                    (btnLeft - this.helpInstrContEl.clientWidth + 25) + 'px';
+            }
+        } else {
+            this.helpInstrContEl.style.display = 'none';
         }
-        else this.helpInstrContEl.style.display = 'none';
     },
 
-    ChangePage: function( index )
-    {
+    ChangePage: function(index){
         this.EvtManager(this.Evt.name.changepage,{ pgIndex:index });
     },
-    _ChangePage: function( index )
     /*====================================================
         - Changes page
         - Param:
             - index: option index of paging select
             (numeric value)
     =====================================================*/
-    {
-        if( !this.paging ) return;
-        if( index==undefined )
-            index = (this.pageSelectorType==this.fltTypeSlc) ?
+    _ChangePage: function(index){
+        if(!this.paging){
+            return;
+        }
+        if(!index){
+            index = this.pageSelectorType===this.fltTypeSlc ?
                 this.pagingSlc.options.selectedIndex : (this.pagingSlc.value-1);
-        if( index>=0 && index<=(this.nbPages-1) )
-        {
-            if(this.onBeforeChangePage) this.onBeforeChangePage.call(null, this, index);
+        }
+        if( index>=0 && index<=(this.nbPages-1) ){
+            if(this.onBeforeChangePage){
+                this.onBeforeChangePage.call(null, this, index);
+            }
             this.currentPageNb = parseInt(index)+1;
-            if(this.pageSelectorType==this.fltTypeSlc)
+            if(this.pageSelectorType===this.fltTypeSlc){
                 this.pagingSlc.options[index].selected = true;
-            else
+            } else {
                 this.pagingSlc.value = this.currentPageNb;
+            }
 
-            if( this.rememberPageNb ) this.RememberPageNb( this.pgNbCookie );
-            this.startPagingRow = (this.pageSelectorType==this.fltTypeSlc)
-                ? this.pagingSlc.value : (index*this.pagingLength);
+            if(this.rememberPageNb){
+                this.RememberPageNb(this.pgNbCookie);
+            }
+            this.startPagingRow = (this.pageSelectorType===this.fltTypeSlc) ?
+                this.pagingSlc.value : (index*this.pagingLength);
             this.GroupByPage();
-            if(this.onAfterChangePage) this.onAfterChangePage.call(null, this, index);
+            if(this.onAfterChangePage){
+                this.onAfterChangePage.call(null, this, index);
+            }
         }
     },
 
-    ChangeResultsPerPage: function()
-    {
+    ChangeResultsPerPage: function(){
         this.EvtManager(this.Evt.name.changeresultsperpage);
     },
-    _ChangeResultsPerPage: function()
     /*====================================================
         - calculates rows to be displayed in a page
         - method called by nb results per page select
     =====================================================*/
-    {
-        if( !this.paging ) return;
+    _ChangeResultsPerPage: function(){
+        if(!this.paging){
+            return;
+        }
         var slcR = this.resultsPerPageSlc;
-        var slcPagesSelIndex = (this.pageSelectorType==this.fltTypeSlc)
-            ? this.pagingSlc.selectedIndex : parseInt(this.pagingSlc.value-1);
-        this.pagingLength = parseInt(slcR.options[slcR.selectedIndex].value);
+        var slcPagesSelIndex = (this.pageSelectorType==this.fltTypeSlc) ?
+                this.pagingSlc.selectedIndex :
+                parseInt(this.pagingSlc.value-1,10);
+        this.pagingLength = parseInt(slcR.options[slcR.selectedIndex].value,10);
         this.startPagingRow = this.pagingLength*slcPagesSelIndex;
 
-        if( !isNaN(this.pagingLength) )
-        {
-            if( this.startPagingRow>=this.nbFilterableRows )
+        if(!isNaN(this.pagingLength)){
+            if(this.startPagingRow>=this.nbFilterableRows){
                 this.startPagingRow = (this.nbFilterableRows-this.pagingLength);
+            }
             this.SetPagingInfo();
 
-            if(this.pageSelectorType==this.fltTypeSlc)
-            {
-                var slcIndex = (this.pagingSlc.options.length-1<=slcPagesSelIndex )
-                                ? (this.pagingSlc.options.length-1) : slcPagesSelIndex;
+            if(this.pageSelectorType===this.fltTypeSlc){
+                var slcIndex =
+                    (this.pagingSlc.options.length-1<=slcPagesSelIndex ) ?
+                    (this.pagingSlc.options.length-1) : slcPagesSelIndex;
                 this.pagingSlc.options[slcIndex].selected = true;
             }
-            if( this.rememberPageLen ) this.RememberPageLength( this.pgLenCookie );
-        }//if isNaN
+            if(this.rememberPageLen){
+                this.RememberPageLength( this.pgLenCookie );
+            }
+        }
     },
 
-    ResetPage: function( name )
-    {
+    ResetPage: function(name){
         this.EvtManager(this.Evt.name.resetpage);
     },
-    _ResetPage: function( name )
     /*==============================================
         - re-sets page nb at page re-load
         - Params:
             - name: cookie name (string)
     ===============================================*/
-    {
-        var pgnb = tf_ReadCookie(name); //reads the cookie
-        if( pgnb!='' )
+    _ResetPage: function(name){
+        var pgnb = tf_ReadCookie(name);
+        if(pgnb!==''){
             this.ChangePage((pgnb-1));
+        }
     },
 
-    ResetPageLength: function( name )
-    {
+    ResetPageLength: function(name){
         this.EvtManager(this.Evt.name.resetpagelength);
     },
-    _ResetPageLength: function( name )
     /*==============================================
         - re-sets page length at page re-load
         - Params:
             - name: cookie name (string)
     ===============================================*/
-    {
-        if(!this.paging) return;
-        var pglenIndex = tf_ReadCookie(name); //reads the cookie
+    _ResetPageLength: function(name){
+        if(!this.paging){
+            return;
+        }
+        var pglenIndex = tf_ReadCookie(name);
 
-        if( pglenIndex!='' )
-        {
+        if(pglenIndex!==''){
             this.resultsPerPageSlc.options[pglenIndex].selected = true;
             this.ChangeResultsPerPage();
         }
     },
 
-    AddPaging: function(filterTable)
     /*====================================================
         - Adds paging feature if filter grid bar is
         already set
@@ -2966,40 +2998,50 @@ TF.prototype = {
             - execFilter: if true table is filtered
             (boolean)
     =====================================================*/
-    {
-        if( !this.hasGrid || this.paging ) return;
+    AddPaging: function(filterTable){
+        if(!this.hasGrid || this.paging){
+            return;
+        }
         this.paging = true;
         this.isPagingRemoved = true;
         this.SetPaging();
         this.ResetValues();
-        if(filterTable) this.Filter();
+        if(filterTable){
+            this.Filter();
+        }
     },
 
-    PopulateSelect: function(colIndex,isExternal,extSlcId)
-    {
+    PopulateSelect: function(colIndex,isExternal,extSlcId){
         this.EvtManager(
             this.Evt.name.populateselect,
             { slcIndex:colIndex, slcExternal:isExternal, slcId:extSlcId }
         );
     },
 
-    _PopulateSelect: function(colIndex,isRefreshed,isExternal,extSlcId)
     /*====================================================
         - populates drop-down filters
     =====================================================*/
-    {
-        isExternal = (isExternal==undefined) ? false : isExternal;
+    _PopulateSelect: function(colIndex,isRefreshed,isExternal,extSlcId) {
+        isExternal = isExternal===undefined ? false : isExternal;
         var slcId = this.fltIds[colIndex];
-        if( tf_Id(slcId)==null && !isExternal ) return;
-        if( tf_Id(extSlcId)==null && isExternal ) return;
-        var slc = (!isExternal) ? tf_Id(slcId) : tf_Id(extSlcId);
-        var o = this, row = this.tbl.rows;
-        var fillMethod = this.slcFillingMethod.tf_LCase();
-        var optArray = [], slcInnerHtml = '', opt0;
-        var isCustomSlc = (this.hasCustomSlcOptions  //custom select test
-                            && this.customSlcOptions.cols.tf_Has(colIndex));
-        var optTxt = []; //custom selects text
-        var activeFlt;
+        if((!tf_Id(slcId) && !isExternal) ||
+            (!tf_Id(extSlcId) && isExternal)){
+            return;
+        }
+        var slc = !isExternal ? tf_Id(slcId) : tf_Id(extSlcId),
+            o = this,
+            row = this.tbl.rows,
+            matchCase = this.matchCase,
+            fillMethod = this.slcFillingMethod.tf_LCase(),
+            optArray = [],
+            slcInnerHtml = '',
+            opt0,
+            //custom select test
+            isCustomSlc = (this.hasCustomSlcOptions &&
+                this.customSlcOptions.cols.tf_Has(colIndex));
+        //custom selects text
+        var optTxt = [],
+            activeFlt;
         if(isRefreshed && this.activeFilterId){
             activeFlt = this.activeFilterId.split('_')[0];
             activeFlt = activeFlt.split(this.prfxFlt)[1];
@@ -3007,46 +3049,70 @@ TF.prototype = {
 
         /*** remember grid values ***/
         var flts_values = [], fltArr = [];
-        if(this.rememberGridValues)
-        {
-            flts_values = tf_CookieValueArray(this.fltsValuesCookie, this.separator);
-            if(flts_values != undefined && flts_values.toString().tf_Trim() != ''){
-                if(this.hasCustomSlcOptions && this.customSlcOptions.cols.tf_Has(colIndex)){
+        if(this.rememberGridValues){
+            flts_values = tf_CookieValueArray(
+                this.fltsValuesCookie, this.separator);
+            if(flts_values && flts_values.toString().tf_Trim()!==''){
+                if(isCustomSlc){
                     fltArr.push(flts_values[colIndex]);
-                } else { fltArr = flts_values[colIndex].split(' '+o.orOperator+' '); }
+                } else {
+                    fltArr = flts_values[colIndex].split(' '+o.orOperator+' ');
+                }
             }
         }
 
-        var excludedOpts = null, filteredDataCol = null;
-        if(isRefreshed && this.disableExcludedOptions){ excludedOpts = []; filteredDataCol = []; }
+        var excludedOpts = null,
+            filteredDataCol = null;
+        if(isRefreshed && this.disableExcludedOptions){
+            excludedOpts = [];
+            filteredDataCol = [];
+        }
 
-        for(var k=this.refRow; k<this.nbRows; k++)
-        {
-            // always visible rows don't need to appear on selects as always valid
-            if( this.hasVisibleRows && this.visibleRows.tf_Has(k) && !this.paging )
+        for(var k=this.refRow; k<this.nbRows; k++){
+            // always visible rows don't need to appear on selects as always
+            // valid
+            if(this.hasVisibleRows && this.visibleRows.tf_Has(k) &&
+                !this.paging){
                 continue;
+            }
 
-            var cell = row[k].cells;
-            var nchilds = cell.length;
+            var cell = row[k].cells,
+                nchilds = cell.length;
+
+            // checks if row has exact cell #
+            if(nchilds === this.nbCells && !isCustomSlc){
+                // this loop retrieves cell data
+                for(var j=0; j<nchilds; j++){
+                    if((colIndex===j &&
+                        (!isRefreshed ||
+                            (isRefreshed && this.disableExcludedOptions))) ||
+                        (colIndex==j && isRefreshed &&
+                            ((row[k].style.display == '' && !this.paging) ||
+                        (this.paging && (!this.validRowsIndex ||
+                            (this.validRowsIndex &&
+                                this.validRowsIndex.tf_Has(k))) &&
+                            ((activeFlt==undefined || activeFlt==colIndex)  ||
+                                (activeFlt!=colIndex &&
+                                    this.validRowsIndex.tf_Has(k) ))) ))){
+                        var cell_data = this.GetCellData(j, cell[j]),
+                            //V�ry P�ter's patch
+                            cell_string = cell_data.tf_MatchCase(matchCase);
 
-            if(nchilds == this.nbCells && !isCustomSlc)
-            {// checks if row has exact cell #
-                for(var j=0; j<nchilds; j++)// this loop retrieves cell data
-                {
-                    if((colIndex==j && (!isRefreshed || (isRefreshed && this.disableExcludedOptions))) ||
-                        (colIndex==j && isRefreshed && ((row[k].style.display == '' && !this.paging) ||
-                        ( this.paging && (!this.validRowsIndex || (this.validRowsIndex && this.validRowsIndex.tf_Has(k)))
-                            && ((activeFlt==undefined || activeFlt==colIndex)  || (activeFlt!=colIndex && this.validRowsIndex.tf_Has(k) ))) )))
-                    {
-                        var cell_data = this.GetCellData(j, cell[j]);
-                        var cell_string = cell_data.tf_MatchCase(this.matchCase);//V�ry P�ter's patch
                         // checks if celldata is already in array
-                        if(!optArray.tf_Has(cell_string,this.matchCase)) optArray.push(cell_data);
+                        if(!optArray.tf_Has(cell_string, matchCase)){
+                            optArray.push(cell_data);
+                        }
 
                         if(isRefreshed && this.disableExcludedOptions){
-                            if(!filteredDataCol[j]) filteredDataCol[j] = this.GetFilteredDataCol(j);
-                            if(!filteredDataCol[j].tf_Has(cell_string,this.matchCase)
-                                && !excludedOpts.tf_Has(cell_string,this.matchCase) && !this.isFirstLoad) excludedOpts.push(cell_data);
+                            var filteredCol = filteredDataCol[j];
+                            if(!filteredCol){
+                                filteredCol = this.GetFilteredDataCol(j);
+                            }
+                            if(!filteredCol.tf_Has(cell_string, matchCase) &&
+                                !excludedOpts.tf_Has(cell_string, matchCase) &&
+                                !this.isFirstLoad){
+                                excludedOpts.push(cell_data);
+                            }
                         }
                     }//if colIndex==j
                 }//for j
@@ -3054,52 +3120,74 @@ TF.prototype = {
         }//for k
 
         //Retrieves custom values
-        if(isCustomSlc)
-        {
+        if(isCustomSlc){
             var customValues = this.__getCustomValues(colIndex);
             optArray = customValues[0];
             optTxt = customValues[1];
         }
 
         if(this.sortSlc && !isCustomSlc){
-            if (!this.matchCase){
+            if (!matchCase){
                 optArray.sort(tf_IgnoreCaseSort);
                 if(excludedOpts) excludedOpts.sort(tf_IgnoreCaseSort);
-            } else { optArray.sort(); if(excludedOpts){ excludedOpts.sort(); } }
+            } else {
+                optArray.sort();
+                if(excludedOpts){ excludedOpts.sort(); }
+            }
         }
 
-        if(this.sortNumAsc && this.sortNumAsc.tf_Has(colIndex))
-        {//asc sort
+        //asc sort
+        if(this.sortNumAsc && this.sortNumAsc.tf_Has(colIndex)){
             try{
                 optArray.sort( tf_NumSortAsc );
-                if(excludedOpts) excludedOpts.sort( tf_NumSortAsc );
-                if(isCustomSlc) optTxt.sort( tf_NumSortAsc );
+                if(excludedOpts){
+                    excludedOpts.sort( tf_NumSortAsc );
+                }
+                if(isCustomSlc){
+                    optTxt.sort( tf_NumSortAsc );
+                }
             } catch(e) {
-                optArray.sort(); if(excludedOpts){ excludedOpts.sort(); }
-                if(isCustomSlc) optTxt.sort();
+                optArray.sort();
+                if(excludedOpts){
+                    excludedOpts.sort();
+                }
+                if(isCustomSlc){
+                    optTxt.sort();
+                }
             }//in case there are alphanumeric values
         }
-        if(this.sortNumDesc && this.sortNumDesc.tf_Has(colIndex))
-        {//desc sort
+        //desc sort
+        if(this.sortNumDesc && this.sortNumDesc.tf_Has(colIndex)){
             try{
                 optArray.sort( tf_NumSortDesc );
-                if(excludedOpts) excludedOpts.sort( tf_NumSortDesc );
-                if(isCustomSlc) optTxt.sort( tf_NumSortDesc );
+                if(excludedOpts){
+                    excludedOpts.sort( tf_NumSortDesc );
+                }
+                if(isCustomSlc){
+                    optTxt.sort( tf_NumSortDesc );
+                }
             } catch(e) {
-                optArray.sort(); if(excludedOpts){ excludedOpts.sort(); }
-                if(isCustomSlc) optTxt.sort();
+                optArray.sort();
+                if(excludedOpts){ excludedOpts.sort(); }
+                if(isCustomSlc){
+                    optTxt.sort();
+                }
             }//in case there are alphanumeric values
         }
 
         AddOpts();//populates drop-down
 
-        function AddOpt0()
-        {// adds 1st option
-            if( fillMethod == 'innerhtml' )
-                slcInnerHtml += '<option value="">'+o.displayAllText+'</option>';
+        // adds 1st option
+        function AddOpt0(){
+            if(fillMethod === 'innerhtml'){
+                slcInnerHtml +='<option value="">'+o.displayAllText+'</option>';
+            }
             else {
-                var opt0 = tf_CreateOpt((!o.enableSlcResetFilter ? '' : o.displayAllText),'');
-                if(!o.enableSlcResetFilter) opt0.style.display = 'none';
+                var opt0 = tf_CreateOpt(
+                    (!o.enableSlcResetFilter ? '' : o.displayAllText),'');
+                if(!o.enableSlcResetFilter){
+                    opt0.style.display = 'none';
+                }
                 slc.appendChild(opt0);
                 if(o.enableEmptyOption){
                     var opt1 = tf_CreateOpt(o.emptyText,o.emOperator);
@@ -3112,58 +3200,73 @@ TF.prototype = {
             }
         }
 
-        function AddOpts()
-        {// populates select
+        // populates select
+        function AddOpts(){
             var slcValue = slc.value;
             slc.innerHTML = '';
             AddOpt0();
 
-            for(var y=0; y<optArray.length; y++)
-            {
-                if(optArray[y]=='') continue;
+            for(var y=0; y<optArray.length; y++){
+                if(optArray[y]===''){
+                    continue;
+                }
                 var val = optArray[y]; //option value
-                var lbl = (isCustomSlc) ? optTxt[y] : optArray[y]; //option text
+                var lbl = isCustomSlc ? optTxt[y] : val; //option text
                 var isDisabled = false;
                 if(isRefreshed && o.disableExcludedOptions &&
-                    excludedOpts.tf_Has(val.tf_MatchCase(o.matchCase), o.matchCase))
+                    excludedOpts.tf_Has(
+                        val.tf_MatchCase(o.matchCase), o.matchCase)){
                     isDisabled = true;
+                }
 
-                if( fillMethod == 'innerhtml' )
-                {
+                if(fillMethod === 'innerhtml'){
                     var slcAttr = '';
-                    if( o.fillSlcOnDemand && slcValue==optArray[y] )
+                    if(o.fillSlcOnDemand && slcValue==optArray[y]){
                         slcAttr = 'selected="selected"';
-                    slcInnerHtml += '<option value="'+val+'" '
-                                        +slcAttr+ (isDisabled ? 'disabled="disabled"' : '')+'>'+lbl+'</option>';
+                    }
+                    slcInnerHtml += '<option value="'+val+'" ' + slcAttr +
+                        (isDisabled ? 'disabled="disabled"' : '')+ '>' +
+                        lbl+'</option>';
                 } else {
                     var opt;
                     //fill select on demand
-                    if(o.fillSlcOnDemand && slcValue==optArray[y] && o['col'+colIndex]==o.fltTypeSlc)
-                        opt = tf_CreateOpt( lbl, val, true );
-                    else{
-                        if( o['col'+colIndex]!=o.fltTypeMulti )
-                            opt = tf_CreateOpt( lbl, val,
-                                                (flts_values[colIndex]!=' ' && val==flts_values[colIndex])
-                                                ? true : false  );
-                        else
-                        {
-                            opt = tf_CreateOpt( lbl, val,
-                                                (fltArr.tf_Has(optArray[y].tf_MatchCase(o.matchCase),o.matchCase)
-                                                    || fltArr.toString().indexOf(val)!= -1)
-                                                ? true : false  );
+                    if(o.fillSlcOnDemand && slcValue==optArray[y] &&
+                        o['col'+colIndex]===o.fltTypeSlc){
+                        opt = tf_CreateOpt(lbl, val, true);
+                    } else {
+                        if(o['col'+colIndex]!=o.fltTypeMulti){
+                            opt = tf_CreateOpt(
+                                lbl,
+                                val,
+                                (flts_values[colIndex]!==' ' &&
+                                    val==flts_values[colIndex]) ? true : false
+                            );
+                        } else {
+                            opt = tf_CreateOpt(
+                                lbl,
+                                val,
+                                (fltArr.tf_Has(
+                                    optArray[y].tf_MatchCase(
+                                        o.matchCase),o.matchCase) ||
+                                  fltArr.toString().indexOf(val)!== -1) ?
+                                    true : false
+                            );
                         }
                     }
-                    if(isDisabled) opt.disabled = true;
+                    if(isDisabled){
+                        opt.disabled = true;
+                    }
                     slc.appendChild(opt);
                 }
             }// for y
 
-            if( fillMethod == 'innerhtml' ) slc.innerHTML += slcInnerHtml;
+            if(fillMethod === 'innerhtml'){
+                slc.innerHTML += slcInnerHtml;
+            }
             slc.setAttribute('filled','1');
         }// fn AddOpt
     },
 
-    __deferMultipleSelection: function(slc,index,filter)
     /*====================================================
         - IE bug: it seems there is no way to make
         multiple selections programatically, only last
@@ -3172,29 +3275,27 @@ TF.prototype = {
         - Work-around: defer selection with a setTimeout
         If you find a more elegant solution to
         this let me know ;-)
-        - For the moment only this solution seems
-        to work!
+        - For the moment only this solution seems to work!
         - Params:
             - slc = select object (select obj)
             - index to be selected (integer)
             - execute filtering (boolean)
     =====================================================*/
-    {
-        if(slc.nodeName.tf_LCase() != 'select') return;
-        var doFilter = (filter==undefined) ? false : filter;
+    __deferMultipleSelection: function(slc,index,filter){
+        if(slc.nodeName.tf_LCase() !== 'select'){
+            return;
+        }
+        var doFilter = filter===undefined ? false : filter;
         var o = this;
-        window.setTimeout(
-            function(){
-                slc.options[0].selected = false;
+        window.setTimeout(function(){
+            slc.options[0].selected = false;
 
-                if(slc.options[index].value=='')
-                    slc.options[index].selected = false;
-                else
-                slc.options[index].selected = true;
-                if(doFilter) o.Filter();
-            },
-            .1
-        );
+            if(slc.options[index].value=='')
+                slc.options[index].selected = false;
+            else
+            slc.options[index].selected = true;
+            if(doFilter) o.Filter();
+        }, 0.1);
     },
 
     __getCustomValues: function(colIndex)