Moved handling of String includes into the core tag

taglibs/core/include-tag.js

@@ -5,6 +5,8 @@ module.exports = function include(input, out) {
     if (target) {
         if (typeof target === 'function') {
             target(out, arg);
+        } else if (typeof target === 'string') {
+            out.text(target);
         } else if (typeof target === 'object') {
             if (target.renderBody) {
                 target.renderBody(out, arg);
@@ -12,6 +14,8 @@ module.exports = function include(input, out) {
                 target.renderer(arg, out);
             } else if (target.render) {
                 target.render(arg, out);
+            } else if (target.safeHTML) {
+                out.write(target.safeHTML);
             }
         } else {
             throw new Error('Invalid include target: ' + target);

test/autotests/render/include-safeHTML/expected.html

@@ -0,0 +1 @@
+<strong>Hello!</strong>

test/autotests/render/include-safeHTML/template.marko

@@ -0,0 +1,2 @@
+var html = { safeHTML: '<strong>Hello!</strong>' };
+<include(html)/>

test/autotests/render/include-safeHTML/test.js

@@ -0,0 +1 @@
+exports.templateData = {};

test/autotests/render/include-string/expected.html

@@ -0,0 +1 @@
+<script>Hello</script>

test/autotests/render/include-string/template.marko

@@ -0,0 +1,2 @@
+var text = '<script>Hello</script>';
+<include(text)/>

test/autotests/render/include-string/test.js

@@ -0,0 +1 @@
+exports.templateData = {};

widgets/taglib/include-tag.js

@@ -5,9 +5,7 @@ var getElementById = require('../util').$__getElementById;
 module.exports = function include(input, out) {
     var target = input._target;
 
-    if (typeof target === 'string') {
+    if (target != null) {
-        out.text(target);
-    } else if (target) {
         normalInclude(input, out);
     } else if (getElementById) {
         var elId = input._elId;