diff --git a/.datatables-commit-sync b/.datatables-commit-sync index 260ffb4a..e9d2548c 100644 --- a/.datatables-commit-sync +++ b/.datatables-commit-sync @@ -1 +1 @@ -073d6e48b8e83c9fd980a77b1b861c40c3554bf4 +6c60a9429fae2c76141a9c7f4011a9a4b66d0277 diff --git a/media/js/jquery.dataTables.js b/media/js/jquery.dataTables.js index f3510b4c..c1006021 100644 --- a/media/js/jquery.dataTables.js +++ b/media/js/jquery.dataTables.js @@ -6328,7 +6328,7 @@ /* Remove row stripe classes if they are already on the table row */ var stripeClasses = oSettings.asStripeClasses; - var rowOne = $('tbody tr', this).eq(0); + var rowOne = $this.children('tbody').find('tr').eq(0); if ( $.inArray( true, $.map( stripeClasses, function(el, i) { return rowOne.hasClass(el); } ) ) !== -1 ) { diff --git a/media/js/jquery.dataTables.min.js b/media/js/jquery.dataTables.min.js index 83e27885..bcfc18b2 100644 --- a/media/js/jquery.dataTables.min.js +++ b/media/js/jquery.dataTables.min.js @@ -86,9 +86,9 @@ E(q,e,["asStripeClasses","ajax","fnServerData","fnFormatNumber","sServerMethod", "sXInner"],["sScrollY","sY"],["bScrollCollapse","bCollapse"]]);E(q.oLanguage,e,"fnInfoCallback");z(q,"aoDrawCallback",e.fnDrawCallback,"user");z(q,"aoServerParams",e.fnServerParams,"user");z(q,"aoStateSaveParams",e.fnStateSaveParams,"user");z(q,"aoStateLoadParams",e.fnStateLoadParams,"user");z(q,"aoStateLoaded",e.fnStateLoaded,"user");z(q,"aoRowCallback",e.fnRowCallback,"user");z(q,"aoRowCreatedCallback",e.fnCreatedRow,"user");z(q,"aoHeaderCallback",e.fnHeaderCallback,"user");z(q,"aoFooterCallback", e.fnFooterCallback,"user");z(q,"aoInitComplete",e.fnInitComplete,"user");z(q,"aoPreDrawCallback",e.fnPreDrawCallback,"user");j=q.oClasses;e.bJQueryUI?(g.extend(j,o.ext.oJUIClasses,e.oClasses),e.sDom===l.sDom&&"lfrtip"===l.sDom&&(q.sDom='<"H"lfr>t<"F"ip>'),q.renderer)?g.isPlainObject(q.renderer)&&!q.renderer.header&&(q.renderer.header="jqueryui"):q.renderer="jqueryui":g.extend(j,o.ext.classes,e.oClasses);p.addClass(j.sTable);if(""!==q.oScroll.sX||""!==q.oScroll.sY)q.oScroll.iBarWidth=Hb();!0===q.oScroll.sX&& (q.oScroll.sX="100%");q.iInitDisplayStart===k&&(q.iInitDisplayStart=e.iDisplayStart,q._iDisplayStart=e.iDisplayStart);null!==e.iDeferLoading&&(q.bDeferLoading=!0,h=g.isArray(e.iDeferLoading),q._iRecordsDisplay=h?e.iDeferLoading[0]:e.iDeferLoading,q._iRecordsTotal=h?e.iDeferLoading[1]:e.iDeferLoading);var t=q.oLanguage;g.extend(!0,t,e.oLanguage);""!==t.sUrl&&(g.ajax({dataType:"json",url:t.sUrl,success:function(a){O(a);H(l.oLanguage,a);g.extend(true,t,a);ga(q)},error:function(){ga(q)}}),m=!0);null=== -e.asStripeClasses&&(q.asStripeClasses=[j.sStripeOdd,j.sStripeEven]);var h=q.asStripeClasses,s=g("tbody tr",this).eq(0);-1!==g.inArray(!0,g.map(h,function(a){return s.hasClass(a)}))&&(g("tbody tr",this).removeClass(h.join(" ")),q.asDestroyStripes=h.slice());n=[];h=this.getElementsByTagName("thead");0!==h.length&&(da(q.aoHeader,h[0]),n=qa(q));if(null===e.aoColumns){r=[];h=0;for(i=n.length;h").appendTo(this));q.nTHead=i[0];i=p.children("tbody"); +e.asStripeClasses&&(q.asStripeClasses=[j.sStripeOdd,j.sStripeEven]);var h=q.asStripeClasses,s=p.children("tbody").find("tr").eq(0);-1!==g.inArray(!0,g.map(h,function(a){return s.hasClass(a)}))&&(g("tbody tr",this).removeClass(h.join(" ")),q.asDestroyStripes=h.slice());n=[];h=this.getElementsByTagName("thead");0!==h.length&&(da(q.aoHeader,h[0]),n=qa(q));if(null===e.aoColumns){r=[];h=0;for(i=n.length;h").appendTo(this));q.nTHead=i[0];i=p.children("tbody"); 0===i.length&&(i=g("").appendTo(this));q.nTBody=i[0];i=p.children("tfoot");if(0===i.length&&0").appendTo(this);0===i.length||0===i.children().length?p.addClass(j.sNoFooter):0a?new t(b[a],this[a]):null},filter:function(a){var b=[]; @@ -107,7 +107,7 @@ a[b].length)return a[0]=a[b],a.length=1,a.context=[a.context[b]],a;a.length=0;re d;c++)"none"==i?f.push(c):(e=g.inArray(c,h),(-1===e&&"removed"==i||0<=e&&"applied"==i)&&f.push(c))}return f};r("rows()",function(a,b){a===k?a="":g.isPlainObject(a)&&(b=a,a="");var b=ab(b),c=this.iterator("table",function(c){var e=b;return $a(a,function(a){var b=Pb(a);if(b!==null&&!e)return[b];var i=Ca(c,e);if(b!==null&&g.inArray(b,i)!==-1)return[b];if(!a)return i;if(typeof a==="function")return g.map(i,function(b){var e=c.aoData[b];return a(b,e._aData,e.nTr)?b:null});b=Sb(ia(c.aoData,i,"nTr"));return a.nodeName&& g.inArray(a,b)!==-1?[a._DT_RowIndex]:g(b).filter(a).map(function(){return this._DT_RowIndex}).toArray()})},1);c.selector.rows=a;c.selector.opts=b;return c});r("rows().nodes()",function(){return this.iterator("row",function(a,b){return a.aoData[b].nTr||k},1)});r("rows().data()",function(){return this.iterator(!0,"rows",function(a,b){return ia(a.aoData,b,"_aData")},1)});u("rows().cache()","row().cache()",function(a){return this.iterator("row",function(b,c){var d=b.aoData[c];return"search"===a?d._aFilterData: d._aSortData},1)});u("rows().invalidate()","row().invalidate()",function(a){return this.iterator("row",function(b,c){ca(b,c,a)})});u("rows().indexes()","row().index()",function(){return this.iterator("row",function(a,b){return b},1)});u("rows().remove()","row().remove()",function(){var a=this;return this.iterator("row",function(b,c,d){var e=b.aoData;e.splice(c,1);for(var f=0,h=e.length;f