Skip to content
This repository was archived by the owner on Feb 2, 2025. It is now read-only.

Add support for directives in the DTLoadingTemplate #529

Merged
merged 1 commit into from
Dec 4, 2015
Merged

Add support for directives in the DTLoadingTemplate #529

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 16 additions & 10 deletions dist/angular-datatables.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ function dataTable($q, $http, DTRendererFactory, DTRendererService, DTPropertyUt
angular.forEach(['dtColumns', 'dtColumnDefs', 'dtOptions'], function(tableDefField) {
$scope[watchFunction].call($scope, tableDefField, handleChanges, true);
});
DTRendererService.showLoading($elem);
DTRendererService.showLoading($elem, $scope);
ctrl.render($elem, ctrl.buildOptionsPromise(), _staticHTML);
};
}
Expand Down Expand Up @@ -411,10 +411,16 @@ function dtColumnDefBuilder(DTColumnBuilder) {
}
dtColumnDefBuilder.$inject = ['DTColumnBuilder'];

function dtLoadingTemplate() {
return {
html: '<h3 class="dt-loading">Loading...</h3>'
function dtLoadingTemplate($compile) {
var template = {};

template.html = '<h3 class="dt-loading">Loading...</h3>';

template.compileHtml = function ($scope) {
return $compile(angular.element(template.html))($scope);
};

return template;
}

'use strict';
Expand Down Expand Up @@ -690,8 +696,8 @@ function dtRendererService(DTLoadingTemplate) {
};
return rendererService;

function showLoading($elem) {
var $loading = angular.element(DTLoadingTemplate.html);
function showLoading($elem, $scope) {
var $loading = angular.element(DTLoadingTemplate.compileHtml($scope));
$elem.after($loading);
$elem.hide();
$loading.show();
Expand Down Expand Up @@ -794,7 +800,7 @@ function dtDefaultRenderer($q, DTRenderer, DTRendererService, DTInstanceFactory)

function rerender() {
_oTable.destroy();
DTRendererService.showLoading(_$elem);
DTRendererService.showLoading(_$elem, $scope);
render(_$elem);
}
return renderer;
Expand Down Expand Up @@ -874,7 +880,7 @@ function dtNGRenderer($log, $q, $compile, $timeout, DTRenderer, DTRendererServic

function rerender() {
_destroyAndCompile();
DTRendererService.showLoading(_$elem);
DTRendererService.showLoading(_$elem, $scope);
$timeout(function() {
var result = DTRendererService.hideLoadingAndRenderDataTable(_$elem, renderer.options);
_oTable = result.DataTable;
Expand Down Expand Up @@ -963,7 +969,7 @@ function dtPromiseRenderer($q, $timeout, $log, DTRenderer, DTRendererService, DT

function rerender() {
_oTable.destroy();
DTRendererService.showLoading(_$elem);
DTRendererService.showLoading(_$elem, _$scope);
render(_$elem, _$scope);
}

Expand Down Expand Up @@ -1105,7 +1111,7 @@ function dtAjaxRenderer($q, $timeout, DTRenderer, DTRendererService, DT_DEFAULT_
options.bDestroy = true;
if (_oTable) {
_oTable.destroy();
DTRendererService.showLoading(_$elem);
DTRendererService.showLoading(_$elem, _$scope);
// Empty in case of columns change
$elem.empty();
}
Expand Down