From 00f00b125c7dafc257c3078e444d94acce0b3420 Mon Sep 17 00:00:00 2001 From: Denis Karpenko Date: Tue, 5 Feb 2013 22:32:06 +0300 Subject: [PATCH 1/4] Remove compressed versions of tablesorter/tablesorter.widgets. (* jquery-tablesorter.js by default attaches full versions; * they will be compressed by assets pipeline in production env) --- .../jquery-tablesorter/jquery.tablesorter.min.js | 5 ----- .../jquery.tablesorter.widgets.min.js | 12 ------------ 2 files changed, 17 deletions(-) delete mode 100644 vendor/assets/javascripts/jquery-tablesorter/jquery.tablesorter.min.js delete mode 100644 vendor/assets/javascripts/jquery-tablesorter/jquery.tablesorter.widgets.min.js diff --git a/vendor/assets/javascripts/jquery-tablesorter/jquery.tablesorter.min.js b/vendor/assets/javascripts/jquery-tablesorter/jquery.tablesorter.min.js deleted file mode 100644 index 34b2886..0000000 --- a/vendor/assets/javascripts/jquery-tablesorter/jquery.tablesorter.min.js +++ /dev/null @@ -1,5 +0,0 @@ -/*! -* TableSorter 2.7.3 min - Client-side table sorting with ease! -* Copyright (c) 2007 Christian Bach -*/ -!function(j){j.extend({tablesorter:new function(){function e(c){"undefined"!==typeof console&&"undefined"!==typeof console.log?console.log(c):alert(c)}function u(c,d){e(c+" ("+((new Date).getTime()-d.getTime())+"ms)")}function p(c,d,a){if(!d)return"";var b=c.config,g=b.textExtraction,f="",f="simple"===g?b.supportsTextContent?d.textContent:j(d).text():"function"===typeof g?g(d,c,a):"object"===typeof g&&g.hasOwnProperty(a)?g[a](d,c,a):b.supportsTextContent?d.textContent:j(d).text();return j.trim(f)} function h(c){var d=c.config,a=d.$tbodies,b,q,f,l,j,n,k="";if(0===a.length)return d.debug?e("*Empty table!* Not building a parser cache"):"";a=a[0].rows;if(a[0]){b=[];q=a[0].cells.length;for(f=0;f thead th, > thead td",selectorSort:"th, td",selectorRemove:".remove-me",debug:!1,headerList:[],empties:{},strings:{},parsers:[]};g.benchmark=u;g.construct=function(c){return this.each(function(){if(!this.tHead||0===this.tBodies.length||!0===this.hasInitialized)return this.config.debug?e("stopping initialization! No thead, tbody or tablesorter has already been initialized"):"";var d=j(this),a=this,b,q,f,l="",v,n,k,C,x=j.metadata;a.hasInitialized= !1;a.config={};b=j.extend(!0,a.config,g.defaults,c);j.data(a,"tablesorter",b);b.debug&&j.data(a,"startoveralltimer",new Date);b.supportsTextContent="x"===j("x")[0].textContent;b.supportsDataObject=1.4<=parseFloat(j.fn.jquery);b.string={max:1,min:-1,"max+":1,"max-":-1,zero:0,none:0,"null":0,top:!0,bottom:!1};/tablesorter\-/.test(d.attr("class"))||(l=""!==b.theme?" tablesorter-"+b.theme:"");b.$table=d.addClass(b.tableClass+l);b.$tbodies=d.children("tbody:not(."+b.cssInfoBlock+")");var t= [],y={},Q=j(a).find("thead:eq(0), tfoot").children("tr"),K,E,z,A,O,D,L,R,S,I;for(K=0;K':"";t=j(a).find(w.selectorHeaders).each(function(a){B=j(this);M=w.headers[a];w.headerContent[a]=this.innerHTML;N=w.headerTemplate.replace(/\{content\}/g,this.innerHTML).replace(/\{icon\}/g,T);w.onRenderTemplate&&(P=w.onRenderTemplate.apply(B,[a,N]))&&"string"===typeof P&&(N=P);this.innerHTML='
'+N+"
";w.onRenderHeader&&w.onRenderHeader.apply(B,[a]);this.column=y[this.parentNode.rowIndex+"-"+ this.cellIndex];var b=g.getData(B,M,"sortInitialOrder")||w.sortInitialOrder;this.order=/^d/i.test(b)||1===b?[1,0,2]:[0,1,2];this.count=-1;"false"===g.getData(B,M,"sorter")?(this.sortDisabled=!0,B.addClass("sorter-false")):B.removeClass("sorter-false");this.lockedOrder=!1;J=g.getData(B,M,"lockedOrder")||!1;"undefined"!==typeof J&&!1!==J&&(this.order=this.lockedOrder=/^d/i.test(J)||1===J?[1,1,1]:[0,0,0]);B.addClass((this.sortDisabled?"sorter-false ":" ")+w.cssHeader);w.headerList[a]=this;B.parent().addClass(w.cssHeaderRow)}); a.config.debug&&(u("Built headers:",U),e(t));b.$headers=t;b.parsers=h(a);b.delayInit||s(a);b.$headers.find("*").andSelf().filter(b.selectorSort).unbind("mousedown.tablesorter mouseup.tablesorter").bind("mousedown.tablesorter mouseup.tablesorter",function(c,e){var h=(this.tagName.match("TH|TD")?j(this):j(this).parents("th, td").filter(":last"))[0];if(1!==(c.which||c.button))return!1;if("mousedown"===c.type)return C=(new Date).getTime(),"INPUT"===c.target.tagName?"":!b.cancelSelection;if(!0!==e&&250< (new Date).getTime()-C)return!1;b.delayInit&&!b.cache&&s(a);if(!h.sortDisabled){d.trigger("sortStart",a);l=!c[b.sortMultiSortKey];h.count=c[b.sortResetKey]?2:(h.count+1)%(b.sortReset?3:2);b.sortRestart&&(q=h,b.$headers.each(function(){if(this!==q&&(l||!j(this).is("."+b.cssDesc+",."+b.cssAsc)))this.count=-1}));q=h.column;if(l){b.sortList=[];if(null!==b.sortForce){v=b.sortForce;for(f=0;fk&&(b.sortList.push([q,k]),1k&&(b.sortList.push([q,k]),1"),W=j(a).width();j("tr:first td",a.tBodies[0]).each(function(){V.append(j("").css("width",parseInt(1E3*(j(this).width()/W),10)/10+"%"))});j(a).prepend(V)}b.showProcessing&&d.unbind("sortBegin sortEnd").bind("sortBegin sortEnd",function(b){g.isProcessing(a,"sortBegin"=== b.type)});a.hasInitialized=!0;b.debug&&g.benchmark("Overall initialization time",j.data(a,"startoveralltimer"));d.trigger("tablesorter-initialized",a);"function"===typeof b.initialized&&b.initialized(a)})};g.isProcessing=function(c,d,a){var b=c.config;c=a||j(c).find("."+b.cssHeader);d?(0'),c=j.fn.detach?d.detach():d.remove();c=j(c).find("span.tablesorter-savemyplace");d.insertAfter(c);c.remove()};g.clearTableBody=function(c){c.config.$tbodies.empty()};g.destroy=function(c,d,a){if(c.hasInitialized){g.refreshWidgets(c,!0,!0);var b=j(c),e=c.config,f=b.find("thead:first"),h=f.find("tr."+e.cssHeaderRow).removeClass(e.cssHeaderRow),u=b.find("tfoot:first > tr").children("th, td");f.find("tr").not(h).remove();b.removeData("tablesorter").unbind("sortReset update updateCell addRows sorton appendCache applyWidgetId applyWidgets refreshWidgets destroy mouseup mouseleave"); e.$headers.add(u).removeClass(e.cssHeader+" "+e.cssAsc+" "+e.cssDesc).removeAttr("data-column");h.find(e.selectorSort).unbind("mousedown.tablesorter mouseup.tablesorter");h.children().each(function(a){j(this).html(e.headerContent[a])});!1!==d&&b.removeClass(e.tableClass+" tablesorter-"+e.theme);c.hasInitialized=!1;"function"===typeof a&&a(c)}};g.regex=[/(^-?[0-9]+(\.?[0-9]*)[df]?e?[0-9]?$|^0x[0-9a-f]+$|[0-9]+)/gi,/(^([\w ]+,?[\w ]+)?[\w ]+,?[\w ]+\d+:\d+(:\d+)?[\w ]?|^\d{1,4}[\/\-]\d{1,4}[\/\-]\d{1,4}|^\w+, \w+ \d+, \d{4})/, /^0x[0-9a-f]+$/i];g.sortText=function(c,d,a,b){if(d===a)return 0;var e=c.config,f=e.string[e.empties[b]||e.emptyTo],h=g.regex;if(""===d&&0!==f)return"boolean"===typeof f?f?-1:1:-f||-1;if(""===a&&0!==f)return"boolean"===typeof f?f?1:-1:f||1;if("function"===typeof e.textSorter)return e.textSorter(d,a,c,b);c=d.replace(h[0],"\\0$1\\0").replace(/\\0$/,"").replace(/^\\0/,"").split("\\0");b=a.replace(h[0],"\\0$1\\0").replace(/\\0$/,"").replace(/^\\0/,"").split("\\0");d=parseInt(d.match(h[2]),16)||1!==c.length&& d.match(h[1])&&Date.parse(d);if(a=parseInt(a.match(h[2]),16)||d&&a.match(h[1])&&Date.parse(a)||null){if(da)return 1}e=Math.max(c.length,b.length);for(d=0;dh)return 1}return 0};g.sortTextDesc=function(c,d,a,b){if(d===a)return 0;var e=c.config,f=e.string[e.empties[b]||e.emptyTo];return""===d&& 0!==f?"boolean"===typeof f?f?-1:1:f||1:""===a&&0!==f?"boolean"===typeof f?f?1:-1:-f||-1:"function"===typeof e.textSorter?e.textSorter(a,d,c,b):g.sortText(c,a,d)};g.getTextValue=function(c,d,a){if(d){var b=c.length,e=d+a;for(d=0;dj.inArray(l[b].id,f)))h.debug&&e("Refeshing widgets: Removing "+l[b].id),l[b].hasOwnProperty("remove")&&l[b].remove(c,h,h.widgetOptions);!0!==a&&g.applyWidget(c,d)};g.getData=function(c,d,a){var b="";c=j(c); var e,f;if(!c.length)return"";e=j.metadata?c.metadata():!1;f=" "+(c.attr("class")||"");"undefined"!==typeof c.data(a)||"undefined"!==typeof c.data(a.toLowerCase())?b+=c.data(a)||c.data(a.toLowerCase()):e&&"undefined"!==typeof e[a]?b+=e[a]:d&&"undefined"!==typeof d[a]?b+=d[a]:" "!==f&&f.match(" "+a+"-")&&(b=f.match(RegExp(" "+a+"-(\\w+)"))[1]||"");return j.trim(b)};g.formatFloat=function(c,d){if("string"!==typeof c||""===c)return c;var a;c=(d&&d.config?!1!==d.config.usNumberFormat:"undefined"!==typeof d? d:1)?c.replace(/,/g,""):c.replace(/[\s|\.]/g,"").replace(/,/g,".");/^\s*\([.\d]+\)/.test(c)&&(c=c.replace(/^\s*\(/,"-").replace(/\)/,""));a=parseFloat(c);return isNaN(a)?j.trim(c):a};g.isDigit=function(c){return isNaN(c)?/^[\-+(]?\d+[)]?$/.test(c.toString().replace(/[,.'"\s]/g,"")):!0}}});var h=j.tablesorter;j.fn.extend({tablesorter:h.construct});h.addParser({id:"text",is:function(){return!0},format:function(e,u){var p=u.config;e=j.trim(p.ignoreCase?e.toLocaleLowerCase():e);return p.sortLocaleCompare? h.replaceAccents(e):e},type:"text"});h.addParser({id:"currency",is:function(e){return/^\(?\d+[\u00a3$\u20ac\u00a4\u00a5\u00a2?.]|[\u00a3$\u20ac\u00a4\u00a5\u00a2?.]\d+\)?$/.test(e)},format:function(e,j){return h.formatFloat(e.replace(/[^\w,. \-()]/g,""),j)},type:"numeric"});h.addParser({id:"ipAddress",is:function(e){return/^\d{1,3}[\.]\d{1,3}[\.]\d{1,3}[\.]\d{1,3}$/.test(e)},format:function(e,j){var p,r=e.split("."),s="",m=r.length;for(p=0;p'),n.cssIcon&&m.find("."+n.cssIcon).addClass(g.icons),h.hasClass("hasFilters")&&m.find(".tablesorter-filter-row").addClass(g.filterRow);b.each(m,function(a){c=b(this);j=n.cssIcon?c.find("."+n.cssIcon):c;this.sortDisabled?(c.removeClass(s),j.removeClass(s+" tablesorter-icon "+g.icons)):(f=h.hasClass("hasStickyHeaders")?h.find(r).find("th").eq(a).add(c):c,e=c.hasClass(n.cssAsc)? g.sortAsc:c.hasClass(n.cssDesc)?g.sortDesc:c.hasClass(n.cssHeader)?g.sortNone:"",c[e===g.sortNone?"removeClass":"addClass"](g.active),j.removeClass(s).addClass(e))});n.debug&&b.tablesorter.benchmark("Applying "+q+" theme",a)},remove:function(d,a,e){d=b(d);var c="object"===typeof e.uitheme?"jui":e.uitheme||"jui";e="object"===typeof e.uitheme?e.uitheme:b.tablesorter.themes[b.tablesorter.themes.hasOwnProperty(c)?c:"jui"];var j=d.children("thead").children(),f=e.sortNone+" "+e.sortDesc+" "+e.sortAsc; d.removeClass("tablesorter-"+c+" "+e.table).find(a.cssHeader).removeClass(e.header);j.unbind("mouseenter mouseleave").removeClass(e.hover+" "+f+" "+e.active).find(".tablesorter-filter-row").removeClass(e.filterRow);j.find(".tablesorter-icon").removeClass(e.icons)}}); -b.tablesorter.addWidget({id:"columns",format:function(d){var a,e,c,j,f,h,n,p,q,g=b(d),m=d.config,r=m.widgetOptions,s=m.$tbodies,u=m.sortList,w=u.length,l=["primary","secondary","tertiary"],l=m.widgetColumns&&m.widgetColumns.hasOwnProperty("css")? m.widgetColumns.css||l:r&&r.hasOwnProperty("columns")?r.columns||l:l;h=l.length-1;n=l.join(" ");m.debug&&(f=new Date);for(q=0;q=]/g],M=B.map(function(a){return A.getData?"parsed"===A.getData(B.filter('[data-column="'+a+'"]:last'),t.headers[a],"filter"):b(this).hasClass("filter-parsed")}).get(),H,I,D=function(a){var c=b.isArray(a),e=v.find("thead").eq(0).children("tr").find("select."+z+", input."+z),d=c?a:e.map(function(){return b(this).val()||""}).get(),f=(d||[]).join("");c&&e.each(function(c,d){b(d).val(a[c]||"")});!0===k.filter_hideFilters&& v.find(".tablesorter-filter-row").trigger(""===f?"mouseleave":"mouseenter");if(!(G===f&&!1!==a))if(v.trigger("filterStart",[d]),t.showProcessing)setTimeout(function(){J(a,d,f);return!1},30);else return J(a,d,f),!1},J=function(j,g,h){var m,q,s,r,y,x,z;t.debug&&(z=new Date);for(c=0;c]=?/.test(f)?(u=isNaN(p)?b.tablesorter.formatFloat(p.replace(C[5],""),d):b.tablesorter.formatFloat(p,d),w=b.tablesorter.formatFloat(f.replace(C[5],"").replace(C[6],""),d),/>/.test(f)&&(x=/>=/.test(f)?u>=w:u>w),/'+(B.filter('[data-column="'+a+'"]:last').attr("data-placeholder")||"")+"";for(c=0;c'+h[c]+"";v.find("thead").find("select."+z+'[data-column="'+a+'"]')[f?"html":"append"](g)},L=function(b){for(a=0;a';for(a=0;a":">")+"";v.find("thead").eq(0).append(l+="")}v.bind(["addRows", "updateCell","update","appendCache","search"].join(".tsfilter "),function(b,a){"search"!==b.type&&L(!0);D("search"===b.type?a:"");return!1}).find("input."+z).bind("keyup search",function(b,a){if(!(32>b.which&&8!==b.which||37<=b.which&&40>=b.which)){if("undefined"!==typeof a)return D(a),!1;clearTimeout(I);I=setTimeout(function(){D()},k.filter_searchDelay||300)}});k.filter_reset&&b(k.filter_reset).length&&b(k.filter_reset).bind("click",function(){v.find("."+z).val("");D();return!1});if(k.filter_functions)for(y in k.filter_functions)if(k.filter_functions.hasOwnProperty(y)&& "string"===typeof y)if(l=B.filter('[data-column="'+y+'"]:last'),h="",!0===k.filter_functions[y]&&!l.hasClass("filter-false"))K(y);else if("string"===typeof y&&!l.hasClass("filter-false")){for(g in k.filter_functions[y])"string"===typeof g&&(h+=""===h?'":"",h+='");v.find("thead").find("select."+z+'[data-column="'+y+'"]').append(h)}L(!0);v.find("select."+z).bind("change search",function(){D()});!0===k.filter_hideFilters&& v.find(".tablesorter-filter-row").addClass("hideme").bind("mouseenter mouseleave",function(a){var c;m=b(this);clearTimeout(q);q=setTimeout(function(){/enter|over/.test(a.type)?m.removeClass("hideme"):b(document.activeElement).closest("tr")[0]!==m[0]&&(c=v.find("."+(k.filter_cssFilter||"tablesorter-filter")).map(function(){return b(this).val()||""}).get().join(""),""===c&&m.addClass("hideme"))},200)}).find("input, select").bind("focus blur",function(a){r=b(this).closest("tr");clearTimeout(q);q=setTimeout(function(){if(""=== v.find("."+(k.filter_cssFilter||"tablesorter-filter")).map(function(){return b(this).val()||""}).get().join(""))r["focus"===a.type?"removeClass":"addClass"]("hideme")},200)});t.showProcessing&&v.bind("filterStart filterEnd",function(a,c){var d=c?v.find("."+t.cssHeader).filter("[data-column]").filter(function(){return""!==c[b(this).data("column")]}):"";A.isProcessing(v[0],"filterStart"===a.type,c?d:"")});t.debug&&A.benchmark("Applying Filter widget",H);v.trigger("filterInit")}},remove:function(d,a, e){var c,j;c=b(d);a=a.$tbodies;c.removeClass("hasFilters").unbind(["addRows","updateCell","update","appendCache","search"].join(".tsfilter")).find(".tablesorter-filter-row").remove();for(c=0;cb.top&&c');j=j.slice(0,-1);f=f?f.add(j):j});f.each(function(){a=b(this);e=parseInt(a.css("padding-right"),10)+8;a.find(".tablesorter-wrapper").append('
')}).bind("mousemove.tsresize",function(a){if(0!==q&&g){var b=a.pageX-q;g.width(g.width()+b);m.width(m.width()-b);q=a.pageX}}).bind("mouseup.tsresize", function(){b.tablesorter.storage&&g&&(c[g.index()]=g.width(),c[m.index()]=m.width(),!1!==p.resizable&&b.tablesorter.storage(d,"tablesorter-resizable",c));r()}).find(".tablesorter-resizer").bind("mousedown",function(a){g=b(a.target).parents("th:last");m=g.next();q=a.pageX});h.find("thead:first").bind("mouseup.tsresize mouseleave.tsresize",function(){r()}).bind("contextmenu.tsresize",function(){b.tablesorter.resizableReset(d);var a=b.isEmptyObject?b.isEmptyObject(c):c==={};c={};return a})}},remove:function(d){b(d).removeClass("hasResizable").find("thead").unbind("mouseup.tsresize mouseleave.tsresize contextmenu.tsresize").find("tr").children().unbind("mousemove.tsresize mouseup.tsresize").find(".tablesorter-wrapper").each(function(){b(this).find(".tablesorter-resizer").remove(); b(this).replaceWith(b(this).contents())});b.tablesorter.resizableReset(d)}});b.tablesorter.resizableReset=function(d){b(d.config.headerList).width("auto");b.tablesorter.storage(d,"tablesorter-resizable",{})}; -b.tablesorter.addWidget({id:"saveSort",init:function(b,a){a.format(b,!0)},format:function(d,a){var e,c,j=d.config;e=!1!==j.widgetOptions.saveSort;var f={sortList:j.sortList};j.debug&&(c=new Date);b(d).hasClass("hasSaveSort")?e&&(d.hasInitialized&&b.tablesorter.storage)&&(b.tablesorter.storage(d, "tablesorter-savesort",f),j.debug&&b.tablesorter.benchmark("saveSort widget: Saving last sort: "+j.sortList,c)):(b(d).addClass("hasSaveSort"),f="",b.tablesorter.storage&&(f=(e=b.tablesorter.storage(d,"tablesorter-savesort"))&&e.hasOwnProperty("sortList")&&b.isArray(e.sortList)?e.sortList:"",j.debug&&b.tablesorter.benchmark('saveSort: Last sort loaded: "'+f+'"',c)),a&&f&&0 Date: Tue, 5 Feb 2013 22:33:52 +0300 Subject: [PATCH 2/4] Upgrade tablesorter to 2.7.5 --- CHANGELOG.markdown | 4 + README.markdown | 2 +- lib/jquery-tablesorter/version.rb | 2 +- .../addons/pager/jquery.tablesorter.pager.js | 16 ++-- .../jquery-tablesorter/jquery.tablesorter.js | 51 ++++++++----- .../jquery.tablesorter.widgets.js | 74 ++++++++++++------- .../jquery-tablesorter/theme.blue.css | 6 +- .../jquery-tablesorter/theme.dropbox.css | 8 +- .../jquery-tablesorter/theme.green.css | 8 +- .../jquery-tablesorter/theme.ice.css | 6 +- 10 files changed, 109 insertions(+), 68 deletions(-) diff --git a/CHANGELOG.markdown b/CHANGELOG.markdown index 2b88b6f..9b05922 100644 --- a/CHANGELOG.markdown +++ b/CHANGELOG.markdown @@ -1,5 +1,9 @@ Changelog === +#### v1.4.1 + +* Upgrade tablesorter to v2.7.5 + #### v1.4.0 * Upgrade tablesorter to v2.7.3 diff --git a/README.markdown b/README.markdown index 78201ac..3071555 100644 --- a/README.markdown +++ b/README.markdown @@ -4,7 +4,7 @@ Simple integration of jquery-tablesorter into the asset pipeline. -Current tablesorter version: 2.7.3 (1/10/2013), [documentation] +Current tablesorter version: 2.7.5 (2/5/2013), [documentation] Any issue associate with the js/css files, please report to [Mottie's fork]. diff --git a/lib/jquery-tablesorter/version.rb b/lib/jquery-tablesorter/version.rb index 20146e7..6e5f231 100644 --- a/lib/jquery-tablesorter/version.rb +++ b/lib/jquery-tablesorter/version.rb @@ -1,3 +1,3 @@ module JqueryTablesorter - VERSION = "1.4.0" + VERSION = "1.4.1" end diff --git a/vendor/assets/javascripts/jquery-tablesorter/addons/pager/jquery.tablesorter.pager.js b/vendor/assets/javascripts/jquery-tablesorter/addons/pager/jquery.tablesorter.pager.js index f7a0554..8d86772 100644 --- a/vendor/assets/javascripts/jquery-tablesorter/addons/pager/jquery.tablesorter.pager.js +++ b/vendor/assets/javascripts/jquery-tablesorter/addons/pager/jquery.tablesorter.pager.js @@ -1,6 +1,6 @@ /*! * tablesorter pager plugin - * updated 1/4/2013 + * updated 1/29/2013 */ /*jshint browser:true, jquery:true, unused:false */ ;(function($) { @@ -138,7 +138,7 @@ if (h) { d = h - $b.height(); if ( d > 5 && $.data(table, 'pagerLastSize') === c.size && $b.children('tr:visible').length < c.size ) { - $b.append(''); + $b.append(''); } } } @@ -188,9 +188,8 @@ var i, j, hsh, $f, $sh, $t = $(table), tc = table.config, - $b = c.$tbodies, hl = $t.find('thead th').length, tds = '', - err = '' + + err = '' + (exception ? exception.message + ' (' + exception.name + ')' : 'No rows found') + '', result = c.ajaxProcessing(data) || [ 0, [] ], d = result[1] || [], @@ -234,7 +233,7 @@ // add error row to thead instead of tbody, or clicking on the header will result in a parser error $t.find('thead').append(err); } else { - $b.html( tds ); // add tbody + $(table.tBodies[0]).html( tds ); // add rows to first tbody } if (tc.showProcessing) { $.tablesorter.isProcessing(table); // remove loading icon @@ -453,7 +452,7 @@ config.appender = $this.appender; $t - .unbind('filterStart.pager filterEnd.pager sortEnd.pager disable.pager enable.pager destroy.pager update.pager') + .unbind('filterStart.pager filterEnd.pager sortEnd.pager disable.pager enable.pager destroy.pager update.pager pageSize.pager') .bind('filterStart.pager', function(e, filters) { $.data(table, 'pagerUpdateTriggered', false); c.currentFilters = filters; @@ -481,6 +480,11 @@ }) .bind('update.pager', function(){ hideRows(table, c); + }) + .bind('pageSize.pager', function(e,v){ + c.size = parseInt(v, 10) || 10; + hideRows(table, c); + updatePageDisplay(table, c); }); // clicked controls diff --git a/vendor/assets/javascripts/jquery-tablesorter/jquery.tablesorter.js b/vendor/assets/javascripts/jquery-tablesorter/jquery.tablesorter.js index 0c3f931..e399f15 100644 --- a/vendor/assets/javascripts/jquery-tablesorter/jquery.tablesorter.js +++ b/vendor/assets/javascripts/jquery-tablesorter/jquery.tablesorter.js @@ -1,5 +1,5 @@ /*! -* TableSorter 2.7.3 - Client-side table sorting with ease! +* TableSorter 2.7.5 - Client-side table sorting with ease! * @requires jQuery v1.2.6+ * * Copyright (c) 2007 Christian Bach @@ -24,7 +24,7 @@ var ts = this; - ts.version = "2.7.3"; + ts.version = "2.7.5"; ts.parsers = []; ts.widgets = []; @@ -160,7 +160,7 @@ } } for (i = 1; i < l; i++) { - if (ts.parsers[i].is(nodeValue, table, node)) { + if (ts.parsers[i].is && ts.parsers[i].is(nodeValue, table, node)) { return ts.parsers[i]; } } @@ -170,7 +170,8 @@ function buildParserCache(table) { var c = table.config, - tb = c.$tbodies, + // update table bodies in case we start with an empty table + tb = c.$tbodies = c.$table.children('tbody:not(.' + c.cssInfoBlock + ')'), rows, list, l, i, h, ch, p, parsersDebug = ""; if ( tb.length === 0) { return c.debug ? log('*Empty table!* Not building a parser cache') : ''; @@ -322,6 +323,7 @@ function computeThIndexes(t) { var matrix = [], lookup = {}, + cols = 0, // determine the number of columns trs = $(t).find('thead:eq(0), tfoot').children('tr'), // children tr in tfoot - see issue #196 i, j, k, l, c, cells, rowIndex, cellId, rowSpan, colSpan, firstAvailCol, matrixrow; for (i = 0; i < trs.length; i++) { @@ -343,6 +345,7 @@ } } lookup[cellId] = firstAvailCol; + cols = Math.max(firstAvailCol, cols); // add data-column $(c).attr({ 'data-column' : firstAvailCol }); // 'data-row' : rowIndex for (k = rowIndex; k < rowIndex + rowSpan; k++) { @@ -356,6 +359,7 @@ } } } + t.config.columns = cols; // may not be accurate if # header columns !== # tbody columns return lookup; } @@ -443,14 +447,25 @@ } } + // automatically add col group, and column sizes if set function fixColumnWidth(table) { - if (table.config.widthFixed && $(table).find('colgroup').length === 0) { - var colgroup = $(''), - overallWidth = $(table).width(); - $("tr:first td", table.tBodies[0]).each(function() { - colgroup.append($('').css('width', parseInt(($(this).width()/overallWidth)*1000, 10)/10 + '%')); - }); - $(table).prepend(colgroup); + var $c, c = table.config, + $cg = $(''), + $cgo = c.$table.find('colgroup'), + n = c.columns.length, + overallWidth = c.$table.width(); + $("tr:first td", table.tBodies[0]).each(function(i) { + $c = $(''); + if (c.widthFixed) { + $c.css('width', parseInt(($(this).width()/overallWidth)*1000, 10)/10 + '%'); + } + $cg.append($c); + }); + // replace colgroup contents + if ($cgo.length) { + $cgo.html( $cg.html() ); + } else { + c.$table.prepend( $cg ); } } @@ -564,6 +579,9 @@ c.$tbodies = $this.children('tbody:not(.' + c.cssInfoBlock + ')'); // build headers c.$headers = buildHeaders($t0); + // fixate columns if the users supplies the fixedWidth option + // do this after theme has been applied + fixColumnWidth($t0); // try to auto detect column type, and store in tables config c.parsers = buildParserCache($t0); // build the cache for the tbody cells @@ -703,7 +721,7 @@ multisort($t0); appendToTable($t0); }) - .bind("update", function(e, resort, callback) { + .bind("update updateRows", function(e, resort, callback) { // remove rows/elements before update $(c.selectorRemove, $t0).remove(); // rebuild parsers @@ -805,10 +823,6 @@ ts.applyWidget($t0); } - // fixate columns if the users supplies the fixedWidth option - // do this after theme has been applied - fixColumnWidth($t0); - // show processesing icon if (c.showProcessing) { $this @@ -1238,7 +1252,7 @@ ts.addParser({ id: "isoDate", is: function(s) { - return (/^\d{4}[\/\-]\d{1,2}[\/\-]\d{1,2}$/).test(s); + return (/^\d{4}[\/\-]\d{1,2}[\/\-]\d{1,2}/).test(s); }, format: function(s, table) { return ts.formatFloat((s !== "") ? (new Date(s.replace(/-/g, "/")).getTime() || "") : "", table); @@ -1261,7 +1275,8 @@ id: "usLongDate", is: function(s) { // two digit years are not allowed cross-browser - return (/^[A-Z]{3,10}\.?\s+\d{1,2},?\s+(\d{4})(\s+\d{1,2}:\d{2}(:\d{2})?(\s+[AP]M)?)?$/i).test(s); + // Jan 01, 2013 12:34:56 PM or 01 Jan 2013 + return (/^[A-Z]{3,10}\.?\s+\d{1,2},?\s+(\d{4})(\s+\d{1,2}:\d{2}(:\d{2})?(\s+[AP]M)?)?$/i).test(s) || (/^\d{1,2}\s+[A-Z]{3,10}\s+\d{4}/i).test(s); }, format: function(s, table) { return ts.formatFloat( (new Date(s.replace(/(\S)([AP]M)$/i, "$1 $2")).getTime() || ''), table); diff --git a/vendor/assets/javascripts/jquery-tablesorter/jquery.tablesorter.widgets.js b/vendor/assets/javascripts/jquery-tablesorter/jquery.tablesorter.widgets.js index e855b49..49749eb 100644 --- a/vendor/assets/javascripts/jquery-tablesorter/jquery.tablesorter.widgets.js +++ b/vendor/assets/javascripts/jquery-tablesorter/jquery.tablesorter.widgets.js @@ -1,4 +1,4 @@ -/*! tableSorter 2.4+ widgets - updated 1/10/2013 +/*! tableSorter 2.4+ widgets - updated 1/29/2013 * * Column Styles * Column Filters @@ -810,14 +810,24 @@ $.tablesorter.addWidget({ format: function(table){ if ($(table).hasClass('hasResizable')) { return; } $(table).addClass('hasResizable'); - var t, j, s, $c, $cols, + var $t, t, i, j, s, $c, $cols, w, tw, $tbl = $(table), c = table.config, wo = c.widgetOptions, position = 0, $target = null, $next = null, + fullWidth = Math.abs($tbl.parent().width() - $tbl.width()) < 20, stopResize = function(){ + if ($.tablesorter.storage && $target){ + s[$target.index()] = $target.width(); + s[$next.index()] = $next.width(); + $target.width( s[$target.index()] ); + $next.width( s[$next.index()] ); + if (wo.resizable !== false){ + $.tablesorter.storage(table, 'tablesorter-resizable', s); + } + } position = 0; $target = $next = null; $(window).trigger('resize'); // will update stickyHeaders, just in case @@ -831,8 +841,17 @@ $.tablesorter.addWidget({ } } } - $tbl.children('thead:first').find('tr').each(function(){ - $c = $(this).children(); + $t = $tbl.children('thead:first').children('tr'); + // add resizable-false class name to headers (across rows as needed) + $t.children().each(function(){ + t = $(this); + i = t.attr('data-column'); + j = $.tablesorter.getData( t, c.headers[i], 'resizable') === "false"; + $t.children().filter('[data-column="' + i + '"]').toggleClass('resizable-false', j); + }); + // add wrapper inside each cell to allow for positioning of the resizable target block + $t.each(function(){ + $c = $(this).children(':not(.resizable-false)'); if (!$(this).find('.tablesorter-wrapper').length) { // Firefox needs this inner div to position the resizer correctly $c.wrapInner('
'); @@ -842,36 +861,37 @@ $.tablesorter.addWidget({ }); $cols .each(function(){ - t = $(this); - j = parseInt(t.css('padding-right'), 10) + 8; // 8 is 1/2 of the 16px wide resizer - t + $t = $(this); + j = parseInt($t.css('padding-right'), 10) + 10; // 8 is 1/2 of the 16px wide resizer grip + t = '
'; + $t .find('.tablesorter-wrapper') - .append('
'); + .append(t); }) .bind('mousemove.tsresize', function(e){ // ignore mousemove if no mousedown if (position === 0 || !$target) { return; } // resize columns - var w = e.pageX - position; - $target.width( $target.width() + w ); - $next.width( $next.width() - w ); + w = e.pageX - position; + tw = $target.width(); + $target.width( tw + w ); + if ($target.width() !== tw && fullWidth){ + $next.width( $next.width() - w ); + } position = e.pageX; }) .bind('mouseup.tsresize', function(){ - if ($.tablesorter.storage && $target){ - s[$target.index()] = $target.width(); - s[$next.index()] = $next.width(); - if (wo.resizable !== false){ - $.tablesorter.storage(table, 'tablesorter-resizable', s); - } - } stopResize(); }) - .find('.tablesorter-resizer') + .find('.tablesorter-resizer,.tablesorter-resizer-grip') .bind('mousedown', function(e){ // save header cell and mouse position; closest() not supported by jQuery v1.2.6 - $target = $(e.target).parents('th:last'); - $next = $target.next(); + $target = $(e.target).closest('th'); + t = c.$headers.filter('[data-column="' + $target.attr('data-column') + '"]'); + if (t.length > 1) { $target = $target.add(t); } + // if table is not as wide as it's parent, then resize the table + $next = e.shiftKey ? $target.parent().find('th:not(.resizable-false)').filter(':last') : $target.nextAll(':not(.resizable-false)').eq(0); position = e.pageX; }); $tbl.find('thead:first') @@ -894,16 +914,14 @@ $.tablesorter.addWidget({ .unbind('mouseup.tsresize mouseleave.tsresize contextmenu.tsresize') .find('tr').children() .unbind('mousemove.tsresize mouseup.tsresize') - .find('.tablesorter-wrapper').each(function(){ - $(this).find('.tablesorter-resizer').remove(); - $(this).replaceWith( $(this).contents() ); - }); + // don't remove "tablesorter-wrapper" as uitheme uses it too + .find('.tablesorter-resizer,.tablesorter-resizer-grip').remove(); $.tablesorter.resizableReset(table); } }); $.tablesorter.resizableReset = function(table){ - $(table.config.headerList).width('auto'); - $.tablesorter.storage(table, 'tablesorter-resizable', {}); + $(table.config.headerList).filter(':not(.resizable-false)').css('width',''); + if ($.tablesorter.storage) { $.tablesorter.storage(table, 'tablesorter-resizable', {}); } }; // Save table sort widget @@ -956,7 +974,7 @@ $.tablesorter.addWidget({ }, remove: function(table, c, wo){ // clear storage - $.tablesorter.storage( table, 'tablesorter-savesort', '' ); + if ($.tablesorter.storage) { $.tablesorter.storage( table, 'tablesorter-savesort', '' ); } } }); diff --git a/vendor/assets/stylesheets/jquery-tablesorter/theme.blue.css b/vendor/assets/stylesheets/jquery-tablesorter/theme.blue.css index d90360a..9e8555f 100644 --- a/vendor/assets/stylesheets/jquery-tablesorter/theme.blue.css +++ b/vendor/assets/stylesheets/jquery-tablesorter/theme.blue.css @@ -40,7 +40,7 @@ /* white (unsorted) double arrow */ /* background-image: url(data:image/gif;base64,R0lGODlhFQAJAIAAAP///////yH5BAEAAAEALAAAAAAVAAkAAAIXjI+AywnaYnhUMoqt3gZXPmVg94yJVQAAOw==); */ /* image */ - /* background-image: url(/assets/jquery-tablesorter/black-unsorted.gif); */ + /* background-image: url(images/black-unsorted.gif); */ background-repeat: no-repeat; background-position: center right; padding: 4px 18px 4px 4px; @@ -56,7 +56,7 @@ /* white asc arrow */ /* background-image: url(data:image/gif;base64,R0lGODlhFQAEAIAAAP///////yH5BAEAAAEALAAAAAAVAAQAAAINjI8Bya2wnINUMopZAQA7); */ /* image */ - /* background-image: url(/assets/jquery-tablesorter/black-asc.gif); */ + /* background-image: url(images/black-asc.gif); */ } .tablesorter-blue .headerSortDown, .tablesorter-blue .tablesorter-headerSortDown, @@ -67,7 +67,7 @@ /* white desc arrow */ /* background-image: url(data:image/gif;base64,R0lGODlhFQAEAIAAAP///////yH5BAEAAAEALAAAAAAVAAQAAAINjB+gC+jP2ptn0WskLQA7); */ /* image */ - /* background-image: url(/assets/jquery-tablesorter/black-desc.gif); */ + /* background-image: url(images/black-desc.gif); */ } .tablesorter-blue thead .sorter-false { background-image: none; diff --git a/vendor/assets/stylesheets/jquery-tablesorter/theme.dropbox.css b/vendor/assets/stylesheets/jquery-tablesorter/theme.dropbox.css index 72ccf99..98c6cd9 100644 --- a/vendor/assets/stylesheets/jquery-tablesorter/theme.dropbox.css +++ b/vendor/assets/stylesheets/jquery-tablesorter/theme.dropbox.css @@ -57,22 +57,22 @@ .tablesorter-dropbox .tablesorter-headerSortUp i, .tablesorter-dropbox .tablesorter-headerAsc i { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAkAAAAJCAYAAADgkQYQAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAALhJREFUeNpi/P//PwMhwILMiexYx8bIxNTy/9+/muUVQb9g4kzIitg4edI4+YRLQTSyOCPMupjerUI8whK3OXgEhH58+fDuy9sXqkuKvd+hmMTOxdvCxS8sxMUvxACiQXwU6+Im7DDg5BNKY+fiY2BmYWMA0SA+SByuiJ2bbzIHrwAzMxsb0AGMDCAaxAeJg+SZ7wtaqfAISfQAdTIwMUM8ywhUyMTEzPD/71+5FXvPLWUkJpwAAgwAZqYvvHStbD4AAAAASUVORK5CYII='); - /* background-image: url(/assets/jquery-tablesorter/dropbox-asc.png); */ + /* background-image: url(images/dropbox-asc.png); */ } .tablesorter-dropbox .tablesorter-headerSortUp:hover i, .tablesorter-dropbox .tablesorter-headerAsc:hover i { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAkAAAAJCAYAAADgkQYQAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAALVJREFUeNpi/P//PwMhwILMCc+qZGNkYmr5/+9fzcpp7b9g4kzIitjYOdM4uXlLQTSyOCPMuqi8OiEefsHbHFzcQj++fX335eN71WWTmt6hmMTOwdXCycMnBDSJAUSD+CjWxRQ0GHBw86Sxc3AyMDOzMIBoEB8kDlfEzsk1mYOLByjPCnQAIwOIBvFB4iB55rsfmVS4+QV7QNYwMTNDHApUyMTExPDv/z+5Feu3L2UkJpwAAgwA244u+I9CleAAAAAASUVORK5CYII='); - /* background-image: url(/assets/jquery-tablesorter/dropbox-asc-hovered.png); */ + /* background-image: url(images/dropbox-asc-hovered.png); */ } .tablesorter-dropbox .tablesorter-headerSortDown i, .tablesorter-dropbox .tablesorter-headerDesc i { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAkAAAAJCAYAAADgkQYQAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAALdJREFUeNpi/P//PwMhwBLdtVGFhZ3zNhMzC4bkv79/GP78/K7KCDIpZ9mVw+xcfDaMTExwBf///WP4+e3TkSlROrZg7UxMLLns3HxnmFnZmGGK/v7+9ff3j2+5YHkQMSlC48Kv719m/f//D2IKkAbxQeJwRSDw4/OHmr+/fr0DqmAA0SA+TA6uaEq0zjugG+r//vkFcks9iA/3HbJvvn18O+vf379yP758mMXAoAAXZyQmnAACDADX316BiTFbMQAAAABJRU5ErkJggg=='); - /* background-image: url(/assets/jquery-tablesorter/dropbox-desc.png); */ + /* background-image: url(images/dropbox-desc.png); */ } .tablesorter-dropbox .tablesorter-headerSortDown:hover i, .tablesorter-dropbox .tablesorter-headerDesc:hover i { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAkAAAAJCAYAAADgkQYQAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAALNJREFUeNpi/P//PwMhwBJf3uP879e3PUzMzBiS//7+ZWBi43JhBJmU2z7nIzMzEx8jIyNcAUj8799/nyZXpvCzgARYuXjTWBkZVjCzIEz7++cvw+//DGkgNiPMTWVT1l5hZvynDTINbMp/pqtdOcE6IDkmmM5fv3/5//v37z9QBQOIBvFhcnBFEwoj7/5jZFnz9+8fBhAN4sN9h+ybH9++JrGxscr/+vE1CVmckZhwAggwANvlUyq5Dd1wAAAAAElFTkSuQmCC'); - /* background-image: url(/assets/jquery-tablesorter/dropbox-desc-hovered.png); */ + /* background-image: url(images/dropbox-desc-hovered.png); */ } .tablesorter-dropbox thead .sorter-false i, .tablesorter-dropbox thead .sorter-false:hover i { diff --git a/vendor/assets/stylesheets/jquery-tablesorter/theme.green.css b/vendor/assets/stylesheets/jquery-tablesorter/theme.green.css index 57f6bdd..0bf7418 100644 --- a/vendor/assets/stylesheets/jquery-tablesorter/theme.green.css +++ b/vendor/assets/stylesheets/jquery-tablesorter/theme.green.css @@ -22,7 +22,7 @@ .tablesorter-green tfoot tr { background: center center repeat-x; background-image: url(data:image/gif;base64,R0lGODlhAQBkAOYAAN/e39XU1fX19tTU1eXm5uTl5ePk5OLj4+Hi4vX29fT19PP08/Lz8vHy8fDx8O/w7+7v7uzt7Orr6ufo5/T08/Pz8ufn5uLi4eDg39/f3t3d3Nzc29HR0NDQz8/Pzuvq6urp6eno6Ojn5+fm5tfW1tbV1dTT09PS0tLR0dHQ0NDPz/f39/b29vX19fT09PPz8/Ly8vHx8e/v7+7u7u3t7ezs7Ovr6+rq6unp6ejo6Ofn5+bm5uXl5eTk5OPj4+Li4uHh4eDg4N/f397e3t3d3dzc3Nvb29ra2tnZ2djY2NfX19XV1dPT09LS0tHR0dDQ0M/Pz8rKysXFxf///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAFMALAAAAAABAGQAAAdegCsrLC0tLi+ILi6FCSwsCS0KkhQVDA0OMjM0NTYfICEiIzw9P0AYGUQaG0ZHSEoDTU9Qs08pTk1MSyRJR0VDQT8+PTw7Ojg3NTMyMTAvi4WOhC0vMTI1OT9GTlFSgQA7); - /* background-image: url(/assets/jquery-tablesorter/green-header.gif); */ + /* background-image: url(images/green-header.gif); */ } .tablesorter-green th, .tablesorter-green thead td { @@ -35,7 +35,7 @@ .tablesorter-green .tablesorter-header { background: no-repeat 5px center; background-image: url(data:image/gif;base64,R0lGODlhEAAQAOYAAA5NDBBYDlWWUzRUM5DVjp7inJ/fnQ1ECiCsGhyYFxqKFRFdDhBXDQxCCiO8HSK2HCCqGh2aGByUFxuPFhqNFhmHFRZ2EhVvERRpEBBVDSS8HiGyHB+mGh6fGRuTFxiAFBd5Eww/Cgs5CRp7Fiu+JRx8GCy/JjHAKyynKCuhJzXCMDbCMDnDMyNuHz3EODy9N0LFPSl7JkvIRjycOFDKS1LKTVPLT1XLUFTCT17OWTBkLmbQYnDTbHXVcXnWdoXago/djGmUZ112XCJEIEdjRf///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAEUALAAAAAAQABAAAAdlgEWCg4SFhoIvh4cVLECKhCMeJjwFj0UlEwgaMD4Gii0WFAkRHQ47BIY6IQAZDAwBCyAPOJa1toRBGBAwNTY3OT0/AoZCDQoOKi4yNDOKRCIfGycrKZYDBxIkKLZDFxy3RTHgloEAOw==); - /* background-image: url(/assets/jquery-tablesorter/green-unsorted.gif); */ + /* background-image: url(images/green-unsorted.gif); */ border-collapse: collapse; white-space: normal; cursor: pointer; @@ -44,13 +44,13 @@ .tablesorter-green thead .tablesorter-headerSortUp, .tablesorter-green thead .tablesorter-headerAsc { background-image: url(data:image/gif;base64,R0lGODlhEAAQANUAAA5NDBBYDpDVjp7inJ/fnSCsGhyYFxFdDhBXDSO8HSK2HB2aGBuPFhqNFhmHFRZ2EhBVDSS8Hh6fGRuTFxd5Eww/Chp7Fhx8GCy/JjnDMyNuHzy9N0LFPVTCTzBkLmbQYnDTbHnWdo/djP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAACMALAAAAAAQABAAAAY4wJFwSCwaj8ikcslMbpojR0bEtEwwoIHywihEOCECUvNoGBaSxEdg9FQAEAQicKAoOtC8fs8fBgEAOw==) - /* background-image: url(/assets/jquery-tablesorter/green-asc.gif); */ + /* background-image: url(images/green-asc.gif); */ } .tablesorter-green thead .headerSortDown, .tablesorter-green thead .tablesorter-headerSortDown, .tablesorter-green thead .tablesorter-headerDesc { background-image: url(data:image/gif;base64,R0lGODlhEAAQANUAAFWWUzRUMw1EChqKFQxCCiO8HSCqGhyUFxVvERRpECGyHB+mGhiAFAs5CSu+JTHAKyynKCuhJzXCMDbCMD3EOELFPSl7JkvIRjycOFDKS1LKTVPLT1XLUF7OWXXVcYXagmmUZ112XCJEIEdjRf///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAACQALAAAAAAQABAAAAY4QJJwSCwaj8ikcskkghKGimbD6Xg+AGOIMChIKJcMBjlqMBSPSUQZEBwcEKYIsWiSLPa8fs9HBgEAOw==) - /* background-image: url(/assets/jquery-tablesorter/green-desc.gif); */ + /* background-image: url(images/green-desc.gif); */ } .tablesorter-green th.tablesorter-header .tablesorter-header-inner, .tablesorter-green td.tablesorter-header .tablesorter-header-inner { diff --git a/vendor/assets/stylesheets/jquery-tablesorter/theme.ice.css b/vendor/assets/stylesheets/jquery-tablesorter/theme.ice.css index 72dd19b..0f67a13 100644 --- a/vendor/assets/stylesheets/jquery-tablesorter/theme.ice.css +++ b/vendor/assets/stylesheets/jquery-tablesorter/theme.ice.css @@ -37,7 +37,7 @@ .tablesorter-ice .tablesorter-header { background: #f6f8f9 no-repeat center right; background-image: url(data:image/gif;base64,R0lGODlhDAAMAMQAAAJEjAJCiwJBigJAiANFjgNGjgNEjQRIkQRHkANIkAVMlAVQmAZWnQZUnAdYoAhdpAhZoAlhqQlepQliqQppsApmrQxutgtutQtutAxwtwxwtg1yug1zugxtsw1yuP8A/yH5BAEAAB8ALAAAAAAMAAwAAAUx4Cd+3GiOW4ado2d9VMVm1xg9ptadTsP+QNZEcjoQTBDGCAFgLRSfQgCYMAiCn8EvBAA7); - /* background-image: url(/assets/jquery-tablesorter/ice-unsorted.gif) */ + /* background-image: url(images/ice-unsorted.gif) */ padding: 4px 20px 4px 4px; white-space: normal; cursor: pointer; @@ -48,7 +48,7 @@ color: #333; background: #ebedee no-repeat center right; background-image: url(data:image/gif;base64,R0lGODlhDAAMANUAAAJCiwNHkANFjgNEjQRIkQNJkQRMlARKkwRKkgVPlwZSmgdaogdYnwhfpghcowlhqgliqglgqAlgpwljqwporwpmrQplrAtsswtqsgtrsgtqsQxttAtvtQtttAxyuQxwtwxxtwxvtg10uw1zuQ1xuP8A/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAACUALAAAAAAMAAwAAAY6wJKwJBoahyNQ6Dj0fDoZCpPEuWgqk4jxs8FQLI+Gg8Esm5kQydFQMC7IwkOAqUiUCAIzIjA4lwBlQQA7); - /* background-image: url(/assets/jquery-tablesorter/ice-desc.gif) */ + /* background-image: url(images/ice-desc.gif) */ } .tablesorter-ice .headerSortDown, .tablesorter-ice .tablesorter-headerSortDown, @@ -56,7 +56,7 @@ color: #333; background: #ebedee no-repeat center right; background-image: url(data:image/gif;base64,R0lGODlhDAAMANUAAAE/iAJBigNFjgNEjQNFjQNDiwRHkQRHjwNHjwROlgRMlQRMlARJkgRKkgZQmAVPlgZWnQZSmgZRmAdXoAdXnwdUnAdbogdZoQhbowlhqAlepglkrAliqQtstAtqsQxyugxyuQxwuAxxuAxxtwxwtgxvtQ10vA12vA10u/8A/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAACkALAAAAAAMAAwAAAY6wJQwdRoah6bP6DhEiVIdDxNEGm4yxlDpiJkwv2AmR2OhVCSJBsJ4gUQeCwOB6VAwBAXwYRAIpwBfQQA7); - /* background-image: url(/assets/jquery-tablesorter/ice-asc.gif); */ + /* background-image: url(images/ice-asc.gif); */ } .tablesorter-ice thead .sorter-false { background-image: none; From f1443d1b9f483fdcab91f86fae791030916fe98c Mon Sep 17 00:00:00 2001 From: Denis Karpenko Date: Wed, 6 Feb 2013 10:04:52 +0300 Subject: [PATCH 3/4] Update tablesorter submodule --- tablesorter | 2 +- .../assets/stylesheets/jquery-tablesorter/theme.blue.css | 6 +++--- .../stylesheets/jquery-tablesorter/theme.dropbox.css | 8 ++++---- .../assets/stylesheets/jquery-tablesorter/theme.green.css | 8 ++++---- .../assets/stylesheets/jquery-tablesorter/theme.ice.css | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/tablesorter b/tablesorter index d527cca..197960a 160000 --- a/tablesorter +++ b/tablesorter @@ -1 +1 @@ -Subproject commit d527ccac92dff04700e2e3bb18a7a28698f70169 +Subproject commit 197960a791fc8463f1c55038d5bb152ba3af87c0 diff --git a/vendor/assets/stylesheets/jquery-tablesorter/theme.blue.css b/vendor/assets/stylesheets/jquery-tablesorter/theme.blue.css index 9e8555f..d90360a 100644 --- a/vendor/assets/stylesheets/jquery-tablesorter/theme.blue.css +++ b/vendor/assets/stylesheets/jquery-tablesorter/theme.blue.css @@ -40,7 +40,7 @@ /* white (unsorted) double arrow */ /* background-image: url(data:image/gif;base64,R0lGODlhFQAJAIAAAP///////yH5BAEAAAEALAAAAAAVAAkAAAIXjI+AywnaYnhUMoqt3gZXPmVg94yJVQAAOw==); */ /* image */ - /* background-image: url(images/black-unsorted.gif); */ + /* background-image: url(/assets/jquery-tablesorter/black-unsorted.gif); */ background-repeat: no-repeat; background-position: center right; padding: 4px 18px 4px 4px; @@ -56,7 +56,7 @@ /* white asc arrow */ /* background-image: url(data:image/gif;base64,R0lGODlhFQAEAIAAAP///////yH5BAEAAAEALAAAAAAVAAQAAAINjI8Bya2wnINUMopZAQA7); */ /* image */ - /* background-image: url(images/black-asc.gif); */ + /* background-image: url(/assets/jquery-tablesorter/black-asc.gif); */ } .tablesorter-blue .headerSortDown, .tablesorter-blue .tablesorter-headerSortDown, @@ -67,7 +67,7 @@ /* white desc arrow */ /* background-image: url(data:image/gif;base64,R0lGODlhFQAEAIAAAP///////yH5BAEAAAEALAAAAAAVAAQAAAINjB+gC+jP2ptn0WskLQA7); */ /* image */ - /* background-image: url(images/black-desc.gif); */ + /* background-image: url(/assets/jquery-tablesorter/black-desc.gif); */ } .tablesorter-blue thead .sorter-false { background-image: none; diff --git a/vendor/assets/stylesheets/jquery-tablesorter/theme.dropbox.css b/vendor/assets/stylesheets/jquery-tablesorter/theme.dropbox.css index 98c6cd9..72ccf99 100644 --- a/vendor/assets/stylesheets/jquery-tablesorter/theme.dropbox.css +++ b/vendor/assets/stylesheets/jquery-tablesorter/theme.dropbox.css @@ -57,22 +57,22 @@ .tablesorter-dropbox .tablesorter-headerSortUp i, .tablesorter-dropbox .tablesorter-headerAsc i { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAkAAAAJCAYAAADgkQYQAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAALhJREFUeNpi/P//PwMhwILMiexYx8bIxNTy/9+/muUVQb9g4kzIitg4edI4+YRLQTSyOCPMupjerUI8whK3OXgEhH58+fDuy9sXqkuKvd+hmMTOxdvCxS8sxMUvxACiQXwU6+Im7DDg5BNKY+fiY2BmYWMA0SA+SByuiJ2bbzIHrwAzMxsb0AGMDCAaxAeJg+SZ7wtaqfAISfQAdTIwMUM8ywhUyMTEzPD/71+5FXvPLWUkJpwAAgwAZqYvvHStbD4AAAAASUVORK5CYII='); - /* background-image: url(images/dropbox-asc.png); */ + /* background-image: url(/assets/jquery-tablesorter/dropbox-asc.png); */ } .tablesorter-dropbox .tablesorter-headerSortUp:hover i, .tablesorter-dropbox .tablesorter-headerAsc:hover i { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAkAAAAJCAYAAADgkQYQAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAALVJREFUeNpi/P//PwMhwILMCc+qZGNkYmr5/+9fzcpp7b9g4kzIitjYOdM4uXlLQTSyOCPMuqi8OiEefsHbHFzcQj++fX335eN71WWTmt6hmMTOwdXCycMnBDSJAUSD+CjWxRQ0GHBw86Sxc3AyMDOzMIBoEB8kDlfEzsk1mYOLByjPCnQAIwOIBvFB4iB55rsfmVS4+QV7QNYwMTNDHApUyMTExPDv/z+5Feu3L2UkJpwAAgwA244u+I9CleAAAAAASUVORK5CYII='); - /* background-image: url(images/dropbox-asc-hovered.png); */ + /* background-image: url(/assets/jquery-tablesorter/dropbox-asc-hovered.png); */ } .tablesorter-dropbox .tablesorter-headerSortDown i, .tablesorter-dropbox .tablesorter-headerDesc i { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAkAAAAJCAYAAADgkQYQAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAALdJREFUeNpi/P//PwMhwBLdtVGFhZ3zNhMzC4bkv79/GP78/K7KCDIpZ9mVw+xcfDaMTExwBf///WP4+e3TkSlROrZg7UxMLLns3HxnmFnZmGGK/v7+9ff3j2+5YHkQMSlC48Kv719m/f//D2IKkAbxQeJwRSDw4/OHmr+/fr0DqmAA0SA+TA6uaEq0zjugG+r//vkFcks9iA/3HbJvvn18O+vf379yP758mMXAoAAXZyQmnAACDADX316BiTFbMQAAAABJRU5ErkJggg=='); - /* background-image: url(images/dropbox-desc.png); */ + /* background-image: url(/assets/jquery-tablesorter/dropbox-desc.png); */ } .tablesorter-dropbox .tablesorter-headerSortDown:hover i, .tablesorter-dropbox .tablesorter-headerDesc:hover i { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAkAAAAJCAYAAADgkQYQAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAALNJREFUeNpi/P//PwMhwBJf3uP879e3PUzMzBiS//7+ZWBi43JhBJmU2z7nIzMzEx8jIyNcAUj8799/nyZXpvCzgARYuXjTWBkZVjCzIEz7++cvw+//DGkgNiPMTWVT1l5hZvynDTINbMp/pqtdOcE6IDkmmM5fv3/5//v37z9QBQOIBvFhcnBFEwoj7/5jZFnz9+8fBhAN4sN9h+ybH9++JrGxscr/+vE1CVmckZhwAggwANvlUyq5Dd1wAAAAAElFTkSuQmCC'); - /* background-image: url(images/dropbox-desc-hovered.png); */ + /* background-image: url(/assets/jquery-tablesorter/dropbox-desc-hovered.png); */ } .tablesorter-dropbox thead .sorter-false i, .tablesorter-dropbox thead .sorter-false:hover i { diff --git a/vendor/assets/stylesheets/jquery-tablesorter/theme.green.css b/vendor/assets/stylesheets/jquery-tablesorter/theme.green.css index 0bf7418..57f6bdd 100644 --- a/vendor/assets/stylesheets/jquery-tablesorter/theme.green.css +++ b/vendor/assets/stylesheets/jquery-tablesorter/theme.green.css @@ -22,7 +22,7 @@ .tablesorter-green tfoot tr { background: center center repeat-x; background-image: url(data:image/gif;base64,R0lGODlhAQBkAOYAAN/e39XU1fX19tTU1eXm5uTl5ePk5OLj4+Hi4vX29fT19PP08/Lz8vHy8fDx8O/w7+7v7uzt7Orr6ufo5/T08/Pz8ufn5uLi4eDg39/f3t3d3Nzc29HR0NDQz8/Pzuvq6urp6eno6Ojn5+fm5tfW1tbV1dTT09PS0tLR0dHQ0NDPz/f39/b29vX19fT09PPz8/Ly8vHx8e/v7+7u7u3t7ezs7Ovr6+rq6unp6ejo6Ofn5+bm5uXl5eTk5OPj4+Li4uHh4eDg4N/f397e3t3d3dzc3Nvb29ra2tnZ2djY2NfX19XV1dPT09LS0tHR0dDQ0M/Pz8rKysXFxf///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAFMALAAAAAABAGQAAAdegCsrLC0tLi+ILi6FCSwsCS0KkhQVDA0OMjM0NTYfICEiIzw9P0AYGUQaG0ZHSEoDTU9Qs08pTk1MSyRJR0VDQT8+PTw7Ojg3NTMyMTAvi4WOhC0vMTI1OT9GTlFSgQA7); - /* background-image: url(images/green-header.gif); */ + /* background-image: url(/assets/jquery-tablesorter/green-header.gif); */ } .tablesorter-green th, .tablesorter-green thead td { @@ -35,7 +35,7 @@ .tablesorter-green .tablesorter-header { background: no-repeat 5px center; background-image: url(data:image/gif;base64,R0lGODlhEAAQAOYAAA5NDBBYDlWWUzRUM5DVjp7inJ/fnQ1ECiCsGhyYFxqKFRFdDhBXDQxCCiO8HSK2HCCqGh2aGByUFxuPFhqNFhmHFRZ2EhVvERRpEBBVDSS8HiGyHB+mGh6fGRuTFxiAFBd5Eww/Cgs5CRp7Fiu+JRx8GCy/JjHAKyynKCuhJzXCMDbCMDnDMyNuHz3EODy9N0LFPSl7JkvIRjycOFDKS1LKTVPLT1XLUFTCT17OWTBkLmbQYnDTbHXVcXnWdoXago/djGmUZ112XCJEIEdjRf///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAEUALAAAAAAQABAAAAdlgEWCg4SFhoIvh4cVLECKhCMeJjwFj0UlEwgaMD4Gii0WFAkRHQ47BIY6IQAZDAwBCyAPOJa1toRBGBAwNTY3OT0/AoZCDQoOKi4yNDOKRCIfGycrKZYDBxIkKLZDFxy3RTHgloEAOw==); - /* background-image: url(images/green-unsorted.gif); */ + /* background-image: url(/assets/jquery-tablesorter/green-unsorted.gif); */ border-collapse: collapse; white-space: normal; cursor: pointer; @@ -44,13 +44,13 @@ .tablesorter-green thead .tablesorter-headerSortUp, .tablesorter-green thead .tablesorter-headerAsc { background-image: url(data:image/gif;base64,R0lGODlhEAAQANUAAA5NDBBYDpDVjp7inJ/fnSCsGhyYFxFdDhBXDSO8HSK2HB2aGBuPFhqNFhmHFRZ2EhBVDSS8Hh6fGRuTFxd5Eww/Chp7Fhx8GCy/JjnDMyNuHzy9N0LFPVTCTzBkLmbQYnDTbHnWdo/djP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAACMALAAAAAAQABAAAAY4wJFwSCwaj8ikcslMbpojR0bEtEwwoIHywihEOCECUvNoGBaSxEdg9FQAEAQicKAoOtC8fs8fBgEAOw==) - /* background-image: url(images/green-asc.gif); */ + /* background-image: url(/assets/jquery-tablesorter/green-asc.gif); */ } .tablesorter-green thead .headerSortDown, .tablesorter-green thead .tablesorter-headerSortDown, .tablesorter-green thead .tablesorter-headerDesc { background-image: url(data:image/gif;base64,R0lGODlhEAAQANUAAFWWUzRUMw1EChqKFQxCCiO8HSCqGhyUFxVvERRpECGyHB+mGhiAFAs5CSu+JTHAKyynKCuhJzXCMDbCMD3EOELFPSl7JkvIRjycOFDKS1LKTVPLT1XLUF7OWXXVcYXagmmUZ112XCJEIEdjRf///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAACQALAAAAAAQABAAAAY4QJJwSCwaj8ikcskkghKGimbD6Xg+AGOIMChIKJcMBjlqMBSPSUQZEBwcEKYIsWiSLPa8fs9HBgEAOw==) - /* background-image: url(images/green-desc.gif); */ + /* background-image: url(/assets/jquery-tablesorter/green-desc.gif); */ } .tablesorter-green th.tablesorter-header .tablesorter-header-inner, .tablesorter-green td.tablesorter-header .tablesorter-header-inner { diff --git a/vendor/assets/stylesheets/jquery-tablesorter/theme.ice.css b/vendor/assets/stylesheets/jquery-tablesorter/theme.ice.css index 0f67a13..72dd19b 100644 --- a/vendor/assets/stylesheets/jquery-tablesorter/theme.ice.css +++ b/vendor/assets/stylesheets/jquery-tablesorter/theme.ice.css @@ -37,7 +37,7 @@ .tablesorter-ice .tablesorter-header { background: #f6f8f9 no-repeat center right; background-image: url(data:image/gif;base64,R0lGODlhDAAMAMQAAAJEjAJCiwJBigJAiANFjgNGjgNEjQRIkQRHkANIkAVMlAVQmAZWnQZUnAdYoAhdpAhZoAlhqQlepQliqQppsApmrQxutgtutQtutAxwtwxwtg1yug1zugxtsw1yuP8A/yH5BAEAAB8ALAAAAAAMAAwAAAUx4Cd+3GiOW4ado2d9VMVm1xg9ptadTsP+QNZEcjoQTBDGCAFgLRSfQgCYMAiCn8EvBAA7); - /* background-image: url(images/ice-unsorted.gif) */ + /* background-image: url(/assets/jquery-tablesorter/ice-unsorted.gif) */ padding: 4px 20px 4px 4px; white-space: normal; cursor: pointer; @@ -48,7 +48,7 @@ color: #333; background: #ebedee no-repeat center right; background-image: url(data:image/gif;base64,R0lGODlhDAAMANUAAAJCiwNHkANFjgNEjQRIkQNJkQRMlARKkwRKkgVPlwZSmgdaogdYnwhfpghcowlhqgliqglgqAlgpwljqwporwpmrQplrAtsswtqsgtrsgtqsQxttAtvtQtttAxyuQxwtwxxtwxvtg10uw1zuQ1xuP8A/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAACUALAAAAAAMAAwAAAY6wJKwJBoahyNQ6Dj0fDoZCpPEuWgqk4jxs8FQLI+Gg8Esm5kQydFQMC7IwkOAqUiUCAIzIjA4lwBlQQA7); - /* background-image: url(images/ice-desc.gif) */ + /* background-image: url(/assets/jquery-tablesorter/ice-desc.gif) */ } .tablesorter-ice .headerSortDown, .tablesorter-ice .tablesorter-headerSortDown, @@ -56,7 +56,7 @@ color: #333; background: #ebedee no-repeat center right; background-image: url(data:image/gif;base64,R0lGODlhDAAMANUAAAE/iAJBigNFjgNEjQNFjQNDiwRHkQRHjwNHjwROlgRMlQRMlARJkgRKkgZQmAVPlgZWnQZSmgZRmAdXoAdXnwdUnAdbogdZoQhbowlhqAlepglkrAliqQtstAtqsQxyugxyuQxwuAxxuAxxtwxwtgxvtQ10vA12vA10u/8A/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAACkALAAAAAAMAAwAAAY6wJQwdRoah6bP6DhEiVIdDxNEGm4yxlDpiJkwv2AmR2OhVCSJBsJ4gUQeCwOB6VAwBAXwYRAIpwBfQQA7); - /* background-image: url(images/ice-asc.gif); */ + /* background-image: url(/assets/jquery-tablesorter/ice-asc.gif); */ } .tablesorter-ice thead .sorter-false { background-image: none; From 8715a183e8660cbe51d23166d6bdedb94ac32b27 Mon Sep 17 00:00:00 2001 From: Denis Karpenko Date: Wed, 6 Feb 2013 10:06:10 +0300 Subject: [PATCH 4/4] Reject .min.js files from copying to gem's codebase --- Rakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Rakefile b/Rakefile index 6240b3a..6621e31 100755 --- a/Rakefile +++ b/Rakefile @@ -10,7 +10,7 @@ namespace :jquery_tablesorter do # javascript_dir = 'vendor/assets/javascripts/jquery-tablesorter' FileUtils.mkdir_p(javascript_dir) - Dir.glob('tablesorter/js/*.js').each do |file| + Dir.glob('tablesorter/js/*.js').reject{ |file| file =~ /.min.js\Z/}.each do |file| FileUtils.cp file, javascript_dir, :verbose => true end