diff --git a/.datatables-commit-sync b/.datatables-commit-sync index d6349325..73954869 100644 --- a/.datatables-commit-sync +++ b/.datatables-commit-sync @@ -1 +1 @@ -dbc18cabe53bc20369e24e30d2d1c151f68b6190 +5de12df3799542e2955ce47eda9b654b913bc36d diff --git a/media/js/jquery.dataTables.js b/media/js/jquery.dataTables.js index 1f67dd24..422fb1c7 100644 --- a/media/js/jquery.dataTables.js +++ b/media/js/jquery.dataTables.js @@ -6311,7 +6311,7 @@ // Allow custom and plug-in manipulation functions to alter the saved data set and // cancelling of loading by returning false - var abStateLoad = _fnCallbackFire( settings, 'aoStateLoadParams', 'stateLoadParams', [settings, state] ); + var abStateLoad = _fnCallbackFire( settings, 'aoStateLoadParams', 'stateLoadParams', [settings, s] ); if ( $.inArray( false, abStateLoad ) !== -1 ) { callback(); return; @@ -6331,7 +6331,7 @@ } // Store the saved state so it might be accessed at any time - settings.oLoadedState = $.extend( true, {}, state ); + settings.oLoadedState = $.extend( true, {}, s ); // Restore key features - todo - for 1.11 this needs to be done by // subscribed events @@ -6360,7 +6360,7 @@ } // Columns - // + // if ( s.columns ) { for ( i=0, ien=s.columns.length ; ik.offsetHeight||"scroll"==n.css("overflow-y"))&&(x.width=D(r.outerWidth()-b)),h=r.outerWidth()):""!==d&&(x.width=D(d), h=r.outerWidth()),N(K,z),N(function(a){H.push(a.innerHTML);F.push(D(f(a).css("width")))},z),N(function(a,b){-1!==f.inArray(a,Yb)&&(a.style.width=F[b])},t),f(z).height(0),y&&(N(K,C),N(function(a){I.push(a.innerHTML);G.push(D(f(a).css("width")))},C),N(function(a,b){a.style.width=G[b]},S),f(C).height(0)),N(function(a,b){a.innerHTML='
'+H[b]+"
";a.style.width=F[b]},z),y&&N(function(a,b){a.innerHTML='
'+ I[b]+"
";a.style.width=G[b]},C),r.outerWidth()k.offsetHeight||"scroll"==n.css("overflow-y")?h+b:h,A&&(k.scrollHeight>k.offsetHeight||"scroll"==n.css("overflow-y"))&&(x.width=D(S-b)),""!==c&&""===d||O(a,1,"Possible column misalignment",6)):S="100%",v.width=D(S),g.width=D(S),y&&(a.nScrollFoot.style.width=D(S)),!e&&A&&(v.height=D(w.offsetHeight+b)),c=r.outerWidth(),p[0].style.width=D(c),l.width=D(c),d=r.height()>k.clientHeight||"scroll"==n.css("overflow-y"),e="padding"+(B.bScrollbarLeft? -"Left":"Right"),l[e]=d?b+"px":"0px",y&&(q[0].style.width=D(c),u[0].style.width=D(c),u[0].style[e]=d?b+"px":"0px"),r.children("colgroup").insertBefore(r.children("thead")),n.scroll(),!a.bSorted&&!a.bFiltered||a._drawHold||(k.scrollTop=0))}function N(a,b,c){for(var d=0,e=0,h=b.length,g,f;e").appendTo(k.find("tbody")); k.find("thead, tfoot").remove();k.append(f(a.nTHead).clone()).append(f(a.nTFoot).clone());k.find("tfoot th, tfoot td").css("width","");p=ta(a,k.find("thead")[0]);for(q=0;q").css({width:t.sWidthOrig,margin:0,padding:0,border:0,height:1}));if(a.aoData.length)for(q=0;q").css(h||e?{position:"absolute",top:0,left:0,height:1,right:0,overflow:"hidden"}:{}).append(k).appendTo(m);h&&g?k.width(g):h?(k.css("width","auto"),k.removeAttr("width"),k.width()").css("width",D(a)).appendTo(b||x.body),d=c[0].offsetWidth;c.remove();return d}function Fb(a,b){var c=Gb(a,b);if(0>c)return null;var d=a.aoData[c];return d.nTr?d.anCells[b]:f("").html(I(a,c,b,"display"))[0]}function Gb(a,b){for(var c,d=-1,e=-1,h=0,g=a.aoData.length;hd&&(d=c.length,e=h);return e}function D(a){return null===a?"0px":"number"==typeof a?0>a?"0px":a+"px":a.match(/\d$/)?a+"px":a}function X(a){var b,c,d=[],e=a.aoColumns,h,g,k,l;b=a.aaSortingFixed;c=f.isPlainObject(b);var p=[];h=function(a){a.length&&!f.isArray(a[0])?p.push(a):f.merge(p,a)};f.isArray(b)&&h(b);c&&b.pre&&h(b.pre);h(a.aaSorting);c&&b.post&&h(b.post);for(a=0;ae?1:0,0!==c)return"asc"===f.dir?c:-c;c=d[a];e=d[b];return ce?1:0}):l.sort(function(a,b){var c,g,f,k,l=p.length,n=h[a]._aSortData,m=h[b]._aSortData;for(f=0;fg?1:0})}a.bSorted=!0}function Ib(a){var b,c,d=a.aoColumns,e=X(a);a=a.oLanguage.oAria;for(var h=0,g=d.length;h/g, +p[a]._idx===m&&(p[a]._idx=f.inArray(p[a][1],e[g].asSorting)),d.push({src:l,col:g,dir:p[a][1],index:p[a]._idx,type:k,formatter:q.ext.type.order[k+"-pre"]});return d}function mb(a){var b,c,d=[],e=q.ext.type.order,h=a.aoData,g=0,k,f=a.aiDisplayMaster,p;Ha(a);p=X(a);b=0;for(c=p.length;be?1:0,0!==c)return"asc"===f.dir?c:-c;c=d[a];e=d[b];return ce?1:0}):f.sort(function(a,b){var c,g,f,k,l=p.length,n=h[a]._aSortData,m=h[b]._aSortData;for(f=0;fg?1:0})}a.bSorted=!0}function Ib(a){var b,c,d=a.aoColumns,e=X(a);a=a.oLanguage.oAria;for(var h=0,g=d.length;h/g, "");var l=c.nTh;l.removeAttribute("aria-sort");c.bSortable&&(0e?e+1:3));e=0;for(h=d.length;ee?e+1:3))}a.aLastSort=d}function Hb(a,b){var c=a.aoColumns[b],d=q.ext.order[c.sSortDataType],e;d&&(e=d.call(a.oInstance,a,b,ba(a,b)));for(var h,g=q.ext.type.order[c.sType+"-pre"],f=0,l=a.aoData.length;f=h.length?[0,c[1]]:c)}));b.search!== -m&&f.extend(a.oPreviousSearch,Bb(b.search));if(b.columns)for(d=0,e=b.columns.length;d=h.length?[0,c[1]]:c)}));b.search!== +m&&f.extend(a.oPreviousSearch,Bb(b.search));if(b.columns)for(d=0,e=b.columns.length;d=c&&(b=c-d);b-=b%d;if(-1===d||0>b)b=0;a._iDisplayStart=b}function Oa(a,b){var c=a.renderer,d=q.ext.renderer[b];return f.isPlainObject(c)&&c[b]?d[c[b]]||d._:"string"===typeof c?d[c]||d._:d._}function F(a){return a.oFeatures.bServerSide?"ssp":a.ajax||a.sAjaxSource?"ajax":"dom"}function ja(a,b){var c;c=Lb.numbers_length;var d=Math.floor(c/2);b<=c?c= @@ -129,12 +129,12 @@ c,d){var e=b.aoData,h=e[c],g,f,l,p,n;e.splice(c,1);g=0;for(f=e.length;g").addClass(c),f("td",d).addClass(c).html(b)[0].colSpan=ca(a),e.push(d[0]))};h(c,d);b._details&& b._details.detach();b._details=f(e);b._detailsShow&&b._details.insertAfter(b.nTr)},cb=function(a,b){var c=a.context;c.length&&(c=c[0].aoData[b!==m?b:a[0]])&&c._details&&(c._details.remove(),c._detailsShow=m,c._details=m)},Ub=function(a,b){var c=a.context;if(c.length&&a.length){var d=c[0].aoData[a[0]];d._details&&((d._detailsShow=b)?d._details.insertAfter(d.nTr):d._details.detach(),fc(c[0]))}},fc=function(a){var b=new w(a),c=a.aoData;b.off("draw.dt.DT_details column-visibility.dt.DT_details destroy.dt.DT_details"); -0g){var n=f.map(d,function(a,b){return a.bVisible?b:null});return[n[n.length+g]]}return[aa(a,g)];case "name":return f.map(e,function(a,b){return a===m[1]?b:null});default:return[]}if(b.nodeName&&b._DT_CellIndex)return[b._DT_CellIndex.column];g=f(h).filter(b).map(function(){return f.inArray(this,h)}).toArray();if(g.length||!b.nodeName)return g;g=f(b).closest("*[data-dt-column]");return g.length?[g.data("dt-column")]: []},a,c)};t("columns()",function(a,b){a===m?a="":f.isPlainObject(a)&&(b=a,a="");b=ab(b);var c=this.iterator("table",function(c){return hc(c,a,b)},1);c.selector.cols=a;c.selector.opts=b;return c});B("columns().header()","column().header()",function(a,b){return this.iterator("column",function(a,b){return a.aoColumns[b].nTh},1)});B("columns().footer()","column().footer()",function(a,b){return this.iterator("column",function(a,b){return a.aoColumns[b].nTf},1)});B("columns().data()","column().data()", -function(){return this.iterator("column-rows",Vb,1)});B("columns().dataSrc()","column().dataSrc()",function(){return this.iterator("column",function(a,b){return a.aoColumns[b].mData},1)});B("columns().cache()","column().cache()",function(a){return this.iterator("column-rows",function(b,c,d,e,f){return ka(b.aoData,f,"search"===a?"_aFilterData":"_aSortData",c)},1)});B("columns().nodes()","column().nodes()",function(){return this.iterator("column-rows",function(a,b,c,d,e){return ka(a.aoData,e,"anCells", +function(){return this.iterator("column-rows",Vb,1)});B("columns().dataSrc()","column().dataSrc()",function(){return this.iterator("column",function(a,b){return a.aoColumns[b].mData},1)});B("columns().cache()","column().cache()",function(a){return this.iterator("column-rows",function(b,c,d,e,h){return ka(b.aoData,h,"search"===a?"_aFilterData":"_aSortData",c)},1)});B("columns().nodes()","column().nodes()",function(){return this.iterator("column-rows",function(a,b,c,d,e){return ka(a.aoData,e,"anCells", b)},1)});B("columns().visible()","column().visible()",function(a,b){var c=this.iterator("column",function(b,c){if(a===m)return b.aoColumns[c].bVisible;var d=b.aoColumns,e=d[c],k=b.aoData,l,p,n;if(a!==m&&e.bVisible!==a){if(a){var q=f.inArray(!0,L(d,"bVisible"),c+1);l=0;for(p=k.length;l