.reloadData() and saveState not working... #266

l-lin · Apr 2, 2015 · ac18c84 · ac18c84
1 parent 5cd0d07
commit ac18c84
Show file tree

Hide file tree

Showing 23 changed files with 37 additions and 29 deletions.
diff --git a/demo/advanced/dataReloadWithAjax.html b/demo/advanced/dataReloadWithAjax.html
@@ -54,7 +54,9 @@ <h1><i class="fa fa-play"></i>&nbsp;Load/Reload the table data from an Ajax sour
 
 function DataReloadWithAjaxCtrl(DTOptionsBuilder, DTColumnBuilder, DTInstances) {
     var vm = this;
-    vm.dtOptions = DTOptionsBuilder.fromSource('data.json').withPaginationType('full_numbers');
+    vm.dtOptions = DTOptionsBuilder.fromSource('data.json')
+        .withOption('stateSave', true)
+        .withPaginationType('full_numbers');
     vm.dtColumns = [
         DTColumnBuilder.newColumn('id').withTitle('ID'),
         DTColumnBuilder.newColumn('firstName').withTitle('First name'),

diff --git a/demo/advanced/dataReloadWithAjax.js b/demo/advanced/dataReloadWithAjax.js
@@ -4,7 +4,9 @@ angular.module('showcase.dataReload.withAjax', ['datatables'])
 
 function DataReloadWithAjaxCtrl(DTOptionsBuilder, DTColumnBuilder, DTInstances) {
     var vm = this;
-    vm.dtOptions = DTOptionsBuilder.fromSource('data.json').withPaginationType('full_numbers');
+    vm.dtOptions = DTOptionsBuilder.fromSource('data.json')
+        .withOption('stateSave', true)
+        .withPaginationType('full_numbers');
     vm.dtColumns = [
         DTColumnBuilder.newColumn('id').withTitle('ID'),
         DTColumnBuilder.newColumn('firstName').withTitle('First name'),

diff --git a/dist/angular-datatables.js b/dist/angular-datatables.js
@@ -1,5 +1,5 @@
 /*!
- * angular-datatables - v0.4.2
+ * angular-datatables - v0.4.3
  * https://github.com/l-lin/angular-datatables
  * License: MIT
  */
@@ -1093,14 +1093,16 @@ function dtAjaxRenderer($q, $timeout, DTRenderer, DTRendererService, DT_DEFAULT_
 
         function reloadData() {
             if (_oTable) {
-                var ajaxUrl = renderer.options.ajax.url ||  renderer.options.ajax;
-                _oTable.ajax.url(ajaxUrl).load();
+                _oTable.ajax.reload(null, false);
             }
         }
 
         function changeData(ajax) {
             renderer.options.ajax = ajax;
-            renderer.reloadData();
+            if (_oTable) {
+                var ajaxUrl = renderer.options.ajax.url ||  renderer.options.ajax;
+                _oTable.ajax.url(ajaxUrl).load();
+            }
         }
 
         function rerender() {

diff --git a/dist/angular-datatables.min.js b/dist/angular-datatables.min.js
diff --git a/dist/plugins/bootstrap/angular-datatables.bootstrap.js b/dist/plugins/bootstrap/angular-datatables.bootstrap.js
@@ -1,5 +1,5 @@
 /*!
- * angular-datatables - v0.4.2
+ * angular-datatables - v0.4.3
  * https://github.com/l-lin/angular-datatables
  * License: MIT
  */

diff --git a/dist/plugins/bootstrap/angular-datatables.bootstrap.min.js b/dist/plugins/bootstrap/angular-datatables.bootstrap.min.js
diff --git a/dist/plugins/bootstrap/datatables.bootstrap.css b/dist/plugins/bootstrap/datatables.bootstrap.css
@@ -1,5 +1,5 @@
 /*!
- * angular-datatables - v0.4.2
+ * angular-datatables - v0.4.3
  * https://github.com/l-lin/angular-datatables
  * License: MIT
  */

diff --git a/dist/plugins/bootstrap/datatables.bootstrap.min.css b/dist/plugins/bootstrap/datatables.bootstrap.min.css
diff --git a/dist/plugins/colreorder/angular-datatables.colreorder.js b/dist/plugins/colreorder/angular-datatables.colreorder.js
@@ -1,5 +1,5 @@
 /*!
- * angular-datatables - v0.4.2
+ * angular-datatables - v0.4.3
  * https://github.com/l-lin/angular-datatables
  * License: MIT
  */

diff --git a/dist/plugins/colreorder/angular-datatables.colreorder.min.js b/dist/plugins/colreorder/angular-datatables.colreorder.min.js
diff --git a/dist/plugins/columnfilter/angular-datatables.columnfilter.js b/dist/plugins/columnfilter/angular-datatables.columnfilter.js
@@ -1,5 +1,5 @@
 /*!
- * angular-datatables - v0.4.2
+ * angular-datatables - v0.4.3
  * https://github.com/l-lin/angular-datatables
  * License: MIT
  */

diff --git a/dist/plugins/columnfilter/angular-datatables.columnfilter.min.js b/dist/plugins/columnfilter/angular-datatables.columnfilter.min.js
diff --git a/dist/plugins/colvis/angular-datatables.colvis.js b/dist/plugins/colvis/angular-datatables.colvis.js
@@ -1,5 +1,5 @@
 /*!
- * angular-datatables - v0.4.2
+ * angular-datatables - v0.4.3
  * https://github.com/l-lin/angular-datatables
  * License: MIT
  */

diff --git a/dist/plugins/colvis/angular-datatables.colvis.min.js b/dist/plugins/colvis/angular-datatables.colvis.min.js
diff --git a/dist/plugins/fixedcolumns/angular-datatables.fixedcolumns.js b/dist/plugins/fixedcolumns/angular-datatables.fixedcolumns.js
@@ -1,5 +1,5 @@
 /*!
- * angular-datatables - v0.4.2
+ * angular-datatables - v0.4.3
  * https://github.com/l-lin/angular-datatables
  * License: MIT
  */

diff --git a/dist/plugins/fixedcolumns/angular-datatables.fixedcolumns.min.js b/dist/plugins/fixedcolumns/angular-datatables.fixedcolumns.min.js
diff --git a/dist/plugins/fixedheader/angular-datatables.fixedheader.js b/dist/plugins/fixedheader/angular-datatables.fixedheader.js
@@ -1,5 +1,5 @@
 /*!
- * angular-datatables - v0.4.2
+ * angular-datatables - v0.4.3
  * https://github.com/l-lin/angular-datatables
  * License: MIT
  */

diff --git a/dist/plugins/fixedheader/angular-datatables.fixedheader.min.js b/dist/plugins/fixedheader/angular-datatables.fixedheader.min.js
diff --git a/dist/plugins/scroller/angular-datatables.scroller.js b/dist/plugins/scroller/angular-datatables.scroller.js
@@ -1,5 +1,5 @@
 /*!
- * angular-datatables - v0.4.2
+ * angular-datatables - v0.4.3
  * https://github.com/l-lin/angular-datatables
  * License: MIT
  */

diff --git a/dist/plugins/scroller/angular-datatables.scroller.min.js b/dist/plugins/scroller/angular-datatables.scroller.min.js
diff --git a/dist/plugins/tabletools/angular-datatables.tabletools.js b/dist/plugins/tabletools/angular-datatables.tabletools.js
@@ -1,5 +1,5 @@
 /*!
- * angular-datatables - v0.4.2
+ * angular-datatables - v0.4.3
  * https://github.com/l-lin/angular-datatables
  * License: MIT
  */

diff --git a/dist/plugins/tabletools/angular-datatables.tabletools.min.js b/dist/plugins/tabletools/angular-datatables.tabletools.min.js
diff --git a/src/angular-datatables.renderer.js b/src/angular-datatables.renderer.js
@@ -393,14 +393,16 @@ function dtAjaxRenderer($q, $timeout, DTRenderer, DTRendererService, DT_DEFAULT_
 
         function reloadData() {
             if (_oTable) {
-                var ajaxUrl = renderer.options.ajax.url ||  renderer.options.ajax;
-                _oTable.ajax.url(ajaxUrl).load();
+                _oTable.ajax.reload(null, false);
             }
         }
 
         function changeData(ajax) {
             renderer.options.ajax = ajax;
-            renderer.reloadData();
+            if (_oTable) {
+                var ajaxUrl = renderer.options.ajax.url ||  renderer.options.ajax;
+                _oTable.ajax.url(ajaxUrl).load();
+            }
         }
 
         function rerender() {