'; //dialog div
//r+= '
'; //reset button and its div
r += divRowDef;
- var storedValues = oTable.fnSettings().aoPreSearchCols[i].sSearch;
-
- var previousValues = storedValues ? storedValues.split("|") : [];
for (j = 0; j < iLen; j++) {
//if last check close div
@@ -446,13 +509,20 @@
r += divClose + divRowDef;
}
- var checked = $.inArray("^" + aData[j] + "$", previousValues) > -1;
+ var sLabel = aData[j];
+ var sValue = aData[j];
+
+ if (typeof (aData[j]) == 'object') {
+ sLabel = aData[j].label;
+ sValue = aData[j].value;
+ }
+
//check button
- r += '
' + aData[j] + '
';
+ r += '
' + sLabel + '
';
var checkbox = $(r);
th.html(checkbox);
- th.wrapInner('
');
+ th.wrapInner('
');
//on every checkbox selection
checkbox.change(function () {
@@ -474,6 +544,13 @@
});
+
+ if (search != "") {
+ $('input:checkbox[name="' + localLabel + '"]').removeClass("search_init");
+ } else {
+ $('input:checkbox[name="' + localLabel + '"]').addClass("search_init");
+ }
+ /* Old code for setting search_init CSS class on checkboxes if any of them is checked
for (var jj = 0; jj < iLen; jj++) {
if (search != "") {
$('#' + aData[jj]).removeClass("search_init");
@@ -481,6 +558,7 @@
$('#' + aData[jj]).addClass("search_init");
}
}
+ */
//execute search
oTable.fnFilter(search, index, true, false);
@@ -495,7 +573,7 @@
//height: 140,
autoOpen: false,
//show: "blind",
- //hide: "blind",
+ hide: "blind",
buttons: [{
text: "Reset",
click: function () {
@@ -513,7 +591,7 @@
text: "Close",
click: function () { $(this).dialog("close"); }
}
- ]
+ ]
});
@@ -521,8 +599,7 @@
$('#' + checkToggleDiv).dialog('open');
var target = $(this);
- $('#' + checkToggleDiv).dialog("widget").position({
- my: 'top',
+ $('#' + checkToggleDiv).dialog("widget").position({ my: 'top',
at: 'bottom',
of: target
});
@@ -534,8 +611,7 @@
fnOnFiltered = function () {
var target = $('#' + buttonId);
- $('#' + checkToggleDiv).dialog("widget").position({
- my: 'top',
+ $('#' + checkToggleDiv).dialog("widget").position({ my: 'top',
at: 'bottom',
of: target
});
@@ -573,57 +649,76 @@
- oTable = this;
+ var oTable = this;
var defaults = {
sPlaceHolder: "foot",
sRangeSeparator: "~",
iFilteringDelay: 500,
aoColumns: null,
- sRangeFormat: "From {from} to {to}"
+ sRangeFormat: "From {from} to {to}",
+ sDateFromToken: "from",
+ sDateToToken: "to"
};
- properties = $.extend(defaults, options);
+ var properties = $.extend(defaults, options);
return this.each(function () {
if (!oTable.fnSettings().oFeatures.bFilter)
return;
+ asInitVals = new Array();
+ var aoFilterCells = oTable.fnSettings().aoFooter[0];
+
+ var oHost = oTable.fnSettings().nTFoot; //Before fix for ColVis
+ var sFilterRow = "tr"; //Before fix for ColVis
- asInitVals = new Array();
- var sFilterRow = "tfoot tr";
if (properties.sPlaceHolder == "head:after") {
- var tr = $("thead tr:last", oTable).detach();
+ var tr = $("tr:first", oTable.fnSettings().nTHead).detach();
+ //tr.appendTo($(oTable.fnSettings().nTHead));
if (oTable.fnSettings().bSortCellsTop) {
- tr.appendTo($("thead", oTable));
+ tr.prependTo($(oTable.fnSettings().nTHead));
+ //tr.appendTo($("thead", oTable));
+ aoFilterCells = oTable.fnSettings().aoHeader[1];
}
else {
- tr.prependTo($("thead", oTable));
+ tr.appendTo($(oTable.fnSettings().nTHead));
+ //tr.prependTo($("thead", oTable));
+ aoFilterCells = oTable.fnSettings().aoHeader[0];
}
- sFilterRow = "thead tr:last";
+
+ sFilterRow = "tr:last";
+ oHost = oTable.fnSettings().nTHead;
+
} else if (properties.sPlaceHolder == "head:before") {
- var tr = $("thead tr:first", oTable).detach();
- //tr.attr("id", 1);
+
if (oTable.fnSettings().bSortCellsTop) {
- tr.appendTo($("thead", oTable));
- }
- else {
- tr.prependTo($("thead", oTable));
+ var tr = $("tr:first", oTable.fnSettings().nTHead).detach();
+ tr.appendTo($(oTable.fnSettings().nTHead));
+ aoFilterCells = oTable.fnSettings().aoHeader[1];
+ } else {
+ aoFilterCells = oTable.fnSettings().aoHeader[0];
}
- sFilterRow = "thead tr:first";
- }
- var tableColumnDefs = oTable.fnSettings().aoColumns;
- var row = $(sFilterRow + " th", oTable);
- var thIndex = -1;
- $(tableColumnDefs).each(function (index) {
- i = index;
+ /*else {
+ //tr.prependTo($("thead", oTable));
+ sFilterRow = "tr:first";
+ }*/
+
+ sFilterRow = "tr:first";
+ oHost = oTable.fnSettings().nTHead;
- var aoColumn = {
- type: "text",
+
+ }
+
+ //$(sFilterRow + " th", oHost).each(function (index) {//bug with ColVis
+ $(aoFilterCells).each(function (index) {//fix for ColVis
+ i = index;
+ var aoColumn = { type: "text",
bRegex: false,
bSmart: true,
+ iMaxLenght: -1,
iFilterLength: 0
};
if (properties.aoColumns != null) {
@@ -631,29 +726,33 @@
return;
aoColumn = properties.aoColumns[i];
}
-
-
- if (this.bVisible) {
- thIndex++;
- } else {
- if (aoColumn.sSelector == null) return; //if hidden column and sSelector is empty
+ //label = $(this).text(); //Before fix for ColVis
+ label = $($(this)[0].cell).text(); //Fix for ColVis
+ if (aoColumn.sSelector == null) {
+ //th = $($(this)[0]);//Before fix for ColVis
+ th = $($(this)[0].cell); //Fix for ColVis
}
- th = $(row[thIndex]);
- if (aoColumn.sSelector != null) {
+ else {
th = $(aoColumn.sSelector);
+ if (th.length == 0)
+ th = $($(this)[0].cell);
}
- label = th.text(); //"Search by " + $(this).text();
-
if (aoColumn != null) {
- sRangeFormat = aoColumn.sRangeFormat != null ? aoColumn.sRangeFormat : properties.sRangeFormat;
-
+ if (aoColumn.sRangeFormat != null)
+ sRangeFormat = aoColumn.sRangeFormat;
+ else
+ sRangeFormat = properties.sRangeFormat;
switch (aoColumn.type) {
+ case "null":
+ break;
case "number":
- fnCreateInput(oTable, true, false, true, aoColumn.iFilterLength);
+ fnCreateInput(oTable, true, false, true, aoColumn.iFilterLength, aoColumn.iMaxLenght);
break;
case "select":
- fnCreateSelect(oTable, aoColumn.values);
+ if (aoColumn.bRegex != true)
+ aoColumn.bRegex = false;
+ fnCreateSelect(oTable, aoColumn.values, aoColumn.bRegex, aoColumn.selected, aoColumn.multiple);
break;
case "number-range":
fnCreateRangeInput(oTable);
@@ -663,24 +762,28 @@
break;
case "checkbox":
fnCreateCheckbox(oTable, aoColumn.values);
+ break;
+ case "twitter-dropdown":
+ case "dropdown":
+ fnCreateDropdown(aoColumn.values);
break;
case "text":
default:
bRegex = (aoColumn.bRegex == null ? false : aoColumn.bRegex);
bSmart = (aoColumn.bSmart == null ? false : aoColumn.bSmart);
- fnCreateInput(oTable, bRegex, bSmart, false, aoColumn.iFilterLength);
+ fnCreateInput(oTable, bRegex, bSmart, false, aoColumn.iFilterLength, aoColumn.iMaxLenght);
break;
+
}
}
-
});
-
+
for (j = 0; j < aiCustomSearch_Indexes.length; j++) {
//var index = aiCustomSearch_Indexes[j];
var fnSearch_ = function () {
var id = oTable.attr("id");
return $("#" + id + "_range_from_" + aiCustomSearch_Indexes[j]).val() + properties.sRangeSeparator + $("#" + id + "_range_to_" + aiCustomSearch_Indexes[j]).val()
- };
+ }
afnSearch_.push(fnSearch_);
}
@@ -694,11 +797,8 @@
var index = aiCustomSearch_Indexes[j];
for (k = 0; k < aoData.length; k++) {
- if (aoData[k].name == "sSearch_" + index) {
+ if (aoData[k].name == "sSearch_" + index)
aoData[k].value = afnSearch_[j]();
- // Added this line to force the value in
- oTable.fnSettings().aoPreSearchCols[index].sSearch = aoData[k].value;
- }
}
}
aoData.push({ "name": "sRangeSeparator", "value": properties.sRangeSeparator });
@@ -715,24 +815,6 @@
fnCallback(json)
});
}
-
- /*
- if (fnServerDataOriginal != null) {
- if (properties.iDelay != 0) {
- if (oFunctionTimeout != null)
- window.clearTimeout(oFunctionTimeout);
- oFunctionTimeout = window.setTimeout(function () {
- fnServerDataOriginal(sSource, aoData, fnCallback);
- }, properties.iDelay);
- } else {
- fnServerDataOriginal(sSource, aoData, fnCallback);
- }
- }
- else
- $.getJSON(sSource, aoData, function (json) {
- fnCallback(json)
- });
- */
};
}
diff --git a/Mvc.JQuery.Datatables/DataTableConfigVm.cs b/Mvc.JQuery.Datatables/DataTableConfigVm.cs
index 950911b..fe92947 100644
--- a/Mvc.JQuery.Datatables/DataTableConfigVm.cs
+++ b/Mvc.JQuery.Datatables/DataTableConfigVm.cs
@@ -27,7 +27,11 @@ public FilterDef(Type t)
private void SetDefaultValuesAccordingToColumnType(Type t)
{
- if (DateTypes.Contains(t))
+ if (t==null)
+ {
+ type = "null";
+ }
+ else if (DateTypes.Contains(t))
{
type = "date-range";
}
@@ -299,9 +303,10 @@ public ColumnFilterSettingsVm(DataTableConfigVm vm)
public override string ToString()
{
+ var noColumnFilter = new FilterDef(null);
this["aoColumns"] = _vm.Columns
//.Where(c => c.Visible || c.Filter["sSelector"] != null)
- .Select(c => c.Filter).ToArray();
+ .Select(c => c.Searchable?c.Filter:noColumnFilter).ToArray();
return new JavaScriptSerializer().Serialize(this);
}
}