fix(core): fix external template loading for grid-filter, grid-footer…

src/js/core/directives/ui-grid-filter.js

@@ -11,8 +11,17 @@
  $elm.children().remove();
  if ( filterable ){
  var template = $scope.col.filterHeaderTemplate;
-
- $elm.append($compile(template)($scope));
+ if (template === undefined && $scope.col.providedFilterHeaderTemplate !== "") {
+ if ($scope.col.filterHeaderTemplatePromise) {
+ $scope.col.filterHeaderTemplatePromise.then(function () {
+ template = $scope.col.filterHeaderTemplate;
+ $elm.append($compile(template)($scope));
+ });
+ }
+ }
+ else {
+ $elm.append($compile(template)($scope));
+ }
  }
  };
 

src/js/core/directives/ui-grid-footer-cell.js

@@ -15,8 +15,18 @@
  compile: function compile(tElement, tAttrs, transclude) {
  return {
  pre: function ($scope, $elm, $attrs, uiGridCtrl) {
- var cellFooter = $compile($scope.col.footerCellTemplate)($scope);
- $elm.append(cellFooter);
+ var template = $scope.col.footerCellTemplate;
+ if (template === undefined && $scope.col.providedFooterCellTemplate !== ""){
+ if ($scope.col.footerCellTemplatePromise) {
+ $scope.col.footerCellTemplatePromise.then(function() {
+ template = $scope.col.footerCellTemplate;
+ $elm.append($compile(template)($scope));
+ });
+ }
+ }
+ else {
+ $elm.append($compile(template)($scope));
+ }
  },
  post: function ($scope, $elm, $attrs, uiGridCtrl) {
  //$elm.addClass($scope.col.getColClass(false));

src/js/core/directives/ui-grid-header-cell.js

@@ -19,8 +19,18 @@
  compile: function() {
  return {
  pre: function ($scope, $elm, $attrs) {
- var cellHeader = $compile($scope.col.headerCellTemplate)($scope);
- $elm.append(cellHeader);
+ var template = $scope.col.headerCellTemplate;
+ if (template === undefined && $scope.col.providedHeaderCellTemplate !== ""){
+ if ($scope.col.headerCellTemplatePromise) {
+ $scope.col.headerCellTemplatePromise.then(function() {
+ template = $scope.col.headerCellTemplate;
+ $elm.append($compile(template)($scope));
+ });
+ }
+ }
+ else {
+ $elm.append($compile(template)($scope));
+ }
  },
 
  post: function ($scope, $elm, $attrs, controllers) {

src/js/core/services/gridClassFactory.js

@@ -98,30 +98,30 @@
  col[providedType] = colDef[templateType];
  }
 
- templateGetPromises.push(gridUtil.getTemplate(col[providedType])
- .then(
- function (template) {
- if ( angular.isFunction(template) ) { template = template(); }
- var tooltipCall = ( tooltipType === 'cellTooltip' ) ? 'col.cellTooltip(row,col)' : 'col.headerTooltip(col)';
- if ( tooltipType && col[tooltipType] === false ){
- template = template.replace(uiGridConstants.TOOLTIP, '');
- } else if ( tooltipType && col[tooltipType] ){
- template = template.replace(uiGridConstants.TOOLTIP, 'title="{{' + tooltipCall + ' CUSTOM_FILTERS }}"');
- }
-
- if ( filterType ){
- col[templateType] = template.replace(uiGridConstants.CUSTOM_FILTERS, function() {
- return col[filterType] ? "|" + col[filterType] : "";
- });
- } else {
- col[templateType] = template;
- }
- },
- function (res) {
- throw new Error("Couldn't fetch/use colDef." + templateType + " '" + colDef[templateType] + "'");
- })
- );
+ var templatePromises = gridUtil.getTemplate(col[providedType])
+ .then(function (template) {
+ if ( angular.isFunction(template) ) { template = template(); }
+ var tooltipCall = ( tooltipType === 'cellTooltip' ) ? 'col.cellTooltip(row,col)' : 'col.headerTooltip(col)';
+ if ( tooltipType && col[tooltipType] === false ){
+ template = template.replace(uiGridConstants.TOOLTIP, '');
+ } else if ( tooltipType && col[tooltipType] ){
+ template = template.replace(uiGridConstants.TOOLTIP, 'title="{{' + tooltipCall + ' CUSTOM_FILTERS }}"');
+ }
+
+ if ( filterType ){
+ col[templateType] = template.replace(uiGridConstants.CUSTOM_FILTERS, function() {
+ return col[filterType] ? "|" + col[filterType] : "";
+ });
+ } else {
+ col[templateType] = template;
+ }
+ },
+ function (res) {
+ throw new Error("Couldn't fetch/use colDef." + templateType + " '" + colDef[templateType] + "'");
+ });
 
+ templateGetPromises.push(templatePromises);
+ return templatePromises;
  };
 
 
@@ -134,8 +134,7 @@
  * must contain a div that can receive focus.
  *
  */
- processTemplate( 'cellTemplate', 'providedCellTemplate', 'ui-grid/uiGridCell', 'cellFilter', 'cellTooltip' );
- col.cellTemplatePromise = templateGetPromises[0];
+ col.cellTemplatePromise = processTemplate( 'cellTemplate', 'providedCellTemplate', 'ui-grid/uiGridCell', 'cellFilter', 'cellTooltip' );
 
  /**
  * @ngdoc property
@@ -145,7 +144,7 @@
  * is ui-grid/uiGridHeaderCell
  *
  */
- processTemplate( 'headerCellTemplate', 'providedHeaderCellTemplate', 'ui-grid/uiGridHeaderCell', 'headerCellFilter', 'headerTooltip' );
+ col.headerCellTemplatePromise = processTemplate( 'headerCellTemplate', 'providedHeaderCellTemplate', 'ui-grid/uiGridHeaderCell', 'headerCellFilter', 'headerTooltip' );
 
  /**
  * @ngdoc property
@@ -155,7 +154,7 @@
  * is ui-grid/uiGridFooterCell
  *
  */
- processTemplate( 'footerCellTemplate', 'providedFooterCellTemplate', 'ui-grid/uiGridFooterCell', 'footerCellFilter' );
+ col.footerCellTemplatePromise = processTemplate( 'footerCellTemplate', 'providedFooterCellTemplate', 'ui-grid/uiGridFooterCell', 'footerCellFilter' );
 
  /**
  * @ngdoc property
@@ -164,7 +163,7 @@
  * @description a custom template for the filter input. The default is ui-grid/ui-grid-filter
  *
  */
- processTemplate( 'filterHeaderTemplate', 'providedFilterHeaderTemplate', 'ui-grid/ui-grid-filter' );
+ col.filterHeaderTemplatePromise = processTemplate( 'filterHeaderTemplate', 'providedFilterHeaderTemplate', 'ui-grid/ui-grid-filter' );
 
  // Create a promise for the compiled element function
  col.compiledElementFnDefer = $q.defer();