From 80ea598ec298f9d14a06afc20964b8afd187ee19 Mon Sep 17 00:00:00 2001 From: Gazook89 <58999374+Gazook89@users.noreply.github.com> Date: Thu, 16 Sep 2021 19:59:54 -0500 Subject: [PATCH] match brewRenderer.jsx output to printPage.jsx output --- client/homebrew/brewRenderer/brewRenderer.jsx | 21 +++++++++---------- client/homebrew/pages/printPage/printPage.jsx | 9 ++++++-- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/client/homebrew/brewRenderer/brewRenderer.jsx b/client/homebrew/brewRenderer/brewRenderer.jsx index 260dbdf13..ad767ad9f 100644 --- a/client/homebrew/brewRenderer/brewRenderer.jsx +++ b/client/homebrew/brewRenderer/brewRenderer.jsx @@ -188,7 +188,6 @@ const BrewRenderer = createClass({ : null} style={{ width: '100%', height: '100%', visibility: this.state.visibility }} contentDidMount={this.frameDidMount}>
- -
- {/* Apply CSS from Style tab and render pages from Markdown tab */} - {this.state.isMounted - && - <> - {this.renderStyle()} + + {/* Apply CSS from Style tab and render pages from Markdown tab */} + {this.state.isMounted + && + <> + {this.renderStyle()} +
{this.renderPages()} - - } -
+
+ + } {this.renderPageInfo()} diff --git a/client/homebrew/pages/printPage/printPage.jsx b/client/homebrew/pages/printPage/printPage.jsx index e083bd98d..909adc1a9 100644 --- a/client/homebrew/pages/printPage/printPage.jsx +++ b/client/homebrew/pages/printPage/printPage.jsx @@ -35,6 +35,11 @@ const PrintPage = createClass({ if(this.props.query.dialog) window.print(); }, + renderStyle : function() { + if(!this.props.brew.style) return; + return
${this.props.brew.style} ` }} />; + }, + renderPages : function(){ if(this.props.brew.renderer == 'legacy') { return _.map(this.state.brewText.split('\\page'), (pageText, index)=>{ @@ -62,8 +67,8 @@ const PrintPage = createClass({ {/* Apply CSS from Style tab */} -
${this.props.brew.style} ` }} /> -
+ {this.renderStyle()} +
{this.renderPages()}
;