From 74dd2f7980ea8ec434a6e0565d857c910653ed9b Mon Sep 17 00:00:00 2001 From: Igor Minar Date: Wed, 9 Jan 2013 22:07:33 -0800 Subject: [PATCH 1/2] fix($compile): safely create transclude comment nodes Closes #1740 --- src/ng/compile.js | 2 +- test/ng/compileSpec.js | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/ng/compile.js b/src/ng/compile.js index 5026283ef516..29d66da577f9 100644 --- a/src/ng/compile.js +++ b/src/ng/compile.js @@ -581,7 +581,7 @@ function $CompileProvider($provide) { if (directiveValue == 'element') { $template = jqLite(compileNode); $compileNode = templateAttrs.$$element = - jqLite(''); + jqLite(document.createComment(' ' + directiveName + ': ' + templateAttrs[directiveName] + ' ')); compileNode = $compileNode[0]; replaceWith($rootElement, jqLite($template[0]), compileNode); childTranscludeFn = compile($template, transcludeFn, terminalPriority); diff --git a/test/ng/compileSpec.js b/test/ng/compileSpec.js index 5b644af9f75c..927a4ef77781 100644 --- a/test/ng/compileSpec.js +++ b/test/ng/compileSpec.js @@ -2241,5 +2241,15 @@ describe('$compile', function() { expect(nodeName_(comment)).toBe('#comment'); }); }); + + + it('should safely create transclude comment node and not break with "-->"', + inject(function($rootScope) { + // see: https://github.com/angular/angular.js/issues/1740 + element = $compile('')($rootScope); + $rootScope.$digest(); + + expect(element.text()).toBe('-->|x|'); + })); }); }); From 4846ab51f619878ed81291581dee3d8fb5b02cd9 Mon Sep 17 00:00:00 2001 From: James deBoer Date: Tue, 15 Jan 2013 09:16:11 -0800 Subject: [PATCH 2/2] fix(build system): Removes a duplicate file in angularFiles.js --- angularFiles.js | 1 - 1 file changed, 1 deletion(-) diff --git a/angularFiles.js b/angularFiles.js index 02bdf3a1d062..47f18961f736 100644 --- a/angularFiles.js +++ b/angularFiles.js @@ -79,7 +79,6 @@ angularFiles = { 'src/ngScenario/Describe.js', 'src/ngScenario/Future.js', 'src/ngScenario/ObjectModel.js', - 'src/ngScenario/Describe.js', 'src/ngScenario/Runner.js', 'src/ngScenario/SpecRunner.js', 'src/ngScenario/dsl.js',