mv ecaping to util.safe

dodo · Oct 22, 2011 · afe854a · afe854a
1 parent f72833a
commit afe854a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/src/util.coffee b/src/util.coffee
@@ -32,5 +32,12 @@ new_attrs = (attrs = {}) ->
     strattrs.join ' '
 
 
+safe = (text) ->
+    String(text)
+        .replace(/&(?!\w+;)/g, '&amp;')
+        .replace(/</g, '&lt;')
+        .replace(/>/g, '&gt;')
+        .replace(/"/g, '&quot;')
 
-module.exports = { deep_merge, indent, new_attrs }
+
+module.exports = { deep_merge, indent, new_attrs, safe }
diff --git a/src/xml.coffee b/src/xml.coffee
@@ -1,5 +1,5 @@
 { EventEmitter } = require 'events'
-{ deep_merge, indent, new_attrs } = require './util'
+{ deep_merge, indent, new_attrs, safe } = require './util'
 EVENTS = ['add', 'attr', 'attr:remove', 'text', 'remove']
 
 new_tag = (name, attrs, children, opts) ->
@@ -146,12 +146,7 @@ class Tag extends EventEmitter
         this
 
     write: (content, {escape} = {}) =>
-        if escape
-            content = String(content)
-                .replace(/&(?!\w+;)/g, '&amp;')
-                .replace(/</g, '&lt;')
-                .replace(/>/g, '&gt;')
-                .replace(/"/g, '&quot;')
+        content = safe(content) if escape
         if @headers
             @emit 'data', "#{indent this}#{@headers}>"
             delete @headers