From 74dd2f7980ea8ec434a6e0565d857c910653ed9b Mon Sep 17 00:00:00 2001
From: Igor Minar <igor@angularjs.org>
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('<!-- ' + directiveName + ': ' + templateAttrs[directiveName]  + ' -->');
+                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('<ul><li ng-repeat="item in [\'-->\', \'x\']">{{item}}|</li></ul>')($rootScope);
+      $rootScope.$digest();
+
+      expect(element.text()).toBe('-->|x|');
+    }));
   });
 });

From 44dcf375e243f644741046e86120bbcb57d5f7e3 Mon Sep 17 00:00:00 2001
From: James deBoer <deboer@google.com>
Date: Tue, 15 Jan 2013 09:13:28 -0800
Subject: [PATCH 2/2] feat(build system): Generate version.json

Changes 'rake version' to output a version.json file which
contains the parsed version and can be used in other tools.
---
 Rakefile | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Rakefile b/Rakefile
index 3a8cc00ee34a..6351cc1678cc 100644
--- a/Rakefile
+++ b/Rakefile
@@ -115,6 +115,12 @@ end
 desc 'Generate version.txt file'
 task :version => [:init] do
   `echo #{NG_VERSION.full} > #{path_to('version.txt')}`
+  `echo '{
+  "full": "#{NG_VERSION.full}",
+  "major": "#{NG_VERSION.major}",
+  "minor": "#{NG_VERSION.minor}",
+  "dot": "#{NG_VERSION.dot}",
+  "codename": "#{NG_VERSION.codename}" }' > #{path_to('version.json')}`
 end