From 03d14cc5e33749018139cd4fa6a97d5842372297 Mon Sep 17 00:00:00 2001 From: Cihad Horuzoglu Date: Thu, 5 Nov 2020 17:07:12 +0300 Subject: [PATCH 1/3] Update core.ts --- src/core.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core.ts b/src/core.ts index e1af5bb..ee74c3c 100644 --- a/src/core.ts +++ b/src/core.ts @@ -180,7 +180,7 @@ export class Core extends Module { } private static getFragmentContainerSelector(fragment: IPageFragmentConfig, partial: string) { - return partial === "main" ? `[puzzle-fragment="${fragment.name}"]` : `[puzzle-fragment="${fragment.name}"][fragment-partial="${partial}"]`; + return partial === "main" ? `[puzzle-fragment="${fragment.name}"]:not([fragment-partial])` : `[puzzle-fragment="${fragment.name}"][fragment-partial="${partial}"]`; } private static prepareQueryString(fragmentAttributes: Record) { From fc683662ec4d2000cffe51b6f6b1b016e8a42144 Mon Sep 17 00:00:00 2001 From: Cihad Horuzoglu Date: Thu, 5 Nov 2020 17:11:32 +0300 Subject: [PATCH 2/3] Update core.ts --- src/core.ts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/core.ts b/src/core.ts index ee74c3c..9c9a76b 100644 --- a/src/core.ts +++ b/src/core.ts @@ -169,7 +169,7 @@ export class Core extends Module { if (!key.startsWith('$')) { const container = document.querySelector(this.getFragmentContainerSelector(fragment, key)); if (container) { - this.setEvalInnerHtml(container, res[key]); + this.setEvalInnerHtml(container, res[key],container.tagName === "meta"); } } }); @@ -195,7 +195,12 @@ export class Core extends Module { return Object.keys(attributes).reduce((query: string, key: string) => `${query}&${key}=${attributes[key]}`, '?__renderMode=stream'); } - private static setEvalInnerHtml(elm: any, html: any) { + private static setEvalInnerHtml(elm: any, html: any, meta?: boolean) { + if(meta){ + elm.outerHTML = html; + return; + } + elm.innerHTML = html; Array.from(elm.querySelectorAll("script")).forEach((oldScript: any) => { const newScript = document.createElement("script"); From 694726834ea8da37e5319cb67a3f9b1d7a221f18 Mon Sep 17 00:00:00 2001 From: Cihad Horuzoglu Date: Thu, 5 Nov 2020 17:11:54 +0300 Subject: [PATCH 3/3] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 724853e..069436a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@puzzle-js/client-lib", "main": "dist/index.js", - "version": "1.3.2", + "version": "1.3.3", "author": "", "license": "MIT", "repository": {