Skip to content

Commit 00adfde

Browse files
committed
Correct missplaced render function :sad:
1 parent dd6131d commit 00adfde

File tree

3 files changed

+28
-23
lines changed

3 files changed

+28
-23
lines changed

dist/angular-datatables.js

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@
225225
$elem.dataTable(options);
226226
}, 0, false);
227227
};
228-
var _renderDataTableIfNoNgRows = function ($elem, options, isNgDisplay) {
228+
var _renderDataTableIfNoNgRows = function ($elem, isNgDisplay, options) {
229229
if (!isNgDisplay) {
230230
_doRenderDataTable($elem, options);
231231
}
@@ -252,20 +252,22 @@
252252
if (angular.isObject(options.dataPromise)) {
253253
options.dataPromise.then(function (data) {
254254
options.aaData = data;
255-
_renderDataTableIfNoNgRows($elem, options, isNgDisplay);
255+
_renderDataTableIfNoNgRows($elem, isNgDisplay, options);
256256
});
257-
} else if (angular.isDefined(options.sAjaxSource)) {
258-
// Define default values in case it is an ajax datatables
259-
if (angular.isUndefined(options.sAjaxDataProp)) {
260-
options.sAjaxDataProp = DT_DEFAULT_OPTIONS.sAjaxDataProp;
261-
}
262-
if (angular.isUndefined(options.aoColumns)) {
263-
options.aoColumns = DT_DEFAULT_OPTIONS.aoColumns;
257+
} else {
258+
if (angular.isDefined(options.sAjaxSource)) {
259+
// Define default values in case it is an ajax datatables
260+
if (angular.isUndefined(options.sAjaxDataProp)) {
261+
options.sAjaxDataProp = DT_DEFAULT_OPTIONS.sAjaxDataProp;
262+
}
263+
if (angular.isUndefined(options.aoColumns)) {
264+
options.aoColumns = DT_DEFAULT_OPTIONS.aoColumns;
265+
}
264266
}
265-
_renderDataTableIfNoNgRows($elem, options, isNgDisplay);
267+
_renderDataTableIfNoNgRows($elem, isNgDisplay);
266268
}
267269
} else {
268-
_renderDataTableIfNoNgRows($elem, options, isNgDisplay);
270+
_renderDataTableIfNoNgRows($elem, isNgDisplay);
269271
}
270272
$scope.$on(DT_LAST_ROW_KEY, function () {
271273
_doRenderDataTable($elem, options);

dist/angular-datatables.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.

0 commit comments

Comments
 (0)