mirror of
https://github.com/DataTables/DataTables.git
synced 2025-02-20 18:54:15 +01:00
Fix: -init columns.orderData
would fail if used with a target index of 0 and it was given as an integer
- Fixes DataTablesSrc #97 and thread 22462
This commit is contained in:
parent
95a99bdbeb
commit
b2c2d51a5a
@ -1 +1 @@
|
||||
5608cc872abbc493fa2ec533510576ea8ad066d3
|
||||
89e255146c38815a6d13bf032dc5d6f4bf96dca8
|
||||
|
2
media/js/jquery.dataTables.js
vendored
2
media/js/jquery.dataTables.js
vendored
@ -1822,7 +1822,7 @@
|
||||
|
||||
// orderData can be given as an integer
|
||||
var dataSort = init.aDataSort;
|
||||
if ( dataSort && ! $.isArray( dataSort ) ) {
|
||||
if ( typeof dataSort === 'number' && ! $.isArray( dataSort ) ) {
|
||||
init.aDataSort = [ dataSort ];
|
||||
}
|
||||
}
|
||||
|
2
media/js/jquery.dataTables.min.js
vendored
2
media/js/jquery.dataTables.min.js
vendored
@ -18,7 +18,7 @@ $jscomp.polyfill("Array.prototype.find",function(f){return f?f:function(f,x){ret
|
||||
(function(f){"function"===typeof define&&define.amd?define(["jquery"],function(A){return f(A,window,document)}):"object"===typeof exports?module.exports=function(A,x){A||(A=window);x||(x="undefined"!==typeof window?require("jquery"):require("jquery")(A));return f(x,A,A.document)}:f(jQuery,window,document)})(function(f,A,x,m){function E(a){var b,c,d={};f.each(a,function(e,h){(b=e.match(/^([^A-Z]+?)([A-Z])/))&&-1!=="a aa ai ao as b fn i m o s ".indexOf(b[1]+" ")&&(c=e.replace(b[0],b[2].toLowerCase()),
|
||||
d[c]=e,"o"===b[1]&&E(a[e]))});a._hungarianMap=d}function K(a,b,c){a._hungarianMap||E(a);var d;f.each(b,function(e,h){d=a._hungarianMap[e];d===m||!c&&b[d]!==m||("o"===d.charAt(0)?(b[d]||(b[d]={}),f.extend(!0,b[d],b[e]),K(a[d],b[d],c)):b[d]=b[e])})}function Ea(a){var b=q.defaults.oLanguage,c=a.sZeroRecords;!a.sEmptyTable&&c&&"No data available in table"===b.sEmptyTable&&M(a,a,"sZeroRecords","sEmptyTable");!a.sLoadingRecords&&c&&"Loading..."===b.sLoadingRecords&&M(a,a,"sZeroRecords","sLoadingRecords");
|
||||
a.sInfoThousands&&(a.sThousands=a.sInfoThousands);(a=a.sDecimal)&&db(a)}function eb(a){H(a,"ordering","bSort");H(a,"orderMulti","bSortMulti");H(a,"orderClasses","bSortClasses");H(a,"orderCellsTop","bSortCellsTop");H(a,"order","aaSorting");H(a,"orderFixed","aaSortingFixed");H(a,"paging","bPaginate");H(a,"pagingType","sPaginationType");H(a,"pageLength","iDisplayLength");H(a,"searching","bFilter");"boolean"===typeof a.sScrollX&&(a.sScrollX=a.sScrollX?"100%":"");"boolean"===typeof a.scrollX&&(a.scrollX=
|
||||
a.scrollX?"100%":"");if(a=a.aoSearchCols)for(var b=0,c=a.length;b<c;b++)a[b]&&K(q.models.oSearch,a[b])}function fb(a){H(a,"orderable","bSortable");H(a,"orderData","aDataSort");H(a,"orderSequence","asSorting");H(a,"orderDataType","sortDataType");var b=a.aDataSort;b&&!f.isArray(b)&&(a.aDataSort=[b])}function gb(a){if(!q.__browser){var b={};q.__browser=b;var c=f("<div/>").css({position:"fixed",top:0,left:-1*f(A).scrollLeft(),height:1,width:1,overflow:"hidden"}).append(f("<div/>").css({position:"absolute",
|
||||
a.scrollX?"100%":"");if(a=a.aoSearchCols)for(var b=0,c=a.length;b<c;b++)a[b]&&K(q.models.oSearch,a[b])}function fb(a){H(a,"orderable","bSortable");H(a,"orderData","aDataSort");H(a,"orderSequence","asSorting");H(a,"orderDataType","sortDataType");var b=a.aDataSort;"number"!==typeof b||f.isArray(b)||(a.aDataSort=[b])}function gb(a){if(!q.__browser){var b={};q.__browser=b;var c=f("<div/>").css({position:"fixed",top:0,left:-1*f(A).scrollLeft(),height:1,width:1,overflow:"hidden"}).append(f("<div/>").css({position:"absolute",
|
||||
top:1,left:1,width:100,overflow:"scroll"}).append(f("<div/>").css({width:"100%",height:10}))).appendTo("body"),d=c.children(),e=d.children();b.barWidth=d[0].offsetWidth-d[0].clientWidth;b.bScrollOversize=100===e[0].offsetWidth&&100!==d[0].clientWidth;b.bScrollbarLeft=1!==Math.round(e.offset().left);b.bBounding=c[0].getBoundingClientRect().width?!0:!1;c.remove()}f.extend(a.oBrowser,q.__browser);a.oScroll.iBarWidth=q.__browser.barWidth}function hb(a,b,c,d,e,h){var g,k=!1;c!==m&&(g=c,k=!0);for(;d!==
|
||||
e;)a.hasOwnProperty(d)&&(g=k?b(g,a[d],d,a):a[d],k=!0,d+=h);return g}function Fa(a,b){var c=q.defaults.column,d=a.aoColumns.length,c=f.extend({},q.models.oColumn,c,{nTh:b?b:x.createElement("th"),sTitle:c.sTitle?c.sTitle:b?b.innerHTML:"",aDataSort:c.aDataSort?c.aDataSort:[d],mData:c.mData?c.mData:d,idx:d});a.aoColumns.push(c);c=a.aoPreSearchCols;c[d]=f.extend({},q.models.oSearch,c[d]);la(a,d,f(b).data())}function la(a,b,c){b=a.aoColumns[b];var d=a.oClasses,e=f(b.nTh);if(!b.sWidthOrig){b.sWidthOrig=
|
||||
e.attr("width")||null;var h=(e.attr("style")||"").match(/width:\s*(\d+[pxem%]+)/);h&&(b.sWidthOrig=h[1])}c!==m&&null!==c&&(fb(c),K(q.defaults.column,c),c.mDataProp===m||c.mData||(c.mData=c.mDataProp),c.sType&&(b._sManualType=c.sType),c.className&&!c.sClass&&(c.sClass=c.className),f.extend(b,c),M(b,c,"sWidth","sWidthOrig"),c.iDataSort!==m&&(b.aDataSort=[c.iDataSort]),M(b,c,"aDataSort"));var g=b.mData,k=T(g),l=b.mRender?T(b.mRender):null;c=function(a){return"string"===typeof a&&-1!==a.indexOf("@")};
|
||||
|
Loading…
x
Reference in New Issue
Block a user