Skip to content

Commit 7630fd3

Browse files
marcelo-portugalmportuga
authored andcommitted
fix(core): support custom interpolation symbols on defaultColumnBuilder
Also, fix minor linting issue on test files. Closes #6963
1 parent 3697200 commit 7630fd3

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

packages/core/src/js/services/gridClassFactory.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -112,12 +112,13 @@
112112
}
113113

114114
if ( filterType ) {
115-
col[templateType] = template.replace(uiGridConstants.CUSTOM_FILTERS, function() {
115+
template = template.replace(uiGridConstants.CUSTOM_FILTERS, function() {
116116
return col[filterType] ? "|" + col[filterType] : "";
117117
});
118-
} else {
119-
col[templateType] = template;
120118
}
119+
return gridUtil.postProcessTemplate(template).then(function(template) {
120+
col[templateType] = template;
121+
});
121122
},
122123
function () {
123124
throw new Error("Couldn't fetch/use colDef." + templateType + " '" + colDef[templateType] + "'");

packages/core/test/i18n/i18nService.spec.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ describe('i18nService', function () {
44
beforeEach(function() {
55
$log = jasmine.createSpyObj('$log', ['warn']);
66
module('ui.grid', function($provide) {
7-
$provide.value('$log', $log)
7+
$provide.value('$log', $log);
88
});
99
inject(function (_i18nConstants_, _i18nService_) {
1010
i18nConstants = _i18nConstants_;

0 commit comments

Comments
 (0)