tablesort - npm Package Compare versions

Comparing version 1.6.3 to 1.6.4

package.json

 {
     "name": "tablesort",
     "description": "A sorting component for HTML tables",
-    "version": "1.6.3",
+    "version": "1.6.4",
     "author": "tristen <@fallsemo>",
@@ -6,0 +6,0 @@ "ender": "./ender.js",

src/tablesort.js

@@ -141,3 +141,7 @@ ;(function () {
                     } else {
-                        newRows.push(tr);
+                        // Save the index for stable sorting
+                        newRows.push({
+                            tr: tr,
+                            index: totalRows
+                        });
                     }
@@ -148,4 +152,2 @@ totalRows++;
 
-            newRows.sort(sortFunction);
-
             if (!update) {
@@ -171,5 +173,34 @@ if (that.options.d) {
 
+            // Make a stable sort function
+            var stabilize = function (sort) {
+                return function (a, b) {
+                    var unstableResult = sort(a.tr, b.tr);
+                    if (unstableResult === 0) {
+                        return a.index - b.index;
+                    }
+                    return unstableResult;
+                };
+            };
+
+            // Make an `anti-stable` sort function. If two elements are equal
+            // under the original sort function, then there relative order is
+            // reversed.
+            var antiStabilize = function (sort) {
+                return function (a, b) {
+                    var unstableResult = sort(a.tr, b.tr);
+                    if (unstableResult === 0) {
+                        return b.index - a.index;
+                    }
+                    return unstableResult;
+                };
+            };
+
             // Before we append should we reverse the new array or not?
+            // If we reverse, the sort needs to be `anti-stable` so that
+            // the double negatives cancel out
             if (hasClass(header, 'sort-down')) {
+                newRows.sort(antiStabilize(sortFunction));
                 newRows.reverse();
+            } else {
+                newRows.sort(stabilize(sortFunction));
             }
@@ -186,3 +217,3 @@
                 } else {
-                    whatToInsert = newRows[i - noSortsSoFar];
+                    whatToInsert = newRows[i - noSortsSoFar].tr;
                 }
@@ -189,0 +220,0 @@ // appendChild(x) moves x if already present somewhere else in the DOM

tablesort.min.js

 /*!
- * tablesort v1.6.3 (2014-01-16)
+ * tablesort v1.6.3 (2014-06-10)
  * http://tristen.ca/tablesort/demo
  * Copyright (c) 2014 ; Licensed MIT
 */
-(function(){function e(e,t){if(e.tagName!=="TABLE")throw new Error("Element must be a table");this.init(e,t||{})}e.prototype={init:function(e,t){var n=this,r;this.thead=!1,this.options=t,this.options.d=t.descending||!1,e.rows&&e.rows.length>0&&(e.tHead&&e.tHead.rows.length>0?(r=e.tHead.rows[e.tHead.rows.length-1],n.thead=!0):r=e.rows[0]);if(!r)return;var i=function(e){var t=o(u,"tr").getElementsByTagName("th");for(var r=0;r<t.length;r++)(c(t[r],"sort-up")||c(t[r],"sort-down"))&&t[r]!==this&&(t[r].className=t[r].className.replace(" sort-down","").replace(" sort-up",""));n.current=this,n.sortTable(this)};for(var s=0;s<r.cells.length;s++){var u=r.cells[s];c(u,"no-sort")||(u.className+=" sort-header",h(u,"click",i))}},getFirstDataRowIndex:function(){return this.thead?0:1},sortTable:function(e,t){var n=this,r=e.cellIndex,h,p=o(e,"table"),d="",v=n.getFirstDataRowIndex();if(p.rows.length<=1)return;while(d===""&&v<p.tBodies[0].rows.length){d=u(p.tBodies[0].rows[v].cells[r]),d=f(d);if(d.substr(0,4)==="<!--"||d.length===0)d="";v++}if(d==="")return;var m=function(e,t){var r=u(e.cells[n.col]).toLowerCase(),i=u(t.cells[n.col]).toLowerCase();return r===i?0:r<i?1:-1},g=function(e,t){var r=u(e.cells[n.col]),i=u(t.cells[n.col]);return r=l(r),i=l(i),a(i,r)},y=function(e,t){var r=u(e.cells[n.col]).toLowerCase(),i=u(t.cells[n.col]).toLowerCase();return s(i)-s(r)};d.match(/^-?[£\x24Û¢´€] ?\d/)||d.match(/^-?\d+\s*[€]/)||d.match(/^-?(\d+[,\.]?)+(E[\-+][\d]+)?%?$/)?h=g:i(d)?h=y:h=m,this.col=r;var b=[],w={},E,S=0;for(v=0;v<p.tBodies.length;v++)for(E=0;E<p.tBodies[v].rows.length;E++){var x=p.tBodies[v].rows[E];c(x,"no-sort")?w[S]=x:b.push(x),S++}b.sort(h),t||(n.options.d?c(e,"sort-up")?(e.className=e.className.replace(/ sort-up/,""),e.className+=" sort-down"):(e.className=e.className.replace(/ sort-down/,""),e.className+=" sort-up"):c(e,"sort-down")?(e.className=e.className.replace(/ sort-down/,""),e.className+=" sort-up"):(e.className=e.className.replace(/ sort-up/,""),e.className+=" sort-down")),c(e,"sort-down")&&b.reverse();var T=0;for(v=0;v<S;v++){var N;w[v]?(N=w[v],T++):N=b[v-T],p.tBodies[0].appendChild(N)}},refresh:function(){this.current!==undefined&&this.sortTable(this.current,!0)}};var t=/(Mon|Tue|Wed|Thu|Fri|Sat|Sun)\.?\,?\s*/i,n=/\d{1,2}[\/\-]\d{1,2}[\/\-]\d{2,4}/,r=/(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)/i,i=function(e){return(e.search(t)!==-1||e.search(n)!==-1||e.search(r!==-1))!==-1&&!isNaN(s(e))},s=function(e){return e=e.replace(/\-/g,"/"),e=e.replace(/(\d{1,2})[\/\-](\d{1,2})[\/\-](\d{2})/,"$1/$2/$3"),(new Date(e)).getTime()},o=function(e,t){return e===null?null:e.nodeType===1&&e.tagName.toLowerCase()===t.toLowerCase()?e:o(e.parentNode,t)},u=function(e){var t=this;if(typeof e=="string"||typeof e=="undefined")return e;var n=e.getAttribute("data-sort")||"";if(n)return n;if(e.textContent)return e.textContent;if(e.innerText)return e.innerText;var r=e.childNodes,i=r.length;for(var s=0;s<i;s++)switch(r[s].nodeType){case 1:n+=t.getInnerText(r[s]);break;case 3:n+=r[s].nodeValue}return n},a=function(e,t){var n=parseFloat(e),r=parseFloat(t);return e=isNaN(n)?0:n,t=isNaN(r)?0:r,e-t},f=function(e){return e.replace(/^\s+|\s+$/g,"")},l=function(e){return e.replace(/[^\-?0-9.]/g,"")},c=function(e,t){return(" "+e.className+" ").indexOf(" "+t+" ")>-1},h=function(e,t,n){e.attachEvent?(e["e"+t+n]=n,e[t+n]=function(){e["e"+t+n](window.event)},e.attachEvent("on"+t,e[t+n])):e.addEventListener(t,n,!1)};typeof module!="undefined"&&module.exports?module.exports=e:window.Tablesort=e})();
+(function(){function e(e,t){if(e.tagName!=="TABLE")throw new Error("Element must be a table");this.init(e,t||{})}e.prototype={init:function(e,t){var n=this,r;this.thead=!1,this.options=t,this.options.d=t.descending||!1,e.rows&&e.rows.length>0&&(e.tHead&&e.tHead.rows.length>0?(r=e.tHead.rows[e.tHead.rows.length-1],n.thead=!0):r=e.rows[0]);if(!r)return;var i=function(e){var t=o(u,"tr").getElementsByTagName("th");for(var r=0;r<t.length;r++)(c(t[r],"sort-up")||c(t[r],"sort-down"))&&t[r]!==this&&(t[r].className=t[r].className.replace(" sort-down","").replace(" sort-up",""));n.current=this,n.sortTable(this)};for(var s=0;s<r.cells.length;s++){var u=r.cells[s];c(u,"no-sort")||(u.className+=" sort-header",h(u,"click",i))}},getFirstDataRowIndex:function(){return this.thead?0:1},sortTable:function(e,t){var n=this,r=e.cellIndex,h,p=o(e,"table"),d="",v=n.getFirstDataRowIndex();if(p.rows.length<=1)return;while(d===""&&v<p.tBodies[0].rows.length){d=u(p.tBodies[0].rows[v].cells[r]),d=f(d);if(d.substr(0,4)==="<!--"||d.length===0)d="";v++}if(d==="")return;var m=function(e,t){var r=u(e.cells[n.col]).toLowerCase(),i=u(t.cells[n.col]).toLowerCase();return r===i?0:r<i?1:-1},g=function(e,t){var r=u(e.cells[n.col]),i=u(t.cells[n.col]);return r=l(r),i=l(i),a(i,r)},y=function(e,t){var r=u(e.cells[n.col]).toLowerCase(),i=u(t.cells[n.col]).toLowerCase();return s(i)-s(r)};d.match(/^-?[£\x24Û¢´€] ?\d/)||d.match(/^-?\d+\s*[€]/)||d.match(/^-?(\d+[,\.]?)+(E[\-+][\d]+)?%?$/)?h=g:i(d)?h=y:h=m,this.col=r;var b=[],w={},E,S=0;for(v=0;v<p.tBodies.length;v++)for(E=0;E<p.tBodies[v].rows.length;E++){var x=p.tBodies[v].rows[E];c(x,"no-sort")?w[S]=x:b.push({tr:x,index:S}),S++}t||(n.options.d?c(e,"sort-up")?(e.className=e.className.replace(/ sort-up/,""),e.className+=" sort-down"):(e.className=e.className.replace(/ sort-down/,""),e.className+=" sort-up"):c(e,"sort-down")?(e.className=e.className.replace(/ sort-down/,""),e.className+=" sort-up"):(e.className=e.className.replace(/ sort-up/,""),e.className+=" sort-down"));var T=function(e){return function(t,n){var r=e(t.tr,n.tr);return r===0?t.index-n.index:r}},N=function(e){return function(t,n){var r=e(t.tr,n.tr);return r===0?n.index-t.index:r}};c(e,"sort-down")?(b.sort(N(h)),b.reverse()):b.sort(T(h));var C=0;for(v=0;v<S;v++){var k;w[v]?(k=w[v],C++):k=b[v-C].tr,p.tBodies[0].appendChild(k)}},refresh:function(){this.current!==undefined&&this.sortTable(this.current,!0)}};var t=/(Mon|Tue|Wed|Thu|Fri|Sat|Sun)\.?\,?\s*/i,n=/\d{1,2}[\/\-]\d{1,2}[\/\-]\d{2,4}/,r=/(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)/i,i=function(e){return(e.search(t)!==-1||e.search(n)!==-1||e.search(r!==-1))!==-1&&!isNaN(s(e))},s=function(e){return e=e.replace(/\-/g,"/"),e=e.replace(/(\d{1,2})[\/\-](\d{1,2})[\/\-](\d{2})/,"$1/$2/$3"),(new Date(e)).getTime()},o=function(e,t){return e===null?null:e.nodeType===1&&e.tagName.toLowerCase()===t.toLowerCase()?e:o(e.parentNode,t)},u=function(e){var t=this;if(typeof e=="string"||typeof e=="undefined")return e;var n=e.getAttribute("data-sort")||"";if(n)return n;if(e.textContent)return e.textContent;if(e.innerText)return e.innerText;var r=e.childNodes,i=r.length;for(var s=0;s<i;s++)switch(r[s].nodeType){case 1:n+=t.getInnerText(r[s]);break;case 3:n+=r[s].nodeValue}return n},a=function(e,t){var n=parseFloat(e),r=parseFloat(t);return e=isNaN(n)?0:n,t=isNaN(r)?0:r,e-t},f=function(e){return e.replace(/^\s+|\s+$/g,"")},l=function(e){return e.replace(/[^\-?0-9.]/g,"")},c=function(e,t){return(" "+e.className+" ").indexOf(" "+t+" ")>-1},h=function(e,t,n){e.attachEvent?(e["e"+t+n]=n,e[t+n]=function(){e["e"+t+n](window.event)},e.attachEvent("on"+t,e[t+n])):e.addEventListener(t,n,!1)};typeof module!="undefined"&&module.exports?module.exports=e:window.Tablesort=e})();

tablesort.uncompressed.js

 /*!
- * tablesort v1.6.3 (2014-01-16)
+ * tablesort v1.6.3 (2014-06-10)
  * http://tristen.ca/tablesort/demo
@@ -147,3 +147,7 @@ * Copyright (c) 2014 ; Licensed MIT
                     } else {
-                        newRows.push(tr);
+                        // Save the index for stable sorting
+                        newRows.push({
+                            tr: tr,
+                            index: totalRows
+                        });
                     }
@@ -154,4 +158,2 @@ totalRows++;
 
-            newRows.sort(sortFunction);
-
             if (!update) {
@@ -177,5 +179,34 @@ if (that.options.d) {
 
+            // Make a stable sort function
+            var stabilize = function (sort) {
+                return function (a, b) {
+                    var unstableResult = sort(a.tr, b.tr);
+                    if (unstableResult === 0) {
+                        return a.index - b.index;
+                    }
+                    return unstableResult;
+                };
+            };
+
+            // Make an `anti-stable` sort function. If two elements are equal
+            // under the original sort function, then there relative order is
+            // reversed.
+            var antiStabilize = function (sort) {
+                return function (a, b) {
+                    var unstableResult = sort(a.tr, b.tr);
+                    if (unstableResult === 0) {
+                        return b.index - a.index;
+                    }
+                    return unstableResult;
+                };
+            };
+
             // Before we append should we reverse the new array or not?
+            // If we reverse, the sort needs to be `anti-stable` so that
+            // the double negatives cancel out
             if (hasClass(header, 'sort-down')) {
+                newRows.sort(antiStabilize(sortFunction));
                 newRows.reverse();
+            } else {
+                newRows.sort(stabilize(sortFunction));
             }
@@ -192,3 +223,3 @@
                 } else {
-                    whatToInsert = newRows[i - noSortsSoFar];
+                    whatToInsert = newRows[i - noSortsSoFar].tr;
                 }
@@ -195,0 +226,0 @@ // appendChild(x) moves x if already present somewhere else in the DOM

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

106906

increased by1.42%

Lines of code

2374

increased by2.59%

Worsened metrics

Number of package files

12

decreased by-7.69%

No dependency changes