fixed conditional noFrame class in div#frame

Tobias Kiertscher · Tobias Kiertscher · commit 42444a19374e · 2020-01-16T15:26:24.000Z
diff --git a/assets/template.default.html b/assets/template.default.html
@@ -16,7 +16,7 @@
     $header-includes$
 </head>
 <body>
-<div id="frame" $if(toc)$$else$="" class="no-toc" $endif$="">
+<div id="frame"$if(toc)$$else$ class="no-toc"$endif$>
     <header>
         $include-before$
         <h1 id="title">$title$</h1>
@@ -62,4 +62,4 @@ <h1 id="title">$title$</h1>
     </footer>$endif$
 </div>
 </body>
-</html>
+</html>
diff --git a/assets/template.metro.html b/assets/template.metro.html
@@ -16,7 +16,7 @@
     $header-includes$
 </head>
 <body>
-<div id="frame" $if(toc)$$else$="" class="no-toc" $endif$="">
+<div id="frame"$if(toc)$$else$ class="no-toc"$endif$>
     <header>
         $include-before$
         <h1 id="title">$title$</h1>
@@ -62,4 +62,4 @@ <h1 id="title">$title$</h1>
     </footer>$endif$
 </div>
 </body>
-</html>
+</html>
diff --git a/assets/template.roboto.html b/assets/template.roboto.html
@@ -16,7 +16,7 @@
     $header-includes$
 </head>
 <body>
-<div id="frame" $if(toc)$$else$="" class="no-toc" $endif$="">
+<div id="frame"$if(toc)$$else$ class="no-toc"$endif$>
     <header>
         $include-before$
         <h1 id="title">$title$</h1>
@@ -62,4 +62,4 @@ <h1 id="title">$title$</h1>
     </footer>$endif$
 </div>
 </body>
-</html>
+</html>
diff --git a/assets/template.science.html b/assets/template.science.html
@@ -16,7 +16,7 @@
     $header-includes$
 </head>
 <body>
-<div id="frame" $if(toc)$$else$="" class="no-toc" $endif$="">
+<div id="frame"$if(toc)$$else$ class="no-toc"$endif$>
     <header>
         $include-before$
         <h1 id="title">$title$</h1>
@@ -62,4 +62,4 @@ <h1 id="title">$title$</h1>
     </footer>$endif$
 </div>
 </body>
-</html>
+</html>
diff --git a/gulpfile.js b/gulpfile.js
@@ -34,9 +34,14 @@ var setTemplateStyle = function (html, opts) {
 
 var insertLangAttribute = function (html) {
     'use strict';
-    return html.replace('<html>', '<html$if(lang)$ lang="$lang$"$endif$>');
+    return html.replace('<html>', '<html$$if(lang)$$ lang="$$lang$$"$$endif$$>');
 };
 
+var insertNoFrameClass = function (html) {
+    'use strict';
+    return html.replace('<div id="frame">', '<div id="frame"$$if(toc)$$$$else$$ class="no-toc"$$endif$$>');
+}
+
 gulp.task('clean', function () {
     'use strict';
     return del([tempDir + '**']);
@@ -74,10 +79,12 @@ gulp.task('build_html_template', function () {
     return merge(findStyles().map(function (style) {
         var styleSetter = textTransformation(setTemplateStyle, { style: style });
         var langInserter = textTransformation(insertLangAttribute);
+        var noFrameInserter = textTransformation(insertNoFrameClass);
         return gulp.src('template.html', { cwd: tempDir })
             .pipe(styleSetter())
             .pipe(htinliner())
             .pipe(langInserter())
+            .pipe(noFrameInserter())
             .pipe(rename('template.' + style + '.html'))
             .pipe(gulp.dest('assets/'));
     }));
diff --git a/src/template.html b/src/template.html
@@ -14,7 +14,7 @@
     $header-includes$
 </head>
 <body>
-<div id="frame"$if(toc)$$else$ class="no-toc"$endif$>
+<div id="frame">
     <header>
         $include-before$
         <h1 id="title">$title$</h1>
