Lines 523-539
Link Here
|
523 |
var sFilterRow = "tr"; //Before fix for ColVis |
523 |
var sFilterRow = "tr"; //Before fix for ColVis |
524 |
|
524 |
|
525 |
if (properties.sPlaceHolder == "head:after") { |
525 |
if (properties.sPlaceHolder == "head:after") { |
526 |
var tr = $("tr:first", oTable.fnSettings().nTHead).detach(); |
526 |
|
527 |
//tr.appendTo($(oTable.fnSettings().nTHead)); |
527 |
if (!properties.bFiltersAlreadyActivated) { |
528 |
if (oTable.fnSettings().bSortCellsTop) { |
528 |
var tr = $("tr:first", oTable.fnSettings().nTHead).detach(); |
529 |
tr.prependTo($(oTable.fnSettings().nTHead)); |
529 |
//tr.appendTo($(oTable.fnSettings().nTHead)); |
530 |
//tr.appendTo($("thead", oTable)); |
530 |
if (oTable.fnSettings().bSortCellsTop) { |
531 |
aoFilterCells = oTable.fnSettings().aoHeader[1]; |
531 |
tr.prependTo($(oTable.fnSettings().nTHead)); |
532 |
} |
532 |
//tr.appendTo($("thead", oTable)); |
533 |
else { |
533 |
aoFilterCells = oTable.fnSettings().aoHeader[1]; |
534 |
tr.appendTo($(oTable.fnSettings().nTHead)); |
534 |
} |
535 |
//tr.prependTo($("thead", oTable)); |
535 |
else { |
536 |
aoFilterCells = oTable.fnSettings().aoHeader[0]; |
536 |
tr.appendTo($(oTable.fnSettings().nTHead)); |
|
|
537 |
//tr.prependTo($("thead", oTable)); |
538 |
aoFilterCells = oTable.fnSettings().aoHeader[0]; |
539 |
} |
537 |
} |
540 |
} |
538 |
|
541 |
|
539 |
sFilterRow = "tr:last"; |
542 |
sFilterRow = "tr:last"; |
Lines 541-567
Link Here
|
541 |
|
544 |
|
542 |
} else if (properties.sPlaceHolder == "head:before") { |
545 |
} else if (properties.sPlaceHolder == "head:before") { |
543 |
|
546 |
|
544 |
if (oTable.fnSettings().bSortCellsTop) { |
547 |
if (!properties.bFiltersAlreadyActivated) { |
545 |
var tr = $("tr:first", oTable.fnSettings().nTHead).detach(); |
548 |
if (oTable.fnSettings().bSortCellsTop) { |
546 |
tr.appendTo($(oTable.fnSettings().nTHead)); |
549 |
var tr = $("tr:first", oTable.fnSettings().nTHead).detach(); |
547 |
aoFilterCells = oTable.fnSettings().aoHeader[1]; |
550 |
tr.appendTo($(oTable.fnSettings().nTHead)); |
548 |
} else { |
551 |
aoFilterCells = oTable.fnSettings().aoHeader[1]; |
549 |
aoFilterCells = oTable.fnSettings().aoHeader[0]; |
552 |
} else { |
|
|
553 |
aoFilterCells = oTable.fnSettings().aoHeader[0]; |
554 |
} |
555 |
/*else { |
556 |
//tr.prependTo($("thead", oTable)); |
557 |
sFilterRow = "tr:first"; |
558 |
}*/ |
550 |
} |
559 |
} |
551 |
/*else { |
|
|
552 |
//tr.prependTo($("thead", oTable)); |
553 |
sFilterRow = "tr:first"; |
554 |
}*/ |
555 |
|
560 |
|
556 |
sFilterRow = "tr:first"; |
561 |
sFilterRow = "tr:first"; |
557 |
|
|
|
558 |
oHost = oTable.fnSettings().nTHead; |
562 |
oHost = oTable.fnSettings().nTHead; |
559 |
|
563 |
|
560 |
|
|
|
561 |
} |
564 |
} |
562 |
|
565 |
|
563 |
//$(sFilterRow + " th", oHost).each(function (index) {//bug with ColVis |
566 |
$(sFilterRow + " th", oHost).each(function (index) { |
564 |
$(aoFilterCells).each(function (index) {//fix for ColVis |
567 |
//$(aoFilterCells).each(function (index) {//fix for ColVis |
|
|
568 |
|
569 |
var bHeaderHasInput = $(this).find('input').length; |
570 |
|
565 |
i = index; |
571 |
i = index; |
566 |
var aoColumn = { type: "text", |
572 |
var aoColumn = { type: "text", |
567 |
bRegex: false, |
573 |
bRegex: false, |
Lines 569-584
Link Here
|
569 |
iMaxLenght: -1, |
575 |
iMaxLenght: -1, |
570 |
iFilterLength: 0 |
576 |
iFilterLength: 0 |
571 |
}; |
577 |
}; |
|
|
578 |
|
572 |
if (properties.aoColumns != null) { |
579 |
if (properties.aoColumns != null) { |
573 |
if (properties.aoColumns.length < i || properties.aoColumns[i] == null) |
580 |
if (properties.aoColumns.length < i || properties.aoColumns[i] == null) |
574 |
return; |
581 |
return; |
575 |
aoColumn = properties.aoColumns[i]; |
582 |
aoColumn = properties.aoColumns[i]; |
576 |
} |
583 |
} |
577 |
//label = $(this).text(); //Before fix for ColVis |
584 |
if (bHeaderHasInput) |
578 |
label = $($(this)[0].cell).text(); //Fix for ColVis |
585 |
label = $(this).find('input').val(); |
|
|
586 |
else |
587 |
label = $(this).text(); |
588 |
//label = $($(this)[0].cell).text(); //Fix for ColVis |
579 |
if (aoColumn.sSelector == null) { |
589 |
if (aoColumn.sSelector == null) { |
580 |
//th = $($(this)[0]);//Before fix for ColVis |
590 |
th = $($(this)[0]); |
581 |
th = $($(this)[0].cell); //Fix for ColVis |
591 |
//th = $($(this)[0].cell); //Fix for ColVis |
582 |
} |
592 |
} |
583 |
else { |
593 |
else { |
584 |
th = $(aoColumn.sSelector); |
594 |
th = $(aoColumn.sSelector); |