fix(core): support custom interpolation symbols on defaultColumnBuilder

Also, fix minor linting issue on test files. Closes #6963
angular-ui · Jan 23, 2023 · 7630fd3 · 7630fd3
1 parent 3697200
commit 7630fd3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/packages/core/src/js/services/gridClassFactory.js b/packages/core/src/js/services/gridClassFactory.js
@@ -112,12 +112,13 @@
                   }
 
                   if ( filterType ) {
-                    col[templateType] = template.replace(uiGridConstants.CUSTOM_FILTERS, function() {
+                    template = template.replace(uiGridConstants.CUSTOM_FILTERS, function() {
                       return col[filterType] ? "|" + col[filterType] : "";
                     });
-                  } else {
-                    col[templateType] = template;
                   }
+                  return gridUtil.postProcessTemplate(template).then(function(template) {
+                    col[templateType] = template;
+                  });
                 },
                 function () {
                   throw new Error("Couldn't fetch/use colDef." + templateType + " '" + colDef[templateType] + "'");

diff --git a/packages/core/test/i18n/i18nService.spec.js b/packages/core/test/i18n/i18nService.spec.js
@@ -4,7 +4,7 @@ describe('i18nService', function () {
   beforeEach(function() {
     $log = jasmine.createSpyObj('$log', ['warn']);
     module('ui.grid', function($provide) {
-      $provide.value('$log', $log)
+      $provide.value('$log', $log);
     });
     inject(function (_i18nConstants_, _i18nService_) {
       i18nConstants = _i18nConstants_;