testing

rdsnyder · Sep 7, 2024 · 62ee92c · 62ee92c
1 parent cfa3bd5
commit 62ee92c
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 16 deletions.
diff --git a/ghp-lib.js b/ghp-lib.js
@@ -986,6 +986,13 @@ function isJunctureV1(contentEl) {
   return contentEl.querySelector('param[ve-config]') ? true : false
 }
 
+function getContent() {
+  console.log('getContent')
+  console.log('config.content', window.config.content)
+  console.log('document.body.children[0].innerHTML', document.body.children[0].innerHTML)
+  return window.config.content || document.body.children[0].innerHTML
+}
+
 // set the configuration
 function setConfig() {
   window.config = {
@@ -1084,7 +1091,7 @@ function articleFromHtml(html) {
 
 // mount the content
 function mount(mountPoint, html) {
-  html = html || window.config.content || document.body.innerHTML
+  html = html || getContent()
   mountPoint = mountPoint || document.querySelector('body > article, body > main, body > section') 
   if (!mountPoint) {
     mountPoint = document.createElement('article')

diff --git a/wb/index.html b/wb/index.html
@@ -72,7 +72,7 @@
 
       let easyMDE
 
-      console.log('referrer:', referrer.hostname )
+      // console.log('referrer:', referrer.hostname )
       if (!sourceArg && referrer?.hostname === 'github.com') {
         // redirect to editor with source query if referrer is a markdown file
         let [acct, repo, branch, ...path] = referrer.pathname.split('/').filter(pe => pe && pe !== 'blob' && pe !== 'tree')

diff --git a/wc/dist/js/ghp-lib.js b/wc/dist/js/ghp-lib.js
@@ -1,5 +1,3 @@
-// 1
-
 import { marked } from "https://cdn.jsdelivr.net/npm/marked/lib/marked.esm.js";
 import 'https://cdn.jsdelivr.net/npm/marked-footnote/dist/index.umd.min.js'
 import * as yaml from 'https://cdn.jsdelivr.net/npm/[email protected]/browser/index.min.js'
@@ -15,14 +13,14 @@ const isMobile = ('ontouchstart' in document.documentElement && /mobi/i.test(nav
 window.customEntityData = {}
 
 function addLink(attrs) {
-  console.log('addLink', attrs)
+  // console.log('addLink', attrs)
   let stylesheet = document.createElement('link')
   Object.entries(attrs).map(([key, value]) => stylesheet.setAttribute(key, value))
   document.head.appendChild(stylesheet)
 }
 
 function addScript(attrs) {
-  console.log('addScript', attrs)
+  // console.log('addScript', attrs)
   let script = document.createElement('script')
   Object.entries(attrs).map(([key, value]) => script.setAttribute(key, value))
   document.head.appendChild(script)
@@ -514,10 +512,10 @@ function restructure(rootEl) {
   } else {
     header = main.querySelector('ve-header')
     if (header) {
-      let toRemove = header
-      while (toRemove.parentElement.tagName !== 'MAIN') toRemove = toRemove.parentElement 
+      // let toRemove = header
+      // while (toRemove.parentElement.tagName !== 'MAIN') toRemove = toRemove.parentElement 
       article.appendChild(header)
-      toRemove.remove()
+      // toRemove.remove()
     }
   }
 
@@ -988,9 +986,15 @@ function isJunctureV1(contentEl) {
   return contentEl.querySelector('param[ve-config]') ? true : false
 }
 
+function getContent() {
+  console.log('getContent')
+  console.log('config.content', window.config.content)
+  console.log('document.body.children[0].innerHTML', document.body.children[0].innerHTML)
+  return window.config.content || document.body.children[0].innerHTML
+}
+
 // set the configuration
 function setConfig() {
-  console.log('setConfig', window.jekyll)
   window.config = {
     ...yaml.parse(window.options || ''), 
     ...(window.jekyll || {}), 
@@ -1011,7 +1015,7 @@ function setConfig() {
   let contentEl = document.createElement('main')
   contentEl.innerHTML = window.config.content || document.body.innerHTML
   window.config.isJunctureV1 = isJunctureV1(contentEl)
-  console.log(window.config)
+  // console.log(window.config)
 }
 
 function readMoreSetup() {
@@ -1087,7 +1091,7 @@ function articleFromHtml(html) {
 
 // mount the content
 function mount(mountPoint, html) {
-  html = html || window.config.content || document.body.innerHTML
+  html = html || getContent()
   mountPoint = mountPoint || document.querySelector('body > article, body > main, body > section') 
   if (!mountPoint) {
     mountPoint = document.createElement('article')

diff --git a/wc/dist/js/ghp.js b/wc/dist/js/ghp.js
@@ -1,12 +1,10 @@
-// 1
-
 import { addLink, addScript, articleFromHtml, getGhFile, getMarkdown, markdownToHtml, mode, mount, setConfig, structureContent } from './ghp-lib.js'
 
 const base = mode === 'prod'
   ? import.meta.url.replace(/\/js\/ghp\.js$/, '')
   : import.meta.url.replace(/\/ghp\.js$/, '/wc/dist')
 
-console.log(`mode=${mode} base=${base}`)
+// console.log(`mode=${mode} base=${base}`)
 
 if (!window.config) setConfig()
 

diff --git a/wc/dist/js/index.js b/wc/dist/js/index.js