lcppcl
diff --git a/‎src/parsers/template.js
Copy file name to clipboardExpand all lines: src/parsers/template.js
+22-7Lines changed: 22 additions & 7 deletions b/‎src/parsers/template.js
Copy file name to clipboardExpand all lines: src/parsers/template.js
+22-7Lines changed: 22 additions & 7 deletions
diff --git a/‎test/unit/specs/parsers/template_spec.js
Copy file name to clipboardExpand all lines: test/unit/specs/parsers/template_spec.js
+7Lines changed: 7 additions & 0 deletions b/‎test/unit/specs/parsers/template_spec.js
Copy file name to clipboardExpand all lines: test/unit/specs/parsers/template_spec.js
+7Lines changed: 7 additions & 0 deletions
@@ -56,6 +56,19 @@ map.rect = [
   '</svg>'
 ]
 
+/**
+ * Check if a node is a supported template node with a
+ * DocumentFragment content.
+ *
+ * @param {Node} node
+ * @return {Boolean}
+ */
+
+function isRealTemplate (node) {
+  return _.isTemplate(node) &&
+    node.content instanceof DocumentFragment
+}
+
 var tagRE = /<([\w:]+)/
 var entityRE = /&\w+;/
 
@@ -120,10 +133,7 @@ function stringToFragment (templateString) {
 function nodeToFragment (node) {
   // if its a template tag and the browser supports it,
   // its content is already a document fragment.
-  if (
-    _.isTemplate(node) &&
-    node.content instanceof DocumentFragment
-  ) {
+  if (isRealTemplate(node)) {
     _.trimNode(node.content)
     return node.content
   }
@@ -174,16 +184,21 @@ var hasTextareaCloneBug = _.inBrowser
  */
 
 exports.clone = function (node) {
-  var res = node.cloneNode(true)
   if (!node.querySelectorAll) {
-    return res
+    return node.cloneNode()
   }
+  var res = node.cloneNode(true)
   var i, original, cloned
   /* istanbul ignore if */
   if (hasBrokenTemplate) {
+    var clone = res
+    if (isRealTemplate(node)) {
+      node = node.content
+      clone = res.content
+    }
     original = node.querySelectorAll('template')
     if (original.length) {
-      cloned = res.querySelectorAll('template')
+      cloned = clone.querySelectorAll('template')
       i = cloned.length
       while (i--) {
         cloned[i].parentNode.replaceChild(
 
@@ -137,6 +137,13 @@ if (_.inBrowser) {
       expect(c.firstChild.innerHTML).toBe('1')
     })
 
+    it('should deal with Safari template clone bug even when nested', function () {
+      var a = document.createElement('div')
+      a.innerHTML = '<template><div>1</div><template>2</template></template>'
+      var c = templateParser.clone(a)
+      expect(c.firstChild.innerHTML).toBe('<div>1</div><template>2</template>')
+    })
+
     it('should deal with IE textarea clone bug', function () {
       var t = document.createElement('textarea')
       t.placeholder = 't'