fix problem when '<body' string is present in DOM

Bemoth · Oct 31, 2019 · dd95dc7 · dd95dc7
1 parent 1667b92
commit dd95dc7
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/dist/swup.js b/dist/swup.js
@@ -830,9 +830,8 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
 var _utils = __webpack_require__(1);
 
 var getDataFromHtml = function getDataFromHtml(html, containers) {
-	var content = html.replace('<body', '<div id="swupBody"').replace('</body>', '</div>');
-	var fakeDom = document.createElement('div');
-	fakeDom.innerHTML = content;
+	var fakeDom = document.createElement('html');
+	fakeDom.innerHTML = html;
 	var blocks = [];
 
 	var _loop = function _loop(i) {
@@ -857,7 +856,7 @@ var getDataFromHtml = function getDataFromHtml(html, containers) {
 
 	var json = {
 		title: fakeDom.querySelector('title').innerText,
-		pageClass: fakeDom.querySelector('#swupBody').className,
+		pageClass: fakeDom.querySelector('body').className,
 		originalContent: html,
 		blocks: blocks
 	};

diff --git a/dist/swup.min.js b/dist/swup.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "swup",
-  "version": "2.0.7",
+  "version": "2.0.8",
   "description": "Complete, flexible, extensible and easy to use page transition library for your web.",
   "main": "lib/index.js",
   "scripts": {

diff --git a/src/helpers/getDataFromHtml.js b/src/helpers/getDataFromHtml.js
@@ -1,9 +1,8 @@
 import { queryAll } from '../utils';
 
 const getDataFromHtml = (html, containers) => {
-	let content = html.replace('<body', '<div id="swupBody"').replace('</body>', '</div>');
-	let fakeDom = document.createElement('div');
-	fakeDom.innerHTML = content;
+	let fakeDom = document.createElement('html');
+	fakeDom.innerHTML = html;
 	let blocks = [];
 
 	for (let i = 0; i < containers.length; i++) {
@@ -20,7 +19,7 @@ const getDataFromHtml = (html, containers) => {
 
 	const json = {
 		title: fakeDom.querySelector('title').innerText,
-		pageClass: fakeDom.querySelector('#swupBody').className,
+		pageClass: fakeDom.querySelector('body').className,
 		originalContent: html,
 		blocks: blocks
 	};