Merge pull request #313 from koss-lebedev/master

Add support for dataTables.defaults in conditionalPaging plugin
8 years ago · e5763ea110
parent 9cfad60781 a4b72c315e
commit e5763ea110
1 changed files with 2 additions and 2 deletions
--- a/features/conditionalPaging/dataTables.conditionalPaging.js
+++ b/features/conditionalPaging/dataTables.conditionalPaging.js
@ -32,7 +32,7 @@
            return;
        }

-        var options = dtSettings.oInit.conditionalPaging;
+        var options = dtSettings.oInit.conditionalPaging || $.fn.dataTable.defaults.conditionalPaging;

        if ($.isPlainObject(options) || options === true) {
            var config = $.isPlainObject(options) ? options : {},