mirror of
https://github.com/DataTables/DataTables.git
synced 2025-02-17 15:54:14 +01:00
Fix: Javascript error would occur if trying to use dt-api cells().nodes()
on a cell that doesn't exisit in the DataTable
- Fixes DataTables/KeyTable #23.
This commit is contained in:
parent
f963bba252
commit
386150893a
@ -1 +1 @@
|
||||
a4e30380ef28f0d869bdd4f401b33096b157cbf1
|
||||
6fe17f5956d8c318686798fbd797b2d092366005
|
||||
|
7
media/js/jquery.dataTables.js
vendored
7
media/js/jquery.dataTables.js
vendored
@ -8657,9 +8657,10 @@
|
||||
|
||||
_api_registerPlural( 'cells().nodes()', 'cell().node()', function () {
|
||||
return this.iterator( 'cell', function ( settings, row, column ) {
|
||||
var cells = settings.aoData[ row ].anCells;
|
||||
return cells ?
|
||||
cells[ column ] :
|
||||
var data = settings.aoData[ row ];
|
||||
|
||||
return data && data.anCells ?
|
||||
data.anCells[ column ] :
|
||||
undefined;
|
||||
}, 1 );
|
||||
} );
|
||||
|
2
media/js/jquery.dataTables.min.js
vendored
2
media/js/jquery.dataTables.min.js
vendored
@ -124,7 +124,7 @@ function(a){return this.iterator("column-rows",function(b,c,d,e,f){return ia(b.a
|
||||
g.inArray(!0,F(e,"bVisible"),d+1);j=0;for(i=h.length;j<i;j++)m=h[j].nTr,e=h[j].anCells,m&&m.insertBefore(e[d],e[l]||null)}else g(F(c.aoData,"anCells",d)).detach();f.bVisible=a;fa(c,c.aoHeader);fa(c,c.aoFooter);(b===k||b)&&U(c);v(c,null,"column-visibility",[c,d,a,b]);ya(c)}})});r("columns().indexes()","column().index()",function(a){return this.iterator("column",function(b,c){return"visible"===a?aa(b,c):c},1)});p("columns.adjust()",function(){return this.iterator("table",function(a){U(a)},1)});p("column.index()",
|
||||
function(a,b){if(0!==this.context.length){var c=this.context[0];if("fromVisible"===a||"toData"===a)return Z(c,b);if("fromData"===a||"toVisible"===a)return aa(c,b)}});p("column()",function(a,b){return bb(this.columns(a,b))});p("cells()",function(a,b,c){g.isPlainObject(a)&&(a.row===k?(c=a,a=null):(c=b,b=null));g.isPlainObject(b)&&(c=b,b=null);if(null===b||b===k)return this.iterator("table",function(b){var d=a,e=ab(c),f=b.aoData,h=Da(b,e),j=Sb(ia(f,h,"anCells")),i=g([].concat.apply([],j)),l,m=b.aoColumns.length,
|
||||
o,p,t,r,s,v;return $a("cell",d,function(a){var c=typeof a==="function";if(a===null||a===k||c){o=[];p=0;for(t=h.length;p<t;p++){l=h[p];for(r=0;r<m;r++){s={row:l,column:r};if(c){v=f[l];a(s,B(b,l,r),v.anCells?v.anCells[r]:null)&&o.push(s)}else o.push(s)}}return o}return g.isPlainObject(a)?[a]:i.filter(a).map(function(a,b){return{row:b._DT_CellIndex.row,column:b._DT_CellIndex.column}}).toArray()},b,e)});var d=this.columns(b,c),e=this.rows(a,c),f,h,j,i,m,l=this.iterator("table",function(a,b){f=[];h=0;
|
||||
for(j=e[b].length;h<j;h++){i=0;for(m=d[b].length;i<m;i++)f.push({row:e[b][h],column:d[b][i]})}return f},1);g.extend(l.selector,{cols:b,rows:a,opts:c});return l});r("cells().nodes()","cell().node()",function(){return this.iterator("cell",function(a,b,c){return(a=a.aoData[b].anCells)?a[c]:k},1)});p("cells().data()",function(){return this.iterator("cell",function(a,b,c){return B(a,b,c)},1)});r("cells().cache()","cell().cache()",function(a){a="search"===a?"_aFilterData":"_aSortData";return this.iterator("cell",
|
||||
for(j=e[b].length;h<j;h++){i=0;for(m=d[b].length;i<m;i++)f.push({row:e[b][h],column:d[b][i]})}return f},1);g.extend(l.selector,{cols:b,rows:a,opts:c});return l});r("cells().nodes()","cell().node()",function(){return this.iterator("cell",function(a,b,c){return(a=a.aoData[b])&&a.anCells?a.anCells[c]:k},1)});p("cells().data()",function(){return this.iterator("cell",function(a,b,c){return B(a,b,c)},1)});r("cells().cache()","cell().cache()",function(a){a="search"===a?"_aFilterData":"_aSortData";return this.iterator("cell",
|
||||
function(b,c,d){return b.aoData[c][a][d]},1)});r("cells().render()","cell().render()",function(a){return this.iterator("cell",function(b,c,d){return B(b,c,d,a)},1)});r("cells().indexes()","cell().index()",function(){return this.iterator("cell",function(a,b,c){return{row:b,column:c,columnVisible:aa(a,c)}},1)});r("cells().invalidate()","cell().invalidate()",function(a){return this.iterator("cell",function(b,c,d){da(b,c,a,d)})});p("cell()",function(a,b,c){return bb(this.cells(a,b,c))});p("cell().data()",
|
||||
function(a){var b=this.context,c=this[0];if(a===k)return b.length&&c.length?B(b[0],c[0].row,c[0].column):k;jb(b[0],c[0].row,c[0].column,a);da(b[0],c[0].row,"data",c[0].column);return this});p("order()",function(a,b){var c=this.context;if(a===k)return 0!==c.length?c[0].aaSorting:k;"number"===typeof a?a=[[a,b]]:g.isArray(a[0])||(a=Array.prototype.slice.call(arguments));return this.iterator("table",function(b){b.aaSorting=a.slice()})});p("order.listener()",function(a,b,c){return this.iterator("table",
|
||||
function(d){Oa(d,a,b,c)})});p("order.fixed()",function(a){if(!a){var b=this.context,b=b.length?b[0].aaSortingFixed:k;return g.isArray(b)?{pre:b}:b}return this.iterator("table",function(b){b.aaSortingFixed=g.extend(!0,{},a)})});p(["columns().order()","column().order()"],function(a){var b=this;return this.iterator("table",function(c,d){var e=[];g.each(b[d],function(b,c){e.push([c,a])});c.aaSorting=e})});p("search()",function(a,b,c,d){var e=this.context;return a===k?0!==e.length?e[0].oPreviousSearch.sSearch:
|
||||
|
Loading…
x
Reference in New Issue
Block a user