f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-01-06 12:12:42 +00:00
Code Wiki Activity

Merge branch 'master' into brew_themes_user_selection

Browse Source
This commit is contained in:
David Bolack
2024-06-13 15:15:30 -05:00
parent 6464f35ce9 552a23585b
commit 0945a5e47e
15 changed files with 760 additions and 705 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/homebrew/pages/editPage/editPage.jsx
View File

@@ -20,6 +20,8 @@ const SplitPane = require('naturalcrit/splitPane/splitPane.jsx');
const Editor = require('../../editor/editor.jsx');
const BrewRenderer = require('../../brewRenderer/brewRenderer.jsx');
const LockNotification = require('./lockNotification/lockNotification.jsx');
const Markdown = require('naturalcrit/markdown.js');
const { DEFAULT_BREW_LOAD } = require('../../../../server/brewDefaults.js');
@@ -53,7 +55,8 @@ const EditPage = createClass({
autoSaveWarning : false,
unsavedTime : new Date(),
currentEditorPage : 0,
userThemes : this.props.brew.userThemes
userThemes : this.props.brew.userThemes,
displayLockMessage : this.props.brew.lock || false
};
},
@@ -394,6 +397,7 @@ const EditPage = createClass({
{this.renderNavbar()}
<div className='content'>
{this.props.brew.lock && <LockNotification shareId={this.props.brew.shareId} message={this.props.brew.lock.editMessage} />}
<SplitPane onDragFinish={this.handleSplitMove}>
<Editor
ref={this.editor}