Add in string interpolation all over the place.

creationix · Apr 1, 2010 · d8d7492 · d8d7492
1 parent 8f60322
commit d8d7492
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 11 deletions.
diff --git a/lib/haml.js b/lib/haml.js
@@ -10,10 +10,7 @@ if (typeof exports !== 'undefined') {
   var matchers, self_close_tags, embedder;
 
   function html_escape(text) {
-    if (typeof text !== 'string') {
-      text = text + "";
-    }
-    return text.
+    return (text + "").
       replace(/&/g, "&amp;").
       replace(/</g, "&lt;").
       replace(/>/g, "&gt;").
@@ -35,8 +32,12 @@ if (typeof exports !== 'undefined') {
             value = JSON.parse("[" + attribs[key] +"]")[0];
             if (value === true) {
               value = key;
+            } else if (typeof value === 'string' && embedder.test(value)) {
+              value = '" +\n' + parse_interpol(html_escape(value)) + ' +\n"';
+            } else {
+              value = html_escape(value);
             }
-            result.push(" " + key + '=\\"' + html_escape(value) + '\\"');
+            result.push(" " + key + '=\\"' + value + '\\"');
           } catch (e) {
             result.push(" " + key + '=\\"" + html_escape(' + attribs[key] + ') + "\\"');
           }
@@ -156,7 +157,7 @@ if (typeof exports !== 'undefined') {
       items.push(match[1] || match[2]);
       pos += next;
     }
-    return items.join(" + ");
+    return items.join(" +\n");
   }
 
   // Used to find embedded code in interpolated strings.
@@ -393,14 +394,14 @@ if (typeof exports !== 'undefined') {
         output.push(function () {
           // Escaped plain text
           if (line[0] === '\\') {
-            return JSON.stringify(line.substr(1, line.length));
+            return parse_interpol(line.substr(1, line.length));
           }
 
           // Plain variable data
           if (line[0] === '=') {
             line = line.substr(1, line.length).trim();
             try {
-              return JSON.stringify(JSON.parse(line));
+              return parse_interpol(JSON.parse(line));
             } catch (e) {
               return line;
             }
@@ -417,7 +418,7 @@ if (typeof exports !== 'undefined') {
           }
 
           // Plain text
-          return JSON.stringify(line);
+          return parse_interpol(line);
         }());
       }
 

diff --git a/test/embedded_code.haml b/test/embedded_code.haml
@@ -1,3 +1,6 @@
 %head
   :javascript
     Page.chapter = #{JSON.stringify(chapter)};
+%body
+  %h1 Welcome #{name}
+  %div{class: "div_#{id}"}
diff --git a/test/embedded_code.html b/test/embedded_code.html
@@ -4,4 +4,4 @@
 Page.chapter = {"name":"Ninja","page":42};
 //]]>
 </script>
-</head>
+</head><body><h1>Welcome Tim</h1><div class="div_42"></div></body>
diff --git a/test/embedded_code.js b/test/embedded_code.js
@@ -1,5 +1,7 @@
 {
   locals: {
-    chapter: {name: "Ninja", page: 42}
+    chapter: {name: "Ninja", page: 42},
+    name: "Tim",
+    id: 42
   }
 }