self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-07-13 00:10:37 +02:00
Code Issues Releases Activity

Fixes #979 (#980)

Browse Source 
* Adds functionality to display tags under the open note.

Towards #469

Signed-off-by: Abijeet <abijeetpatro@gmail.com>

* Ensured tags in the dialog box and under the note appear in the same order.

Few formatting tweaks.

Signed-off-by: Abijeet <abijeetpatro@gmail.com>

* Fixes issues raised during code review.

Signed-off-by: Abijeet <abijeetpatro@gmail.com>

* Refactored code to always display tags in ascending order.

This changes the order of the tags in the dialog box and below the tag title.

Signed-off-by: Abijeet <abijeetpatro@gmail.com>

* Added the new tag height and margin bottom to the bottomRowHeight

Fixes #979

Signed-off-by: Abijeet <abijeetpatro@gmail.com>
This commit is contained in:
Abijeet Patro
2018-11-17 16:51:57 +05:30
committed by Laurent Cozic
parent 7f6ca1e527
commit 7bfc3e1256
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ElectronClient/app/gui/NoteText.jsx
View File

@ -472,7 +472,7 @@ class NoteTextComponent extends React.Component {
// Since I'm updating the state, the componentWillReceiveProps was getting triggered again, where nextProps.newNote was still true, causing reloadNote to trigger again and again. // Since I'm updating the state, the componentWillReceiveProps was getting triggered again, where nextProps.newNote was still true, causing reloadNote to trigger again and again.
// Notes from Laurent: The selected note tags are part of the global Redux state because they need to be updated whenever tags are changed or deleted // Notes from Laurent: The selected note tags are part of the global Redux state because they need to be updated whenever tags are changed or deleted
// anywhere in the app. Thus it's not possible simple to load the tags here (as we won't have a way to know if they're updated afterwards). // anywhere in the app. Thus it's not possible simple to load the tags here (as we won't have a way to know if they're updated afterwards).
// Perhaps a better way would be to move that code in the middleware, check for TAGS_DELETE, TAGS_UPDATE, etc. actions and update the // Perhaps a better way would be to move that code in the middleware, check for TAGS_DELETE, TAGS_UPDATE, etc. actions and update the
// selected note tags accordingly. // selected note tags accordingly.
if (!this.props.newNote) { if (!this.props.newNote) {
this.props.dispatch({ this.props.dispatch({
@ -942,7 +942,7 @@ class NoteTextComponent extends React.Component {
} else { } else {
shim.fsDriver().writeFile(path, data, 'buffer'); shim.fsDriver().writeFile(path, data, 'buffer');
} }
// Refresh the webview, restoring the previous content // Refresh the webview, restoring the previous content
this.lastSetHtml_ = ''; this.lastSetHtml_ = '';
this.forceUpdate(); this.forceUpdate();
@ -1434,9 +1434,10 @@ class NoteTextComponent extends React.Component {
const tagStyle = { const tagStyle = {
marginBottom: 10, marginBottom: 10,
height: 30
}; };
const bottomRowHeight = rootStyle.height - titleBarStyle.height - titleBarStyle.marginBottom - titleBarStyle.marginTop - theme.toolbarHeight; const bottomRowHeight = rootStyle.height - titleBarStyle.height - titleBarStyle.marginBottom - titleBarStyle.marginTop - theme.toolbarHeight - tagStyle.height - tagStyle.marginBottom;
const viewerStyle = { const viewerStyle = {
width: Math.floor(innerWidth / 2), width: Math.floor(innerWidth / 2),