Throw error if using serverSide not with Ajax renderer

l-lin · Sep 3, 2015 · 5488f98 · 5488f98
1 parent cfaaef8
commit 5488f98
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/dist/angular-datatables.js b/dist/angular-datatables.js
@@ -1132,10 +1132,16 @@ function dtRendererFactory(DTDefaultRenderer, DTNGRenderer, DTPromiseRenderer, D
 
     function fromOptions(options, isNgDisplay)  {
         if (isNgDisplay) {
+            if (options.serverSide) {
+                throw new Error('You cannot use server side processing along with the Angular renderer!');
+            }
             return DTNGRenderer.create(options);
         }
         if (angular.isDefined(options)) {
             if (angular.isDefined(options.fnPromise) && options.fnPromise !== null) {
+                if (options.serverSide) {
+                    throw new Error('You cannot use server side processing along with the Promise renderer!');
+                }
                 return DTPromiseRenderer.create(options);
             }
             if (angular.isDefined(options.ajax) && options.ajax !== null ||