From 1a3db258d4e03ba9bcc5740daeb4c2d9ff524009 Mon Sep 17 00:00:00 2001 From: Allan Jardine Date: Thu, 31 Aug 2017 14:44:01 +0100 Subject: [PATCH] New: `-api column().name()` and `-api columns().names()` methods which can be used to get and set the names of columns (`-init columns.name`) --- .datatables-commit-sync | 2 +- media/js/jquery.dataTables.js | 14 +++ media/js/jquery.dataTables.min.js | 142 +++++++++++++++--------------- 3 files changed, 86 insertions(+), 72 deletions(-) diff --git a/.datatables-commit-sync b/.datatables-commit-sync index a8f3155f..cba587b6 100644 --- a/.datatables-commit-sync +++ b/.datatables-commit-sync @@ -1 +1 @@ -3690a478e5438b4c744ffb2bf1506dae35162764 +fa158a0030e7310837ada440c5f942406c0b4b8a diff --git a/media/js/jquery.dataTables.js b/media/js/jquery.dataTables.js index f9468e99..433b8386 100644 --- a/media/js/jquery.dataTables.js +++ b/media/js/jquery.dataTables.js @@ -8567,6 +8567,20 @@ }, 1 ); } ); + _api_registerPlural( 'columns().names()', 'column().name()', function ( setter ) { + return this.iterator( 'column', function ( settings, column ) { + var col = settings.aoColumns[column]; + + if ( setter !== undefined ) { + col.sName = setter; + return this; + } + else { + return col.sName; + } + }, 1 ); + } ); + _api_registerPlural( 'columns().nodes()', 'column().nodes()', function () { return this.iterator( 'column-rows', function ( settings, column, i, j, rows ) { return _pluck_order( settings.aoData, rows, 'anCells', column ) ; diff --git a/media/js/jquery.dataTables.min.js b/media/js/jquery.dataTables.min.js index 27b7411f..8b879080 100644 --- a/media/js/jquery.dataTables.min.js +++ b/media/js/jquery.dataTables.min.js @@ -11,7 +11,7 @@ e;)a.hasOwnProperty(d)&&(g=i?b(g,a[d],d,a):a[d],i=!0,d+=f);return g}function Da( e.attr("width")||null;var f=(e.attr("style")||"").match(/width:\s*(\d+[pxem%]+)/);f&&(b.sWidthOrig=f[1])}c!==k&&null!==c&&(eb(c),I(m.defaults.column,c),c.mDataProp!==k&&!c.mData&&(c.mData=c.mDataProp),c.sType&&(b._sManualType=c.sType),c.className&&!c.sClass&&(c.sClass=c.className),h.extend(b,c),F(b,c,"sWidth","sWidthOrig"),c.iDataSort!==k&&(b.aDataSort=[c.iDataSort]),F(b,c,"aDataSort"));var g=b.mData,i=Q(g),j=b.mRender?Q(b.mRender):null,c=function(a){return"string"===typeof a&&-1!==a.indexOf("@")}; b._bAttrSrc=h.isPlainObject(g)&&(c(g.sort)||c(g.type)||c(g.filter));b._setter=null;b.fnGetData=function(a,b,c){var d=i(a,b,k,c);return j&&b?j(d,b,a,c):d};b.fnSetData=function(a,b,c){return R(g)(a,b,c)};"number"!==typeof g&&(a._rowReadObject=!0);a.oFeatures.bSort||(b.bSortable=!1,e.addClass(d.sSortableNone));a=-1!==h.inArray("asc",b.asSorting);c=-1!==h.inArray("desc",b.asSorting);b.sSortingClass=!b.bSortable||!a&&!c?d.sSortableNone:a&&!c?d.sSortableAsc:!a&&c?d.sSortableDesc:d.sSortable}function Y(a){if(!1!== a.oFeatures.bAutoWidth){var b=a.aoColumns;Ea(a);for(var c=0,d=b.length;cq[f])d(l.length+q[f],n);else if("string"===typeof q[f]){i=0;for(j=l.length;ib&&a[e]--; -1!=d&&c===k&&a.splice(d,1)}function ca(a,b,c,d){var e=a.aoData[b],f,g=function(c,d){for(;c.childNodes.length;)c.removeChild(c.firstChild);c.innerHTML=B(a,b,d,"display")};if("dom"===c||(!c||"auto"===c)&&"dom"===e.src)e._aData=Ha(a,e,d,d===k?k:e._aData).data;else{var i=e.anCells; -if(i)if(d!==k)g(i[d],d);else{c=0;for(f=i.length;c").appendTo(g));b=0;for(c=l.length;btr").attr("role","row");h(g).find(">tr>th, >tr>td").addClass(n.sHeaderTH);h(i).find(">tr>th, >tr>td").addClass(n.sFooterTH);if(null!==i){a=a.aoFooter[0];b=0;for(c=a.length;b=a.fnRecordsDisplay()?0:g,a.iInitDisplayStart=-1);var g=a._iDisplayStart,n=a.fnDisplayEnd();if(a.bDeferLoading)a.bDeferLoading=!1,a.iDraw++,C(a,!1);else if(i){if(!a.bDestroying&& -!kb(a))return}else a.iDraw++;if(0!==j.length){f=i?a.aoData.length:n;for(i=i?0:g;i",{"class":e?d[0]:""}).append(h("",{valign:"top",colSpan:aa(a), +!kb(a))return}else a.iDraw++;if(0!==j.length){f=i?a.aoData.length:n;for(i=i?0:g;i",{"class":e?d[0]:""}).append(h("",{valign:"top",colSpan:aa(a), "class":a.oClasses.sRowEmpty}).html(c))[0];r(a,"aoHeaderCallback","header",[h(a.nTHead).children("tr")[0],Ja(a),g,n,j]);r(a,"aoFooterCallback","footer",[h(a.nTFoot).children("tr")[0],Ja(a),g,n,j]);d=h(a.nTBody);d.children().detach();d.append(h(b));r(a,"aoDrawCallback","draw",[a]);a.bSorted=!1;a.bFiltered=!1;a.bDrawing=!1}}function S(a,b){var c=a.oFeatures,d=c.bFilter;c.bSort&&lb(a);d?fa(a,a.oPreviousSearch):a.aiDisplay=a.aiDisplayMaster.slice();!0!==b&&(a._iDisplayStart=0);a._drawHold=b;N(a);a._drawHold= !1}function mb(a){var b=a.oClasses,c=h(a.nTable),c=h("
").insertBefore(c),d=a.oFeatures,b=h("
",{id:a.sTableId+"_wrapper","class":b.sWrapper+(a.nTFoot?"":" "+b.sNoFooter)});a.nHolding=c[0];a.nTableWrapper=b[0];a.nTableReinsertBefore=a.nTable.nextSibling;for(var e=a.sDom.split(""),f,g,i,j,n,l,q=0;q")[0];j=e[q+1];if("'"==j||'"'==j){n="";for(l=2;e[q+l]!=j;)n+=e[q+l],l++;-1!=n.indexOf(".")?(j=n.split("."),i.id=j[0].substr(1,j[0].length-1),i.className= j[1]):"#"==n.charAt(0)?i.id=n.substr(1,n.length-1):i.className=n;q+=l}b.append(i);b=h(i)}else if(">"==g)b=b.parent();else if("l"==g&&d.bPaginate&&d.bLengthChange)f=nb(a);else if("f"==g&&d.bFilter)f=ob(a);else if("r"==g&&d.bProcessing)f=pb(a);else if("t"==g)f=qb(a);else if("i"==g&&d.bInfo)f=rb(a);else if("p"==g&&d.bPaginate)f=sb(a);else if(0!==m.ext.feature.length){i=m.ext.feature;l=0;for(j=i.length;l',i=d.sSearch,i=i.match(/_INPUT_/)?i.replace("_INPUT_",g):i+g,b=h("
",{id:!f.f?c+"_filter":null,"class":b.sFilter}).append(h("