From dd7ba16e8bf9d5f6ec18a8ff2151e5c92e8b146e Mon Sep 17 00:00:00 2001
From: Stephen Beaver <sbeaver@netgate.com>
Date: Tue, 10 Nov 2015 15:12:37 -0500
Subject: sortable library reverted to min version

---
 src/usr/local/www/diag_routes.php          | 15 ++-------------
 src/usr/local/www/foot.inc                 |  2 +-
 src/usr/local/www/sortable/LICENSE         | 19 +++++++++++++++++++
 src/usr/local/www/sortable/sortable.min.js |  2 ++
 4 files changed, 24 insertions(+), 14 deletions(-)
 create mode 100755 src/usr/local/www/sortable/LICENSE
 create mode 100755 src/usr/local/www/sortable/sortable.min.js

(limited to 'src')

diff --git a/src/usr/local/www/diag_routes.php b/src/usr/local/www/diag_routes.php
index c2a5bc0..b8049e1 100644
--- a/src/usr/local/www/diag_routes.php
+++ b/src/usr/local/www/diag_routes.php
@@ -192,17 +192,6 @@ function update_routes_callback(html) {
 
 	$('#' + section + ' > thead').html(thead);
 	$('#' + section + ' > tbody').html(tbody);
-
-	$('div.panel').find('*').removeAttr('data-sortable');
-	$('div.panel').find('*').removeAttr('data-sortable-initialized');
-	$('div.panel').find('*').removeAttr('data-sorted-direction');
-	$('div.panel').find('*').removeAttr('data-sorted');
-
-	exampleTable = document.querySelector('#IPv4');
-	Sortable.initTable(exampleTable);
-
-	exampleTable = document.querySelector('#IPv6');
-	Sortable.initTable(exampleTable);
 }
 
 function update_all_routes() {
@@ -225,7 +214,7 @@ events.push(function(){
 <div class="panel panel-default">
 	<div class="panel-heading"><h2 class="panel-title">IPv4 Routes</h2></div>
 	<div class="panel panel-body">
-		<table class="table table-striped table-hover table-condensed sortable-theme-bootstrap" id="IPv4" data-sortable>
+		<table class="table table-striped table-hover table-condensed sortable-theme-bootstrap" id="IPv4">
 		<thead>
 			<tr>
 				<th><!-- filled by xhr --></th>
@@ -243,7 +232,7 @@ events.push(function(){
 <div class="panel panel-default">
 	<div class="panel-heading"><h2 class="panel-title">IPv6 Routes</h2></div>
 	<div class="panel panel-body">
-		<table class="table table-striped table-hover table-condensed sortable-theme-bootstrap" id="IPv6" data-sortable>
+		<table class="table table-striped table-hover table-condensed sortable-theme-bootstrap" id="IPv6">
 		<thead>
 			<tr>
 				<th><!-- filled by xhr --></th>
diff --git a/src/usr/local/www/foot.inc b/src/usr/local/www/foot.inc
index 980de3f..d900474 100755
--- a/src/usr/local/www/foot.inc
+++ b/src/usr/local/www/foot.inc
@@ -26,7 +26,7 @@
 	<script src="/bootstrap/js/bootstrap.min.js"></script>
 	<script src="/jquery/pfSense.js"></script>
 	<script src="/jquery/pfSenseHelpers.js"></script>
-	<script src="sortable/sortable.js"></script>
+	<script src="sortable/sortable.min.js"></script>
 
 	<script>
 		// Un-hide the "Top of page" icons if the page is larger than the window
diff --git a/src/usr/local/www/sortable/LICENSE b/src/usr/local/www/sortable/LICENSE
new file mode 100755
index 0000000..e19dfc9
--- /dev/null
+++ b/src/usr/local/www/sortable/LICENSE
@@ -0,0 +1,19 @@
+Copyright (C) 2013 Adam Schwartz, http://adamschwartz.co
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 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.
\ No newline at end of file
diff --git a/src/usr/local/www/sortable/sortable.min.js b/src/usr/local/www/sortable/sortable.min.js
new file mode 100755
index 0000000..8278f50
--- /dev/null
+++ b/src/usr/local/www/sortable/sortable.min.js
@@ -0,0 +1,2 @@
+/*! sortable.js 0.8.0 */
+(function(){var a,b,c,d,e,f,g;a="table[data-sortable]",d=/^-?[£$¤]?[\d,.]+%?$/,g=/^\s+|\s+$/g,c=["click"],f="ontouchstart"in document.documentElement,f&&c.push("touchstart"),b=function(a,b,c){return null!=a.addEventListener?a.addEventListener(b,c,!1):a.attachEvent("on"+b,c)},e={init:function(b){var c,d,f,g,h;for(null==b&&(b={}),null==b.selector&&(b.selector=a),d=document.querySelectorAll(b.selector),h=[],f=0,g=d.length;g>f;f++)c=d[f],h.push(e.initTable(c));return h},initTable:function(a){var b,c,d,f,g,h;if(1===(null!=(h=a.tHead)?h.rows.length:void 0)&&"true"!==a.getAttribute("data-sortable-initialized")){for(a.setAttribute("data-sortable-initialized","true"),d=a.querySelectorAll("th"),b=f=0,g=d.length;g>f;b=++f)c=d[b],"false"!==c.getAttribute("data-sortable")&&e.setupClickableTH(a,c,b);return a}},setupClickableTH:function(a,d,f){var g,h,i,j,k,l;for(i=e.getColumnType(a,f),h=function(b){var c,g,h,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,A,B,C,D;if(b.handled===!0)return!1;for(b.handled=!0,m="true"===this.getAttribute("data-sorted"),n=this.getAttribute("data-sorted-direction"),h=m?"ascending"===n?"descending":"ascending":i.defaultSortDirection,p=this.parentNode.querySelectorAll("th"),s=0,w=p.length;w>s;s++)d=p[s],d.setAttribute("data-sorted","false"),d.removeAttribute("data-sorted-direction");if(this.setAttribute("data-sorted","true"),this.setAttribute("data-sorted-direction",h),o=a.tBodies[0],l=[],m){for(D=o.rows,v=0,z=D.length;z>v;v++)g=D[v],l.push(g);for(l.reverse(),B=0,A=l.length;A>B;B++)k=l[B],o.appendChild(k)}else{for(r=null!=i.compare?i.compare:function(a,b){return b-a},c=function(a,b){return a[0]===b[0]?a[2]-b[2]:i.reverse?r(b[0],a[0]):r(a[0],b[0])},C=o.rows,j=t=0,x=C.length;x>t;j=++t)k=C[j],q=e.getNodeValue(k.cells[f]),null!=i.comparator&&(q=i.comparator(q)),l.push([q,k,j]);for(l.sort(c),u=0,y=l.length;y>u;u++)k=l[u],o.appendChild(k[1])}return"function"==typeof window.CustomEvent&&"function"==typeof a.dispatchEvent?a.dispatchEvent(new CustomEvent("Sortable.sorted",{bubbles:!0})):void 0},l=[],j=0,k=c.length;k>j;j++)g=c[j],l.push(b(d,g,h));return l},getColumnType:function(a,b){var c,d,f,g,h,i,j,k,l,m,n;if(d=null!=(l=a.querySelectorAll("th")[b])?l.getAttribute("data-sortable-type"):void 0,null!=d)return e.typesObject[d];for(m=a.tBodies[0].rows,h=0,j=m.length;j>h;h++)for(c=m[h],f=e.getNodeValue(c.cells[b]),n=e.types,i=0,k=n.length;k>i;i++)if(g=n[i],g.match(f))return g;return e.typesObject.alpha},getNodeValue:function(a){var b;return a?(b=a.getAttribute("data-value"),null!==b?b:"undefined"!=typeof a.innerText?a.innerText.replace(g,""):a.textContent.replace(g,"")):""},setupTypes:function(a){var b,c,d,f;for(e.types=a,e.typesObject={},f=[],c=0,d=a.length;d>c;c++)b=a[c],f.push(e.typesObject[b.name]=b);return f}},e.setupTypes([{name:"numeric",defaultSortDirection:"descending",match:function(a){return a.match(d)},comparator:function(a){return parseFloat(a.replace(/[^0-9.-]/g,""),10)||0}},{name:"date",defaultSortDirection:"ascending",reverse:!0,match:function(a){return!isNaN(Date.parse(a))},comparator:function(a){return Date.parse(a)||0}},{name:"alpha",defaultSortDirection:"ascending",match:function(){return!0},compare:function(a,b){return a.localeCompare(b)}}]),setTimeout(e.init,0),"function"==typeof define&&define.amd?define(function(){return e}):"undefined"!=typeof exports?module.exports=e:window.Sortable=e}).call(this);
\ No newline at end of file
-- 
cgit v1.1