fix(interpolate): escape double quotes, etc. in non-mustache text

Closes #951
dart-archive · Apr 23, 2014 · 3aebb38 · 3aebb38 · jbdeboer · Apr 23, 2014
1 parent c6be443
commit 3aebb38
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/lib/core/interpolate.dart b/lib/core/interpolate.dart
@@ -49,7 +49,7 @@ class Interpolate implements Function {
         if (index < startIdx) {
           // Empty strings could be stripped thanks to the stringify
           // formatter
-          expParts.add('"${template.substring(index, startIdx)}"');
+          expParts.add(JSON.encode(template.substring(index, startIdx)));
         }
         expParts.add('(' + template.substring(startIdx + startLen, endIdx) +
         '|stringify)');
@@ -58,7 +58,7 @@ class Interpolate implements Function {
         hasInterpolation = true;
       } else {
         // we did not find any interpolation, so add the remainder
-        expParts.add('"${template.substring(index)}"');
+        expParts.add(JSON.encode(template.substring(index)));
         break;
       }
     }

diff --git a/lib/core/module_internal.dart b/lib/core/module_internal.dart
@@ -2,6 +2,7 @@ library angular.core_internal;
 
 import 'dart:async' as async;
 import 'dart:collection';
+import 'dart:convert';
 import 'dart:math';
 import 'package:intl/intl.dart';
 

diff --git a/test/core/interpolate_spec.dart b/test/core/interpolate_spec.dart
@@ -33,5 +33,11 @@ main() {
       .toEqual('"X\nY"+(A\n+B|stringify)+"C\nD"');
     });
 
+    it('should not be confused by double quotes, etc. outside mustache',
+       (Interpolate interpolate) {
+      expect(interpolate('"{{A}}"'))
+      .toEqual(r'"\""+(A|stringify)+"\""');
+    });
+
   });
-}
+}