Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: wrong logbook creation #4382

Merged
merged 14 commits into from Mar 2, 2022
Merged

Conversation

llcc
Copy link
Contributor

@llcc llcc commented Feb 25, 2022

  1. Fix time track in markdown header block. close Can't track time in a block with markdown header #4389.
  2. Fix marker toggle in markdown header block. close Can't toggle marker in markdown header #4387
  3. Fix wrong logbook creation if DOING/NOW marker exists in center of block. close LOGBOOK is generated in WARNING Admonition #3746, only show the first property, caused by the logbook drawer produced by a block have the "DOING" string #4381

@llcc llcc requested a review from andelf February 25, 2022 10:27
Copy link
Collaborator

@logseq-cldwalker logseq-cldwalker left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@llcc Confirmed this fixes the first two bugs/enhancements! 👍 🚢 There's some minor feedback in marker.cljs to think about

src/main/frontend/util/marker.cljs Outdated Show resolved Hide resolved
src/main/frontend/handler/editor.cljs Show resolved Hide resolved
src/main/frontend/util/marker.cljs Outdated Show resolved Hide resolved
@llcc llcc requested a review from cnrpman March 2, 2022 02:57
@tiensonqin
Copy link
Contributor

@llcc It seems that bumping mldoc made the CI tests fail, I've updated yarn.lock in the master branch. Rebase on master should fix it.

src/main/frontend/commands.cljs Outdated Show resolved Hide resolved
src/main/frontend/util/marker.cljs Outdated Show resolved Hide resolved
Copy link
Collaborator

@cnrpman cnrpman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@llcc llcc force-pushed the fix-wrong-logbook-creation branch from 4e4b3c7 to f90fca1 Compare March 2, 2022 06:38
@logseq-cldwalker logseq-cldwalker merged commit 174f3d4 into master Mar 2, 2022
@logseq-cldwalker logseq-cldwalker deleted the fix-wrong-logbook-creation branch March 2, 2022 15:01
logseq-cldwalker added a commit that referenced this pull request Mar 2, 2022
No need to have set-marker impl copied with with-redefs. Move tests to
its corresponding test ns
logseq-cldwalker added a commit that referenced this pull request Mar 3, 2022
…ook-creation

Dev: Rewrite tests from #4382 to use with-redefs
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants