From 8a55658bd743fae00bf3243323ef10d8577817d9 Mon Sep 17 00:00:00 2001 From: Trevor Buckner Date: Tue, 28 May 2024 16:11:18 -0400 Subject: [PATCH] Rename `printPage` function to `printCurrentBrew()` Avoid confusion with other "page" components. --- client/homebrew/brewRenderer/brewRenderer.jsx | 4 ++-- client/homebrew/navbar/print.navitem.jsx | 4 ++-- client/homebrew/pages/editPage/editPage.jsx | 4 ++-- client/homebrew/pages/newPage/newPage.jsx | 4 ++-- client/homebrew/pages/sharePage/sharePage.jsx | 4 ++-- shared/helpers.js | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/client/homebrew/brewRenderer/brewRenderer.jsx b/client/homebrew/brewRenderer/brewRenderer.jsx index 624bc2aeb..6a4040b4d 100644 --- a/client/homebrew/brewRenderer/brewRenderer.jsx +++ b/client/homebrew/brewRenderer/brewRenderer.jsx @@ -13,7 +13,7 @@ const RenderWarnings = require('homebrewery/renderWarnings/renderWarnings.jsx'); const NotificationPopup = require('./notificationPopup/notificationPopup.jsx'); const Frame = require('react-frame-component').default; const dedent = require('dedent-tabs').default; -const { printPage } = require('../../../shared/helpers.js'); +const { printCurrentBrew } = require('../../../shared/helpers.js'); const DOMPurify = require('dompurify'); const purifyConfig = { FORCE_BODY: true, SANITIZE_DOM: false }; @@ -163,7 +163,7 @@ const BrewRenderer = (props)=>{ const handleControlKeys = (e)=>{ if(!(e.ctrlKey || e.metaKey)) return; const P_KEY = 80; - if(e.keyCode == P_KEY && props.allowPrint) printPage(); + if(e.keyCode == P_KEY && props.allowPrint) printCurrentBrew(); if(e.keyCode == P_KEY) { e.stopPropagation(); e.preventDefault(); diff --git a/client/homebrew/navbar/print.navitem.jsx b/client/homebrew/navbar/print.navitem.jsx index a573b1069..f80c1aa66 100644 --- a/client/homebrew/navbar/print.navitem.jsx +++ b/client/homebrew/navbar/print.navitem.jsx @@ -1,9 +1,9 @@ const React = require('react'); const Nav = require('naturalcrit/nav/nav.jsx'); -const { printPage } = require('../../../shared/helpers.js'); +const { printCurrentBrew } = require('../../../shared/helpers.js'); module.exports = function(){ - return + return get PDF ; }; diff --git a/client/homebrew/pages/editPage/editPage.jsx b/client/homebrew/pages/editPage/editPage.jsx index 0b3c10a57..20282f9b5 100644 --- a/client/homebrew/pages/editPage/editPage.jsx +++ b/client/homebrew/pages/editPage/editPage.jsx @@ -23,7 +23,7 @@ const BrewRenderer = require('../../brewRenderer/brewRenderer.jsx'); const Markdown = require('naturalcrit/markdown.js'); const { DEFAULT_BREW_LOAD } = require('../../../../server/brewDefaults.js'); -const { printPage } = require('../../../../shared/helpers.js'); +const { printCurrentBrew } = require('../../../../shared/helpers.js'); const googleDriveIcon = require('../../googleDrive.svg'); @@ -96,7 +96,7 @@ const EditPage = createClass({ const S_KEY = 83; const P_KEY = 80; if(e.keyCode == S_KEY) this.trySave(true); - if(e.keyCode == P_KEY) printPage(); + if(e.keyCode == P_KEY) printCurrentBrew(); if(e.keyCode == P_KEY || e.keyCode == S_KEY){ e.stopPropagation(); e.preventDefault(); diff --git a/client/homebrew/pages/newPage/newPage.jsx b/client/homebrew/pages/newPage/newPage.jsx index 8c785de0a..f2525c425 100644 --- a/client/homebrew/pages/newPage/newPage.jsx +++ b/client/homebrew/pages/newPage/newPage.jsx @@ -19,7 +19,7 @@ const Editor = require('../../editor/editor.jsx'); const BrewRenderer = require('../../brewRenderer/brewRenderer.jsx'); const { DEFAULT_BREW } = require('../../../../server/brewDefaults.js'); -const { printPage } = require('../../../../shared/helpers.js'); +const { printCurrentBrew } = require('../../../../shared/helpers.js'); const BREWKEY = 'homebrewery-new'; const STYLEKEY = 'homebrewery-new-style'; @@ -91,7 +91,7 @@ const NewPage = createClass({ const S_KEY = 83; const P_KEY = 80; if(e.keyCode == S_KEY) this.save(); - if(e.keyCode == P_KEY) printPage(); + if(e.keyCode == P_KEY) printCurrentBrew(); if(e.keyCode == P_KEY || e.keyCode == S_KEY){ e.stopPropagation(); e.preventDefault(); diff --git a/client/homebrew/pages/sharePage/sharePage.jsx b/client/homebrew/pages/sharePage/sharePage.jsx index d29308b4e..9695ee810 100644 --- a/client/homebrew/pages/sharePage/sharePage.jsx +++ b/client/homebrew/pages/sharePage/sharePage.jsx @@ -12,7 +12,7 @@ const Account = require('../../navbar/account.navitem.jsx'); const BrewRenderer = require('../../brewRenderer/brewRenderer.jsx'); const { DEFAULT_BREW_LOAD } = require('../../../../server/brewDefaults.js'); -const { printPage } = require('../../../../shared/helpers.js'); +const { printCurrentBrew } = require('../../../../shared/helpers.js'); const SharePage = createClass({ displayName : 'SharePage', @@ -34,7 +34,7 @@ const SharePage = createClass({ if(!(e.ctrlKey || e.metaKey)) return; const P_KEY = 80; if(e.keyCode == P_KEY){ - if(e.keyCode == P_KEY) printPage(); + if(e.keyCode == P_KEY) printCurrentBrew(); e.stopPropagation(); e.preventDefault(); } diff --git a/shared/helpers.js b/shared/helpers.js index 724832485..8ca185046 100644 --- a/shared/helpers.js +++ b/shared/helpers.js @@ -17,7 +17,7 @@ const splitTextStyleAndMetadata = (brew)=>{ } }; -const printPage = ()=>{ +const printCurrentBrew = ()=>{ if(window.typeof !== 'undefined') { window.frames['BrewRenderer'].contentWindow.print(); //Force DOM reflow; Print dialog causes a repaint, and @media print CSS somehow makes out-of-view pages disappear @@ -30,5 +30,5 @@ const printPage = ()=>{ module.exports = { splitTextStyleAndMetadata, - printPage + printCurrentBrew };