Merge branch 'master' into editor

spec/stdlib/template/builder-spec.coffee

@@ -44,6 +44,11 @@ describe "Builder", ->
       builder.tag 'br', id: 'foo'
       expect(builder.toHtml()).toBe '<br id="foo">'
 
+  describe ".raw(text)", ->
+    it "does not escape html entities", ->
+      builder.raw '&nbsp;'
+      expect(builder.toHtml()).toBe '&nbsp;'
+
   describe ".subview(name, template, attrs)", ->
     template = null
 

src/stdlib/template/builder.coffee

@@ -66,6 +66,9 @@ class Builder
   text: (string) ->
     @document.push(new Text(string))
 
+  raw: (string) ->
+    @document.push(new Text(string, true))
+
   wireOutlets: (view) ->
     view.find('[outlet]').each ->
       elt = $(this)

src/stdlib/template/text.coffee

@@ -1,12 +1,15 @@
 module.exports =
 class Text
-  constructor: (@string) ->
+  constructor: (@string, @raw=false) ->
 
   toHtml: ->
-    @string
-      .replace(/&/g, '&')
-      .replace(/"/g, '"')
-      .replace(/'/g, ''')
-      .replace(/</g, '&lt;')
-      .replace(/>/g, '&gt;')
+    if @raw
+      @string
+    else
+      @string
+        .replace(/&/g, '&amp;')
+        .replace(/"/g, '&quot;')
+        .replace(/'/g, '&#39;')
+        .replace(/</g, '&lt;')
+        .replace(/>/g, '&gt;')