doctypes are default off

dodo · Nov 15, 2011 · 770676d · 770676d
1 parent 699601b
commit 770676d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/template.coffee b/src/template.coffee
@@ -116,6 +116,7 @@ class Template extends EventEmitter
     constructor: (opts = {}, template) ->
         [template, opts] = [opts, {}] if typeof opts is 'function'
         opts.encoding ?= 'utf-8'
+        opts.doctype ?= off
         schema_input = opts.schema
         s = aliases[schema_input] or schema_input or 'xml'
         opts.self_closing = self_closing[s]?(opts)
@@ -145,7 +146,10 @@ class Template extends EventEmitter
                 @emit event, args...
 
         process.nextTick =>
-            if schema_input? and (dt = doctype[s]?(opts))
+            if opts.doctype is on
+                opts.doctype = 'html'
+            d = aliases[opts.doctype] or opts.doctype
+            if opts.doctype and (dt = doctype[d]?(opts))
                 dt += "\n" if opts.pretty
                 @xml.emit 'data', dt
             if typeof template is 'function'

diff --git a/src/test/template.coffee b/src/test/template.coffee
@@ -13,7 +13,7 @@ module.exports =
 
     html5: (æ) ->
         content = ["a", "b", "c"]
-        xml = new Template schema:5, ->
+        xml = new Template schema:5, doctype:on, ->
             @$html ->
                 @body ->
                     file = path.join(__dirname,"..","..","..","filename")
@@ -50,7 +50,7 @@ module.exports =
         ]
 
     pretty: (æ) ->
-        xml = new Template schema:5, pretty:" ", ->
+        xml = new Template schema:5, pretty:" ", doctype:on, ->
             @$html ->
                 @$head ->
                     @$title "holla"
@@ -98,7 +98,6 @@ module.exports =
         xml.on 'end', æ.done
         xml.on 'data', (tag) -> æ.equal results.shift(), tag
         results = [
-            '<!DOCTYPE html>'
             '<html>'
             '<head>'
             '<title>'