Include template/script.js into preprocessing pipeline; provide group…

… clearfix method on relevant CSS templates, upgrade gulpfile and pagy-template along with meta::version property.
swzzl-com · Sep 19, 2019 · 9b4a9d0 · 9b4a9d0
1 parent 810456d
commit 9b4a9d0
Show file tree

Hide file tree

Showing 7 changed files with 65 additions and 15 deletions.
diff --git a/crust/gulpfile.js b/crust/gulpfile.js
@@ -15,7 +15,7 @@
   const del = r('del')
   const delayed = r('delayed')
 
-  // Preprocessors / Transpilers 
+  // Preprocessors / Transpilers
   const haml = r('gulp-haml')
   const markdown = r('gulp-markdown')
   const sass = r('gulp-sass')
@@ -64,9 +64,9 @@
     done()
   }))
 
-  //*************************************//
-  //************ Book Indexer ***********//
-  //*************************************//
+  // *************************************//
+  // ************ Book Indexer ***********//
+  // *************************************//
 
   gulp.task('indexPage', (done) => {
     indexPageHandler()
@@ -109,16 +109,18 @@
     const scriptPath = path.join('.', 'build', 'manuscript', page, 'script.js')
     const stylePath = path.join('.', 'build', 'manuscript', page, 'style.css')
     const templateStylePath = path.join('.', 'build', 'templates', 'style.css')
-    const templateHeadPath = path.join('.', 'build', 'templates', 'head.html')
+		const templateHeadPath = path.join('.', 'build', 'templates', 'head.html')
+		const templateScriptPath = path.join('.', 'build', 'templates', 'script.js')
 
     let bodyContent = ''
     let styleContent = ''
-    let templateStyleContent = ''
     let scriptContent = ''
     let headContent = ''
     let templateHeadContent = ''
+		let templateScriptContent = ''
+    let templateStyleContent = ''
 
-    // TODO: Use promises here?
+		// TODO: Use promises here?
 
     if (fs.existsSync(bodyPath)) {
       bodyContent = fs.readFileSync(bodyPath, 'utf-8').toString()
@@ -138,9 +140,14 @@
     }
     if (fs.existsSync(scriptPath)) {
       scriptContent = fs.readFileSync(scriptPath, 'utf-8').toString()
+		}
+
+    if (fs.existsSync(templateScriptPath)) {
+      templateScriptContent = fs.readFileSync(templateScriptPath, 'utf-8').toString()
     }
 
-    const pageTemplateData = { bodyContent, templateStyleContent, styleContent, headContent, templateHeadContent, scriptContent }
+
+    const pageTemplateData = { bodyContent, templateStyleContent, styleContent, headContent, templateHeadContent, scriptContent, templateScriptContent }
 
     gulp.src(path.join('.', 'crust', 'page-template.html'))
       .pipe(handlebars(pageTemplateData, {}))
@@ -188,7 +195,7 @@
         page = paths[paths.length - 1]
       } else {
         page = paths[paths.length - 2]
-      }      
+      }
     });
 
     globWatcher.on('add', function (pagePath, stats) {

diff --git a/crust/page-template.html b/crust/page-template.html
@@ -1,9 +1,9 @@
 <!doctype html>
 <html lang="en">
 <head>
-  <meta charset="UTF-8">
+	<meta charset="UTF-8">
+	<meta property="bkz-version" content="1.0.1">
   {{{ templateHeadContent }}}
-
   {{{ headContent }}}
   <style>
     {{{ templateStyleContent }}}
@@ -12,6 +12,7 @@
 </head>
 <body>
   {{{ bodyContent }}}
-  <script>{{{ scriptContent }}}</script>
+	<script> ((document, undefined) => { {{{ scriptContent }}} })(document)</script>
+	<script> ((document, undefined) => { {{{ templateScriptContent }}} })(document)</script>
 </body>
-</html>
+</html>
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bookiza",
-  "version": "2.8.15",
+  "version": "2.9.15",
   "description": "The book reification framework for the web",
   "logo": {
     "file": "./assets/images/bookiza.png"

diff --git a/templates/blank/style.css b/templates/blank/style.css
@@ -1,4 +1,4 @@
-/* 
+/*
 
 See how a working CSS template at https://github.com/bookiza/templates
 

diff --git a/templates/novel/style.css b/templates/novel/style.css
@@ -244,6 +244,20 @@ hr::before {
   color: black;
 }
 
+/* Clearfix*/
+.group:before, .group:after {
+  content: "";
+  display: table;
+}
+
+.group:after {
+  clear: both;
+}
+
+.group {
+  zoom: 1; /* For IE 6/7 (trigger hasLayout) */
+}
+
 
 /* Page specific wrapper classes. */
 

diff --git a/templates/novella/style.css b/templates/novella/style.css
@@ -244,6 +244,20 @@ hr::before {
   color: black;
 }
 
+/* Clearfix*/
+.group:before, .group:after {
+  content: "";
+  display: table;
+}
+
+.group:after {
+  clear: both;
+}
+
+.group {
+  zoom: 1; /* For IE 6/7 (trigger hasLayout) */
+}
+
 
 /* Page specific wrapper classes. */
 

diff --git a/templates/text/style.css b/templates/text/style.css
@@ -244,6 +244,20 @@ hr::before {
   color: black;
 }
 
+/* Clearfix*/
+.group:before, .group:after {
+  content: "";
+  display: table;
+}
+
+.group:after {
+  clear: both;
+}
+
+.group {
+  zoom: 1; /* For IE 6/7 (trigger hasLayout) */
+}
+
 
 /* Page specific wrapper classes. */
-Original file line number
+Diff line change
@@ -1,4 +1,4 @@
-    /*
+    /*
     See how a working CSS template at https://github.com/bookiza/templates
@@ Expand Down @@