diff --git a/src/ng/compile.js b/src/ng/compile.js
index 56dafc397df2..89f46af663aa 100644
--- a/src/ng/compile.js
+++ b/src/ng/compile.js
@@ -297,6 +297,15 @@ function $CompileProvider($provide) {
}
};
+ var startSymbol = $interpolate.startSymbol(),
+ endSymbol = $interpolate.endSymbol(),
+ denormalizeTemplate = (startSymbol == '{{' || endSymbol == '}}')
+ ? identity
+ : function denormalizeTemplate(template) {
+ return template.replace(/\{\{/g, startSymbol).replace(/}}/g, endSymbol);
+ };
+
+
return compile;
//================================
@@ -579,6 +588,7 @@ function $CompileProvider($provide) {
if ((directiveValue = directive.template)) {
assertNoDuplicate('template', templateDirective, directive, $compileNode);
templateDirective = directive;
+ directiveValue = denormalizeTemplate(directiveValue);
if (directive.replace) {
$template = jqLite('
' +
@@ -898,6 +908,8 @@ function $CompileProvider($provide) {
success(function(content) {
var compileNode, tempTemplateAttrs, $template;
+ content = denormalizeTemplate(content);
+
if (replace) {
$template = jqLite('
' + trim(content) + '
').contents();
compileNode = $template[0];
diff --git a/test/ng/compileSpec.js b/test/ng/compileSpec.js
index cbf84a3885f0..3d6144aceb45 100644
--- a/test/ng/compileSpec.js
+++ b/test/ng/compileSpec.js
@@ -1372,6 +1372,47 @@ describe('$compile', function() {
'
' +
'');
}));
+
+
+ it('should support custom start/end interpolation symbols in template and directive template',
+ function() {
+ module(function($interpolateProvider, $compileProvider) {
+ $interpolateProvider.startSymbol('##').endSymbol(']]');
+ $compileProvider.directive('myDirective', function() {
+ return {
+ template: '
{{hello}}|{{hello|uppercase}}'
+ };
+ });
+ });
+
+ inject(function($compile, $rootScope) {
+ element = $compile('
')($rootScope);
+ $rootScope.hello = 'ahoj';
+ $rootScope.$digest();
+ expect(element.text()).toBe('AHOJ|ahoj|AHOJ');
+ });
+ });
+
+
+ it('should support custom start/end interpolation symbols in async directive template',
+ function() {
+ module(function($interpolateProvider, $compileProvider) {
+ $interpolateProvider.startSymbol('##').endSymbol(']]');
+ $compileProvider.directive('myDirective', function() {
+ return {
+ templateUrl: 'myDirective.html'
+ };
+ });
+ });
+
+ inject(function($compile, $rootScope, $templateCache) {
+ $templateCache.put('myDirective.html', '
{{hello}}|{{hello|uppercase}}');
+ element = $compile('
')($rootScope);
+ $rootScope.hello = 'ahoj';
+ $rootScope.$digest();
+ expect(element.text()).toBe('AHOJ|ahoj|AHOJ');
+ });
+ });
});