Merge pull request mcintyre321#80 from interestincode/patch-1

mcintyre321 · mcintyre321 · commit 7ddf439a0c63 · 2014-04-15T12:32:50.000+01:00
Wait for dataTables script to load
diff --git a/Mvc.JQuery.Datatables.Templates/Views/Shared/DataTable.cshtml b/Mvc.JQuery.Datatables.Templates/Views/Shared/DataTable.cshtml
@@ -33,7 +33,7 @@
 
 <script type="text/javascript">
     (function setDataTable() {
-        if(!window.jQuery) {
+        if(!window.jQuery || !$.fn.DataTable) {
             setTimeout(setDataTable, 100);
             return;
         }

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@`
`33`	`33`
`34`	`34`	`<script type="text/javascript">`
`35`	`35`	`(function setDataTable() {`
`36`		`- if(!window.jQuery) {`
	`36`	`+ if(!window.jQuery \|\| !$.fn.DataTable) {`
`37`	`37`	`setTimeout(setDataTable, 100);`
`38`	`38`	`return;`
`39`	`39`	`}`