Fix angular-datatables for angular 1.6.1 #921

l-lin · Dec 27, 2016 · eb70a13 · eb70a13
1 parent ecde916
commit eb70a13
Show file tree

Hide file tree

Showing 30 changed files with 93 additions and 87 deletions.
diff --git a/dist/angular-datatables.js b/dist/angular-datatables.js
@@ -1,5 +1,5 @@
 /*!
- * angular-datatables - v0.5.6
+ * angular-datatables - v0.6.0
  * https://github.com/l-lin/angular-datatables
  * License: MIT
  */
@@ -14,7 +14,7 @@ if (typeof module !== "undefined" && typeof exports !== "undefined" && module.ex
         .directive('datatable', dataTable);
 
     /* @ngInject */
-    function dataTable($q, $http, DTRendererFactory, DTRendererService, DTPropertyUtil) {
+    function dataTable($q, $http, $log, DTRendererFactory, DTRendererService, DTPropertyUtil) {
         compileDirective.$inject = ['tElm'];
         ControllerDirective.$inject = ['$scope'];
         return {
@@ -93,8 +93,11 @@ if (typeof module !== "undefined" && typeof exports !== "undefined" && module.ex
                         // See https://github.com/l-lin/angular-datatables/issues/181
                         if (options.language && options.language.url) {
                             var languageDefer = $q.defer();
-                            $http.get(options.language.url).success(function(language) {
+                            var languageUrl = options.language.url;
+                            $http.get(options.language.url).then(function(language) {
                                 languageDefer.resolve(language);
+                            }, function() {
+                                $log.error('Could not fetch the content of the language from ' + languageUrl);
                             });
                             options.language = languageDefer.promise;
                         }
@@ -138,7 +141,7 @@ if (typeof module !== "undefined" && typeof exports !== "undefined" && module.ex
             }
         }
     }
-    dataTable.$inject = ['$q', '$http', 'DTRendererFactory', 'DTRendererService', 'DTPropertyUtil'];
+    dataTable.$inject = ['$q', '$http', '$log', 'DTRendererFactory', 'DTRendererService', 'DTPropertyUtil'];
 
     'use strict';
     angular.module('datatables.factory', [])
@@ -1161,27 +1164,27 @@ if (typeof module !== "undefined" && typeof exports !== "undefined" && module.ex
             }
 
             function _doRender(options, $elem) {
-                    var defer = $q.defer();
-                    // Destroy the table if it exists in order to be able to redraw the dataTable
-                    options.bDestroy = true;
-                    if (_oTable) {
-                        _oTable.destroy();
-                        DTRendererService.showLoading(_$elem, _$scope);
-                        // Empty in case of columns change
-                        $elem.empty();
-                    }
-                    DTRendererService.hideLoading($elem);
-                    // Condition to refresh the dataTable
-                    if (_shouldDeferRender(options)) {
-                        $timeout(function() {
-                            defer.resolve(DTRendererService.renderDataTable($elem, options));
-                        }, 0, false);
-                    } else {
+                var defer = $q.defer();
+                // Destroy the table if it exists in order to be able to redraw the dataTable
+                options.bDestroy = true;
+                if (_oTable) {
+                    _oTable.destroy();
+                    DTRendererService.showLoading(_$elem, _$scope);
+                    // Empty in case of columns change
+                    $elem.empty();
+                }
+                DTRendererService.hideLoading($elem);
+                // Condition to refresh the dataTable
+                if (_shouldDeferRender(options)) {
+                    $timeout(function() {
                         defer.resolve(DTRendererService.renderDataTable($elem, options));
-                    }
-                    return defer.promise;
+                    }, 0, false);
+                } else {
+                    defer.resolve(DTRendererService.renderDataTable($elem, options));
                 }
-                // See https://github.com/l-lin/angular-datatables/issues/147
+                return defer.promise;
+            }
+            // See https://github.com/l-lin/angular-datatables/issues/147
             function _shouldDeferRender(options) {
                 if (angular.isDefined(options) && angular.isDefined(options.dom)) {
                     // S for scroller plugin

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

diff --git a/dist/css/angular-datatables.min.css b/dist/css/angular-datatables.min.css
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.5.6
+ * angular-datatables - v0.6.0
  * https://github.com/l-lin/angular-datatables
  * License: MIT
  */
@@ -357,15 +357,15 @@ if (typeof module !== "undefined" && typeof exports !== "undefined" && module.ex
         }
 
         function _setDom(options) {
-                if (!options.dom || options.dom === $.fn.dataTable.defaults.sDom) {
-                    return DTBootstrapDefaultOptions.getOptions().dom;
-                }
-                return options.dom;
+            if (!options.dom || options.dom === $.fn.dataTable.defaults.sDom) {
+                return DTBootstrapDefaultOptions.getOptions().dom;
             }
-            /**
-             * Integrate Bootstrap
-             * @param options the datatables options
-             */
+            return options.dom;
+        }
+        /**
+         * Integrate Bootstrap
+         * @param options the datatables options
+         */
         function integrate(options) {
             _init(options.bootstrap);
             DTBootstrapTableTools.integrate(options.bootstrap);

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.min.css b/dist/plugins/bootstrap/datatables.bootstrap.min.css
diff --git a/dist/plugins/buttons/angular-datatables.buttons.js b/dist/plugins/buttons/angular-datatables.buttons.js
@@ -1,5 +1,5 @@
 /*!
- * angular-datatables - v0.5.6
+ * angular-datatables - v0.6.0
  * https://github.com/l-lin/angular-datatables
  * License: MIT
  */

diff --git a/dist/plugins/buttons/angular-datatables.buttons.min.js b/dist/plugins/buttons/angular-datatables.buttons.min.js
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.5.6
+ * angular-datatables - v0.6.0
  * 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.5.6
+ * angular-datatables - v0.6.0
  * 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.5.6
+ * angular-datatables - v0.6.0
  * 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.5.6
+ * angular-datatables - v0.6.0
  * 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.5.6
+ * angular-datatables - v0.6.0
  * 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/light-columnfilter/angular-datatables.light-columnfilter.js b/dist/plugins/light-columnfilter/angular-datatables.light-columnfilter.js
@@ -1,5 +1,5 @@
 /*!
- * angular-datatables - v0.5.6
+ * angular-datatables - v0.6.0
  * https://github.com/l-lin/angular-datatables
  * License: MIT
  */

diff --git a/dist/plugins/light-columnfilter/angular-datatables.light-columnfilter.min.js b/dist/plugins/light-columnfilter/angular-datatables.light-columnfilter.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.5.6
+ * angular-datatables - v0.6.0
  * 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/select/angular-datatables.select.js b/dist/plugins/select/angular-datatables.select.js
@@ -1,5 +1,5 @@
 /*!
- * angular-datatables - v0.5.6
+ * angular-datatables - v0.6.0
  * https://github.com/l-lin/angular-datatables
  * License: MIT
  */

diff --git a/dist/plugins/select/angular-datatables.select.min.js b/dist/plugins/select/angular-datatables.select.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.5.6
+ * angular-datatables - v0.6.0
  * 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.directive.js b/src/angular-datatables.directive.js
@@ -4,7 +4,7 @@ angular.module('datatables.directive', ['datatables.instances', 'datatables.rend
     .directive('datatable', dataTable);
 
 /* @ngInject */
-function dataTable($q, $http, DTRendererFactory, DTRendererService, DTPropertyUtil) {
+function dataTable($q, $http, $log, DTRendererFactory, DTRendererService, DTPropertyUtil) {
     return {
         restrict: 'A',
         scope: {
@@ -81,8 +81,11 @@ function dataTable($q, $http, DTRendererFactory, DTRendererService, DTPropertyUt
                     // See https://github.com/l-lin/angular-datatables/issues/181
                     if (options.language && options.language.url) {
                         var languageDefer = $q.defer();
-                        $http.get(options.language.url).success(function(language) {
+                        var languageUrl = options.language.url;
+                        $http.get(options.language.url).then(function(language) {
                             languageDefer.resolve(language);
+                        }, function() {
+                            $log.error('Could not fetch the content of the language from ' + languageUrl);
                         });
                         options.language = languageDefer.promise;
                     }

diff --git a/src/angular-datatables.renderer.js b/src/angular-datatables.renderer.js
@@ -446,27 +446,27 @@ function dtAjaxRenderer($q, $timeout, DTRenderer, DTRendererService, DT_DEFAULT_
         }
 
         function _doRender(options, $elem) {
-                var defer = $q.defer();
-                // Destroy the table if it exists in order to be able to redraw the dataTable
-                options.bDestroy = true;
-                if (_oTable) {
-                    _oTable.destroy();
-                    DTRendererService.showLoading(_$elem, _$scope);
-                    // Empty in case of columns change
-                    $elem.empty();
-                }
-                DTRendererService.hideLoading($elem);
-                // Condition to refresh the dataTable
-                if (_shouldDeferRender(options)) {
-                    $timeout(function() {
-                        defer.resolve(DTRendererService.renderDataTable($elem, options));
-                    }, 0, false);
-                } else {
+            var defer = $q.defer();
+            // Destroy the table if it exists in order to be able to redraw the dataTable
+            options.bDestroy = true;
+            if (_oTable) {
+                _oTable.destroy();
+                DTRendererService.showLoading(_$elem, _$scope);
+                // Empty in case of columns change
+                $elem.empty();
+            }
+            DTRendererService.hideLoading($elem);
+            // Condition to refresh the dataTable
+            if (_shouldDeferRender(options)) {
+                $timeout(function() {
                     defer.resolve(DTRendererService.renderDataTable($elem, options));
-                }
-                return defer.promise;
+                }, 0, false);
+            } else {
+                defer.resolve(DTRendererService.renderDataTable($elem, options));
             }
-            // See https://github.com/l-lin/angular-datatables/issues/147
+            return defer.promise;
+        }
+        // See https://github.com/l-lin/angular-datatables/issues/147
         function _shouldDeferRender(options) {
             if (angular.isDefined(options) && angular.isDefined(options.dom)) {
                 // S for scroller plugin

diff --git a/src/plugins/bootstrap/angular-datatables.bootstrap.js b/src/plugins/bootstrap/angular-datatables.bootstrap.js
@@ -307,15 +307,15 @@ function dtBootstrap(DTBootstrapTableTools, DTBootstrapColVis, DTBootstrapDefaul
     }
 
     function _setDom(options) {
-            if (!options.dom || options.dom === $.fn.dataTable.defaults.sDom) {
-                return DTBootstrapDefaultOptions.getOptions().dom;
-            }
-            return options.dom;
+        if (!options.dom || options.dom === $.fn.dataTable.defaults.sDom) {
+            return DTBootstrapDefaultOptions.getOptions().dom;
         }
-        /**
-         * Integrate Bootstrap
-         * @param options the datatables options
-         */
+        return options.dom;
+    }
+    /**
+     * Integrate Bootstrap
+     * @param options the datatables options
+     */
     function integrate(options) {
         _init(options.bootstrap);
         DTBootstrapTableTools.integrate(options.bootstrap);