-changed windows line endings to unix
This commit is contained in:
parent
4d15dd2900
commit
fe0b6cd32b
|
@ -1,4 +1,4 @@
|
||||||
/*
|
/*
|
||||||
* File: jquery.dataTables.columnFilter.js
|
* File: jquery.dataTables.columnFilter.js
|
||||||
* Version: 1.4.8.
|
* Version: 1.4.8.
|
||||||
* Author: Jovan Popovic
|
* Author: Jovan Popovic
|
||||||
|
@ -147,7 +147,7 @@
|
||||||
var iCurrentFilterLength = this.value.length;
|
var iCurrentFilterLength = this.value.length;
|
||||||
if (Math.abs(iCurrentFilterLength - iLastFilterLength) < iFilterLength
|
if (Math.abs(iCurrentFilterLength - iLastFilterLength) < iFilterLength
|
||||||
//&& currentFilter.length == 0 //Why this?
|
//&& currentFilter.length == 0 //Why this?
|
||||||
) {
|
) {
|
||||||
//Cancel the filtering
|
//Cancel the filtering
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -180,7 +180,7 @@
|
||||||
|
|
||||||
function fnCreateRangeInput(oTable) {
|
function fnCreateRangeInput(oTable) {
|
||||||
|
|
||||||
//var currentFilter = oTable.fnSettings().aoPreSearchCols[i].sSearch;
|
//var currentFilter = oTable.fnSettings().aoPreSearchCols[i].sSearch;
|
||||||
th.html(_fnRangeLabelPart(0));
|
th.html(_fnRangeLabelPart(0));
|
||||||
var sFromId = oTable.attr("id") + '_range_from_' + i;
|
var sFromId = oTable.attr("id") + '_range_from_' + i;
|
||||||
var from = $('<input type="text" class="number_range_filter" id="' + sFromId + '" rel="' + i + '"/>');
|
var from = $('<input type="text" class="number_range_filter" id="' + sFromId + '" rel="' + i + '"/>');
|
||||||
|
@ -199,34 +199,34 @@
|
||||||
//------------start range filtering function
|
//------------start range filtering function
|
||||||
|
|
||||||
|
|
||||||
/* Custom filtering function which will filter data in column four between two values
|
/* Custom filtering function which will filter data in column four between two values
|
||||||
* Author: Allan Jardine, Modified by Jovan Popovic
|
* Author: Allan Jardine, Modified by Jovan Popovic
|
||||||
*/
|
*/
|
||||||
//$.fn.dataTableExt.afnFiltering.push(
|
//$.fn.dataTableExt.afnFiltering.push(
|
||||||
oTable.dataTableExt.afnFiltering.push(
|
oTable.dataTableExt.afnFiltering.push(
|
||||||
function (oSettings, aData, iDataIndex) {
|
function (oSettings, aData, iDataIndex) {
|
||||||
if (oTable.attr("id") != oSettings.sTableId)
|
if (oTable.attr("id") != oSettings.sTableId)
|
||||||
return true;
|
return true;
|
||||||
// Try to handle missing nodes more gracefully
|
// Try to handle missing nodes more gracefully
|
||||||
if (document.getElementById(sFromId) == null)
|
if (document.getElementById(sFromId) == null)
|
||||||
return true;
|
return true;
|
||||||
var iMin = document.getElementById(sFromId).value * 1;
|
var iMin = document.getElementById(sFromId).value * 1;
|
||||||
var iMax = document.getElementById(sToId).value * 1;
|
var iMax = document.getElementById(sToId).value * 1;
|
||||||
var iValue = aData[_fnColumnIndex(index)] == "-" ? 0 : aData[_fnColumnIndex(index)] * 1;
|
var iValue = aData[_fnColumnIndex(index)] == "-" ? 0 : aData[_fnColumnIndex(index)] * 1;
|
||||||
if (iMin == "" && iMax == "") {
|
if (iMin == "" && iMax == "") {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
else if (iMin == "" && iValue <= iMax) {
|
else if (iMin == "" && iValue <= iMax) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
else if (iMin <= iValue && "" == iMax) {
|
else if (iMin <= iValue && "" == iMax) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
else if (iMin <= iValue && iValue <= iMax) {
|
else if (iMin <= iValue && iValue <= iMax) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
//------------end range filtering function
|
//------------end range filtering function
|
||||||
|
|
||||||
|
@ -270,41 +270,41 @@
|
||||||
|
|
||||||
//$.fn.dataTableExt.afnFiltering.push(
|
//$.fn.dataTableExt.afnFiltering.push(
|
||||||
oTable.dataTableExt.afnFiltering.push(
|
oTable.dataTableExt.afnFiltering.push(
|
||||||
function (oSettings, aData, iDataIndex) {
|
function (oSettings, aData, iDataIndex) {
|
||||||
if (oTable.attr("id") != oSettings.sTableId)
|
if (oTable.attr("id") != oSettings.sTableId)
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
var dStartDate = from.datepicker("getDate");
|
var dStartDate = from.datepicker("getDate");
|
||||||
|
|
||||||
var dEndDate = to.datepicker("getDate");
|
var dEndDate = to.datepicker("getDate");
|
||||||
|
|
||||||
if (dStartDate == null && dEndDate == null) {
|
if (dStartDate == null && dEndDate == null) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
var dCellDate = null;
|
var dCellDate = null;
|
||||||
try {
|
try {
|
||||||
if (aData[_fnColumnIndex(index)] == null || aData[_fnColumnIndex(index)] == "")
|
if (aData[_fnColumnIndex(index)] == null || aData[_fnColumnIndex(index)] == "")
|
||||||
return false;
|
return false;
|
||||||
dCellDate = $.datepicker.parseDate($.datepicker.regional[""].dateFormat, aData[_fnColumnIndex(index)]);
|
dCellDate = $.datepicker.parseDate($.datepicker.regional[""].dateFormat, aData[_fnColumnIndex(index)]);
|
||||||
} catch (ex) {
|
} catch (ex) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (dCellDate == null)
|
if (dCellDate == null)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
|
|
||||||
if (dStartDate == null && dCellDate <= dEndDate) {
|
if (dStartDate == null && dCellDate <= dEndDate) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
else if (dStartDate <= dCellDate && dEndDate == null) {
|
else if (dStartDate <= dCellDate && dEndDate == null) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
else if (dStartDate <= dCellDate && dCellDate <= dEndDate) {
|
else if (dStartDate <= dCellDate && dCellDate <= dEndDate) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
//------------end date range filtering function
|
//------------end date range filtering function
|
||||||
|
|
||||||
|
@ -430,8 +430,8 @@
|
||||||
var checkToggleDiv = uniqueId + "-flt-toggle";
|
var checkToggleDiv = uniqueId + "-flt-toggle";
|
||||||
r += '<button id="' + buttonId + '" class="checkbox_filter" > ' + labelBtn + '</button>'; //filter button witch open dialog
|
r += '<button id="' + buttonId + '" class="checkbox_filter" > ' + labelBtn + '</button>'; //filter button witch open dialog
|
||||||
r += '<div id="' + checkToggleDiv + '" '
|
r += '<div id="' + checkToggleDiv + '" '
|
||||||
+ 'title="' + label + '" '
|
+ 'title="' + label + '" '
|
||||||
+ 'class="toggle-check ui-widget-content ui-corner-all" style="width: ' + (divWidthToggle) + '%; " >'; //dialog div
|
+ 'class="toggle-check ui-widget-content ui-corner-all" style="width: ' + (divWidthToggle) + '%; " >'; //dialog div
|
||||||
//r+= '<div align="center" style="margin-top: 5px; "> <button id="'+buttonId+'Reset" class="checkbox_filter" > reset </button> </div>'; //reset button and its div
|
//r+= '<div align="center" style="margin-top: 5px; "> <button id="'+buttonId+'Reset" class="checkbox_filter" > reset </button> </div>'; //reset button and its div
|
||||||
r += divRowDef;
|
r += divRowDef;
|
||||||
|
|
||||||
|
@ -459,7 +459,7 @@
|
||||||
//search = search + ' ' + $(this).val();
|
//search = search + ' ' + $(this).val();
|
||||||
//concatenation for selected checks in or
|
//concatenation for selected checks in or
|
||||||
if ((index == 0 && resSize == 1)
|
if ((index == 0 && resSize == 1)
|
||||||
|| (index != 0 && index == resSize - 1)) {
|
|| (index != 0 && index == resSize - 1)) {
|
||||||
or = '';
|
or = '';
|
||||||
}
|
}
|
||||||
//trim
|
//trim
|
||||||
|
@ -504,11 +504,11 @@
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
text: "Close",
|
text: "Close",
|
||||||
click: function () { $(this).dialog("close"); }
|
click: function () { $(this).dialog("close"); }
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue