Skip to content

Commit 4f83f5c

Browse files
committed
Removed non-performant wait for jquery
1 parent ee442bb commit 4f83f5c

File tree

1 file changed

+27
-33
lines changed

1 file changed

+27
-33
lines changed

Mvc.JQuery.Datatables.Templates/Views/Shared/DataTable.cshtml

+27-33
Original file line numberDiff line numberDiff line change
@@ -31,41 +31,35 @@
3131
</table>
3232
<script type="text/javascript">
3333
(function setDataTable() {
34-
if(!window.jQuery) {
35-
setTimeout(setDataTable, 20);
36-
return;
37-
}
38-
$(document).ready(function() {
39-
var $table = $('#@Model.Id');
40-
var dt = $table.dataTable({
41-
"bProcessing": true,
42-
"bStateSave": true,
43-
"bServerSide": true,
44-
"bFilter": @Model.ShowSearch.ToString().ToLower(),
45-
"sDom": '@Html.Raw(Model.Dom)',
46-
"aLengthMenu": [[5, 10, 25, 50, -1], [5, 10, 25, 50, "All"]],
47-
"bAutoWidth": @Model.AutoWidth.ToString().ToLowerInvariant(),
48-
"sAjaxSource": "@Html.Raw(Model.AjaxUrl)", @Html.Raw(Model.TableTools ? "\"oTableTools\" : { \"sSwfPath\": \"/content/DataTables/extras/TableTools/media/swf/copy_csv_xls_pdf.swf\" }," : "")
49-
"fnServerData": function(sSource, aoData, fnCallback) {
50-
$.ajax({
51-
"dataType": 'json',
52-
"type": "POST",
53-
"url": sSource,
54-
"data": aoData,
55-
"success": fnCallback
56-
});
57-
}
58-
@Html.Raw(!string.IsNullOrWhiteSpace(Model.JsOptionsString) ? ", " + Model.JsOptionsString : "")
59-
});
60-
@if (Model.ColumnFilter)
61-
{
62-
<text>
63-
dt.columnFilter({
64-
sPlaceHolder: "head:before",
65-
aoColumns: [@Html.Raw(Model.ColumnFiltersString)]
34+
var $table = $('#@Model.Id');
35+
var dt = $table.dataTable({
36+
"bProcessing": true,
37+
"bStateSave": true,
38+
"bServerSide": true,
39+
"bFilter": @Model.ShowSearch.ToString().ToLower(),
40+
"sDom": '@Html.Raw(Model.Dom)',
41+
"aLengthMenu": [[5, 10, 25, 50, -1], [5, 10, 25, 50, "All"]],
42+
"bAutoWidth": @Model.AutoWidth.ToString().ToLowerInvariant(),
43+
"sAjaxSource": "@Html.Raw(Model.AjaxUrl)", @Html.Raw(Model.TableTools ? "\"oTableTools\" : { \"sSwfPath\": \"/content/DataTables/extras/TableTools/media/swf/copy_csv_xls_pdf.swf\" }," : "")
44+
"fnServerData": function(sSource, aoData, fnCallback) {
45+
$.ajax({
46+
"dataType": 'json',
47+
"type": "POST",
48+
"url": sSource,
49+
"data": aoData,
50+
"success": fnCallback
6651
});
67-
</text>
6852
}
53+
@Html.Raw(!string.IsNullOrWhiteSpace(Model.JsOptionsString) ? ", " + Model.JsOptionsString : "")
6954
});
55+
@if (Model.ColumnFilter)
56+
{
57+
<text>
58+
dt.columnFilter({
59+
sPlaceHolder: "head:before",
60+
aoColumns: [@Html.Raw(Model.ColumnFiltersString)]
61+
});
62+
</text>
63+
}
7064
})();
7165
</script>

0 commit comments

Comments
 (0)