fix for multiple style tags in yml2xml.js

RevelDigital · Dec 21, 2023 · 0dc1342 · 0dc1342
1 parent c29652e
commit 0dc1342
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/projects/reveldigital/player-client/package-lock.json b/projects/reveldigital/player-client/package-lock.json
diff --git a/projects/reveldigital/player-client/package.json b/projects/reveldigital/player-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@reveldigital/player-client",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "description": "Helper library for interfacing Angular apps with the Revel Digital player",
   "scripts": {
     "build": "tsc -p tsconfig.schematics.json",
@@ -36,4 +36,4 @@
     "copyfiles": "file:../../../node_modules/copyfiles",
     "typescript": "file:../../../node_modules/typescript"
   }
-}
+}
diff --git a/projects/reveldigital/player-client/schematics/ng-add/utils/yml2xml.js b/projects/reveldigital/player-client/schematics/ng-add/utils/yml2xml.js
@@ -101,7 +101,7 @@ function processYML(json, html) {
   module.ele('Content', { type: 'html' }).ele({
     '$':
       htmlRoot.querySelector('style').toString() +
-      htmlRoot.querySelector('link').toString() +
+      htmlRoot.querySelectorAll('head > link[rel=stylesheet]').join('').toString() +
       htmlRoot.querySelector('body').toString()
   });
 

diff --git a/projects/test-app/utils/yml2xml.js b/projects/test-app/utils/yml2xml.js
@@ -52,7 +52,8 @@ function processYML(json, html) {
         display_name: val.display_name,
         datatype: val.datatype,
         default_value: val.default_value,
-        required: !!val.required
+        required: !!val.required,
+        multiple: !!val.multiple
       });
       if (val.datatype === 'enum') {
         for (let option of val.options) {
@@ -99,7 +100,7 @@ function processYML(json, html) {
   module.ele('Content', { type: 'html' }).ele({
     '$':
       htmlRoot.querySelector('style').toString() +
-      htmlRoot.querySelector('link').toString() +
+      htmlRoot.querySelectorAll('head > link[rel=stylesheet]').join('').toString() +
       htmlRoot.querySelector('body').toString()
   });