Skip to content

Commit eb70a13

Browse files
l-linl-lin
committed
Fix angular-datatables for angular 1.6.1 l-lin#921 
1 parent ecde916 commit eb70a13

30 files changed

+93
-87
lines changed

‎dist/angular-datatables.js

Lines changed: 26 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* angular-datatables - v0.5.6
2+
* angular-datatables - v0.6.0
33
* https://github.com/l-lin/angular-datatables
44
* License: MIT
55
*/
@@ -14,7 +14,7 @@ if (typeof module !== "undefined" && typeof exports !== "undefined" && module.ex
1414
.directive('datatable', dataTable);
1515

1616
/* @ngInject */
17-
function dataTable($q, $http, DTRendererFactory, DTRendererService, DTPropertyUtil) {
17+
function dataTable($q, $http, $log, DTRendererFactory, DTRendererService, DTPropertyUtil) {
1818
compileDirective.$inject = ['tElm'];
1919
ControllerDirective.$inject = ['$scope'];
2020
return {
@@ -93,8 +93,11 @@ if (typeof module !== "undefined" && typeof exports !== "undefined" && module.ex
9393
// See https://github.com/l-lin/angular-datatables/issues/181
9494
if (options.language && options.language.url) {
9595
var languageDefer = $q.defer();
96-
$http.get(options.language.url).success(function(language) {
96+
var languageUrl = options.language.url;
97+
$http.get(options.language.url).then(function(language) {
9798
languageDefer.resolve(language);
99+
}, function() {
100+
$log.error('Could not fetch the content of the language from ' + languageUrl);
98101
});
99102
options.language = languageDefer.promise;
100103
}
@@ -138,7 +141,7 @@ if (typeof module !== "undefined" && typeof exports !== "undefined" && module.ex
138141
}
139142
}
140143
}
141-
dataTable.$inject = ['$q', '$http', 'DTRendererFactory', 'DTRendererService', 'DTPropertyUtil'];
144+
dataTable.$inject = ['$q', '$http', '$log', 'DTRendererFactory', 'DTRendererService', 'DTPropertyUtil'];
142145

143146
'use strict';
144147
angular.module('datatables.factory', [])
@@ -1161,27 +1164,27 @@ if (typeof module !== "undefined" && typeof exports !== "undefined" && module.ex
11611164
}
11621165

11631166
function _doRender(options, $elem) {
1164-
var defer = $q.defer();
1165-
// Destroy the table if it exists in order to be able to redraw the dataTable
1166-
options.bDestroy = true;
1167-
if (_oTable) {
1168-
_oTable.destroy();
1169-
DTRendererService.showLoading(_$elem, _$scope);
1170-
// Empty in case of columns change
1171-
$elem.empty();
1172-
}
1173-
DTRendererService.hideLoading($elem);
1174-
// Condition to refresh the dataTable
1175-
if (_shouldDeferRender(options)) {
1176-
$timeout(function() {
1177-
defer.resolve(DTRendererService.renderDataTable($elem, options));
1178-
}, 0, false);
1179-
} else {
1167+
var defer = $q.defer();
1168+
// Destroy the table if it exists in order to be able to redraw the dataTable
1169+
options.bDestroy = true;
1170+
if (_oTable) {
1171+
_oTable.destroy();
1172+
DTRendererService.showLoading(_$elem, _$scope);
1173+
// Empty in case of columns change
1174+
$elem.empty();
1175+
}
1176+
DTRendererService.hideLoading($elem);
1177+
// Condition to refresh the dataTable
1178+
if (_shouldDeferRender(options)) {
1179+
$timeout(function() {
11801180
defer.resolve(DTRendererService.renderDataTable($elem, options));
1181-
}
1182-
return defer.promise;
1181+
}, 0, false);
1182+
} else {
1183+
defer.resolve(DTRendererService.renderDataTable($elem, options));
11831184
}
1184-
// See https://github.com/l-lin/angular-datatables/issues/147
1185+
return defer.promise;
1186+
}
1187+
// See https://github.com/l-lin/angular-datatables/issues/147
11851188
function _shouldDeferRender(options) {
11861189
if (angular.isDefined(options) && angular.isDefined(options.dom)) {
11871190
// S for scroller plugin

‎dist/angular-datatables.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/css/angular-datatables.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* angular-datatables - v0.5.6
2+
* angular-datatables - v0.6.0
33
* https://github.com/l-lin/angular-datatables
44
* License: MIT
55
*/

‎dist/css/angular-datatables.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/plugins/bootstrap/angular-datatables.bootstrap.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* angular-datatables - v0.5.6
2+
* angular-datatables - v0.6.0
33
* https://github.com/l-lin/angular-datatables
44
* License: MIT
55
*/
@@ -357,15 +357,15 @@ if (typeof module !== "undefined" && typeof exports !== "undefined" && module.ex
357357
}
358358

359359
function _setDom(options) {
360-
if (!options.dom || options.dom === $.fn.dataTable.defaults.sDom) {
361-
return DTBootstrapDefaultOptions.getOptions().dom;
362-
}
363-
return options.dom;
360+
if (!options.dom || options.dom === $.fn.dataTable.defaults.sDom) {
361+
return DTBootstrapDefaultOptions.getOptions().dom;
364362
}
365-
/**
366-
* Integrate Bootstrap
367-
* @param options the datatables options
368-
*/
363+
return options.dom;
364+
}
365+
/**
366+
* Integrate Bootstrap
367+
* @param options the datatables options
368+
*/
369369
function integrate(options) {
370370
_init(options.bootstrap);
371371
DTBootstrapTableTools.integrate(options.bootstrap);

‎dist/plugins/bootstrap/angular-datatables.bootstrap.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/plugins/bootstrap/datatables.bootstrap.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/plugins/buttons/angular-datatables.buttons.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* angular-datatables - v0.5.6
2+
* angular-datatables - v0.6.0
33
* https://github.com/l-lin/angular-datatables
44
* License: MIT
55
*/

‎dist/plugins/buttons/angular-datatables.buttons.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/plugins/colreorder/angular-datatables.colreorder.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* angular-datatables - v0.5.6
2+
* angular-datatables - v0.6.0
33
* https://github.com/l-lin/angular-datatables
44
* License: MIT
55
*/

‎dist/plugins/colreorder/angular-datatables.colreorder.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/plugins/columnfilter/angular-datatables.columnfilter.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* angular-datatables - v0.5.6
2+
* angular-datatables - v0.6.0
33
* https://github.com/l-lin/angular-datatables
44
* License: MIT
55
*/

‎dist/plugins/columnfilter/angular-datatables.columnfilter.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/plugins/colvis/angular-datatables.colvis.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* angular-datatables - v0.5.6
2+
* angular-datatables - v0.6.0
33
* https://github.com/l-lin/angular-datatables
44
* License: MIT
55
*/

‎dist/plugins/colvis/angular-datatables.colvis.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/plugins/fixedcolumns/angular-datatables.fixedcolumns.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* angular-datatables - v0.5.6
2+
* angular-datatables - v0.6.0
33
* https://github.com/l-lin/angular-datatables
44
* License: MIT
55
*/

‎dist/plugins/fixedcolumns/angular-datatables.fixedcolumns.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/plugins/fixedheader/angular-datatables.fixedheader.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* angular-datatables - v0.5.6
2+
* angular-datatables - v0.6.0
33
* https://github.com/l-lin/angular-datatables
44
* License: MIT
55
*/

‎dist/plugins/fixedheader/angular-datatables.fixedheader.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/plugins/light-columnfilter/angular-datatables.light-columnfilter.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* angular-datatables - v0.5.6
2+
* angular-datatables - v0.6.0
33
* https://github.com/l-lin/angular-datatables
44
* License: MIT
55
*/

‎dist/plugins/light-columnfilter/angular-datatables.light-columnfilter.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/plugins/scroller/angular-datatables.scroller.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* angular-datatables - v0.5.6
2+
* angular-datatables - v0.6.0
33
* https://github.com/l-lin/angular-datatables
44
* License: MIT
55
*/

‎dist/plugins/scroller/angular-datatables.scroller.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/plugins/select/angular-datatables.select.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* angular-datatables - v0.5.6
2+
* angular-datatables - v0.6.0
33
* https://github.com/l-lin/angular-datatables
44
* License: MIT
55
*/

‎dist/plugins/select/angular-datatables.select.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/plugins/tabletools/angular-datatables.tabletools.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* angular-datatables - v0.5.6
2+
* angular-datatables - v0.6.0
33
* https://github.com/l-lin/angular-datatables
44
* License: MIT
55
*/

‎dist/plugins/tabletools/angular-datatables.tabletools.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/angular-datatables.directive.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ angular.module('datatables.directive', ['datatables.instances', 'datatables.rend
44
.directive('datatable', dataTable);
55

66
/* @ngInject */
7-
function dataTable($q, $http, DTRendererFactory, DTRendererService, DTPropertyUtil) {
7+
function dataTable($q, $http, $log, DTRendererFactory, DTRendererService, DTPropertyUtil) {
88
return {
99
restrict: 'A',
1010
scope: {
@@ -81,8 +81,11 @@ function dataTable($q, $http, DTRendererFactory, DTRendererService, DTPropertyUt
8181
// See https://github.com/l-lin/angular-datatables/issues/181
8282
if (options.language && options.language.url) {
8383
var languageDefer = $q.defer();
84-
$http.get(options.language.url).success(function(language) {
84+
var languageUrl = options.language.url;
85+
$http.get(options.language.url).then(function(language) {
8586
languageDefer.resolve(language);
87+
}, function() {
88+
$log.error('Could not fetch the content of the language from ' + languageUrl);
8689
});
8790
options.language = languageDefer.promise;
8891
}

‎src/angular-datatables.renderer.js

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -446,27 +446,27 @@ function dtAjaxRenderer($q, $timeout, DTRenderer, DTRendererService, DT_DEFAULT_
446446
}
447447

448448
function _doRender(options, $elem) {
449-
var defer = $q.defer();
450-
// Destroy the table if it exists in order to be able to redraw the dataTable
451-
options.bDestroy = true;
452-
if (_oTable) {
453-
_oTable.destroy();
454-
DTRendererService.showLoading(_$elem, _$scope);
455-
// Empty in case of columns change
456-
$elem.empty();
457-
}
458-
DTRendererService.hideLoading($elem);
459-
// Condition to refresh the dataTable
460-
if (_shouldDeferRender(options)) {
461-
$timeout(function() {
462-
defer.resolve(DTRendererService.renderDataTable($elem, options));
463-
}, 0, false);
464-
} else {
449+
var defer = $q.defer();
450+
// Destroy the table if it exists in order to be able to redraw the dataTable
451+
options.bDestroy = true;
452+
if (_oTable) {
453+
_oTable.destroy();
454+
DTRendererService.showLoading(_$elem, _$scope);
455+
// Empty in case of columns change
456+
$elem.empty();
457+
}
458+
DTRendererService.hideLoading($elem);
459+
// Condition to refresh the dataTable
460+
if (_shouldDeferRender(options)) {
461+
$timeout(function() {
465462
defer.resolve(DTRendererService.renderDataTable($elem, options));
466-
}
467-
return defer.promise;
463+
}, 0, false);
464+
} else {
465+
defer.resolve(DTRendererService.renderDataTable($elem, options));
468466
}
469-
// See https://github.com/l-lin/angular-datatables/issues/147
467+
return defer.promise;
468+
}
469+
// See https://github.com/l-lin/angular-datatables/issues/147
470470
function _shouldDeferRender(options) {
471471
if (angular.isDefined(options) && angular.isDefined(options.dom)) {
472472
// S for scroller plugin

‎src/plugins/bootstrap/angular-datatables.bootstrap.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -307,15 +307,15 @@ function dtBootstrap(DTBootstrapTableTools, DTBootstrapColVis, DTBootstrapDefaul
307307
}
308308

309309
function _setDom(options) {
310-
if (!options.dom || options.dom === $.fn.dataTable.defaults.sDom) {
311-
return DTBootstrapDefaultOptions.getOptions().dom;
312-
}
313-
return options.dom;
310+
if (!options.dom || options.dom === $.fn.dataTable.defaults.sDom) {
311+
return DTBootstrapDefaultOptions.getOptions().dom;
314312
}
315-
/**
316-
* Integrate Bootstrap
317-
* @param options the datatables options
318-
*/
313+
return options.dom;
314+
}
315+
/**
316+
* Integrate Bootstrap
317+
* @param options the datatables options
318+
*/
319319
function integrate(options) {
320320
_init(options.bootstrap);
321321
DTBootstrapTableTools.integrate(options.bootstrap);

0 commit comments

Comments
 (0)