|
|
@@ -30,66 +30,78 @@
|
|
|
[f]
|
|
|
(fn [e]
|
|
|
(when-not (state/editing?)
|
|
|
- (f e))))
|
|
|
+ (f e) true)))
|
|
|
+
|
|
|
+(defn enable-when-editing-mode!
|
|
|
+ [f]
|
|
|
+ (fn [e]
|
|
|
+ (when (state/editing?)
|
|
|
+ (f e) true)))
|
|
|
|
|
|
(def shortcut state/get-shortcut)
|
|
|
|
|
|
(def re-index! #(repo-handler/re-index! nfs-handler/rebuild-index!))
|
|
|
|
|
|
(defonce chords
|
|
|
- {
|
|
|
- ;; non-editing mode
|
|
|
- (or (shortcut :editor/toggle-document-mode) "t d")
|
|
|
- (enable-when-not-editing-mode! state/toggle-document-mode!)
|
|
|
- (or (shortcut :ui/toggle-theme) "t t")
|
|
|
- (enable-when-not-editing-mode! state/toggle-theme!)
|
|
|
- (or (shortcut :ui/toggle-right-sidebar) "t r")
|
|
|
- (enable-when-not-editing-mode! ui-handler/toggle-right-sidebar!)
|
|
|
- (or (shortcut :ui/toggle-new-block) "t e")
|
|
|
- (enable-when-not-editing-mode! state/toggle-new-block-shortcut!)
|
|
|
- (or (shortcut :ui/show-contents) "t c")
|
|
|
- [(enable-when-not-editing-mode! ui-handler/toggle-contents!) true]
|
|
|
- (or (shortcut :ui/toggle-between-page-and-file) "s")
|
|
|
- (enable-when-not-editing-mode! route-handler/toggle-between-page-and-file!)
|
|
|
- (or (shortcut :git/commit) "c")
|
|
|
- (enable-when-not-editing-mode! (git-handler/show-commit-modal! commit/add-commit-message))
|
|
|
- "tab" (-> (editor-handler/on-tab :right)
|
|
|
- enable-when-not-editing-mode!)
|
|
|
- "shift+tab" (-> (editor-handler/on-tab :left)
|
|
|
- enable-when-not-editing-mode!)
|
|
|
+ (-> {;; non-editing mode
|
|
|
+ (or (shortcut :editor/toggle-document-mode) "t d")
|
|
|
+ (enable-when-not-editing-mode! state/toggle-document-mode!)
|
|
|
+ (or (shortcut :ui/toggle-theme) "t t")
|
|
|
+ (enable-when-not-editing-mode! state/toggle-theme!)
|
|
|
+ (or (shortcut :ui/toggle-right-sidebar) "t r")
|
|
|
+ (enable-when-not-editing-mode! ui-handler/toggle-right-sidebar!)
|
|
|
+ (or (shortcut :ui/toggle-new-block) "t e")
|
|
|
+ (enable-when-not-editing-mode! state/toggle-new-block-shortcut!)
|
|
|
+ (or (shortcut :ui/show-contents) "t c")
|
|
|
+ [(enable-when-not-editing-mode! ui-handler/toggle-contents!) true]
|
|
|
+ (or (shortcut :ui/toggle-between-page-and-file) "s")
|
|
|
+ (enable-when-not-editing-mode! route-handler/toggle-between-page-and-file!)
|
|
|
+ (or (shortcut :git/commit) "c")
|
|
|
+ (enable-when-not-editing-mode! (git-handler/show-commit-modal! commit/add-commit-message))
|
|
|
+ "tab" (-> (editor-handler/on-tab :right)
|
|
|
+ enable-when-not-editing-mode!)
|
|
|
+ "shift+tab" (-> (editor-handler/on-tab :left)
|
|
|
+ enable-when-not-editing-mode!)
|
|
|
|
|
|
- (or (shortcut :editor/undo) "mod+z") [history-handler/undo! true]
|
|
|
- (or (shortcut :editor/redo) "mod+y") [history-handler/redo! true]
|
|
|
- (or (shortcut :editor/redo) "mod+shift+z") [history-handler/redo! true]
|
|
|
- (or (shortcut :go/search) "mod+u") [route-handler/go-to-search! true]
|
|
|
- (or (shortcut :go/journals) (if util/mac? "mod+j" "alt+j")) [route-handler/go-to-journals! true]
|
|
|
- (or (shortcut :editor/zoom-in)
|
|
|
- (if util/mac? "mod+." "alt+right")) [editor-handler/zoom-in! true]
|
|
|
- (or (shortcut :editor/zoom-out)
|
|
|
- (if util/mac? "mod+," "alt+left")) [editor-handler/zoom-out! true]
|
|
|
- (or (shortcut :editor/cycle-todo)
|
|
|
- "mod+enter") [editor-handler/cycle-todo! true]
|
|
|
- (or (shortcut :editor/expand-block-children) "mod+down") [editor-handler/expand! true]
|
|
|
- (or (shortcut :editor/collapse-block-children) "mod+up") [editor-handler/collapse! true]
|
|
|
- (or (shortcut :editor/follow-link) "mod+o") [editor-handler/follow-link-under-cursor! true]
|
|
|
- (or (shortcut :editor/open-link-in-sidebar) "mod+shift+o") [editor-handler/open-link-in-sidebar! true]
|
|
|
- (or (shortcut :editor/bold) "mod+b") [editor-handler/bold-format! true]
|
|
|
- (or (shortcut :editor/italics) "mod+i") [editor-handler/italics-format! true]
|
|
|
- (or (shortcut :editor/highlight) "mod+h") [editor-handler/highlight-format! true]
|
|
|
- (or (shortcut :editor/insert-link) "mod+k") [editor-handler/html-link-format! true]
|
|
|
- (or (shortcut :editor/select-all-blocks) "mod+shift+a") [editor-handler/select-all-blocks! true]
|
|
|
- (or (shortcut :editor/move-block-up) (if util/mac? "mod+shift+up" "alt+shift+up")) [(fn [state e] (editor-handler/move-up-down e true)) true]
|
|
|
- (or (shortcut :editor/move-block-down) (if util/mac? "mod+shift+down" "alt+shift+down")) [(fn [state e] (editor-handler/move-up-down e false)) true]
|
|
|
- (or (shortcut :editor/save) "mod+s") [editor-handler/save! true]
|
|
|
+ (or (shortcut :editor/undo) "mod+z") [history-handler/undo! true]
|
|
|
+ (or (shortcut :editor/redo) "mod+y") [history-handler/redo! true]
|
|
|
+ (or (shortcut :editor/redo) "mod+shift+z") [history-handler/redo! true]
|
|
|
+ (or (shortcut :go/search) "mod+u") [route-handler/go-to-search! true]
|
|
|
+ (or (shortcut :go/journals) (if util/mac? "mod+j" "alt+j")) [route-handler/go-to-journals! true]
|
|
|
+ (or (shortcut :editor/zoom-in)
|
|
|
+ (if util/mac? "mod+." "alt+right")) [editor-handler/zoom-in! true]
|
|
|
+ (or (shortcut :editor/zoom-out)
|
|
|
+ (if util/mac? "mod+," "alt+left")) [(fn []
|
|
|
+ ((some-fn apply)
|
|
|
+ (enable-when-editing-mode! editor-handler/zoom-out!)
|
|
|
+ #(if util/mac? (ui-handler/toggle-settings-modal!) true)))
|
|
|
+ true]
|
|
|
+ (or (shortcut :editor/cycle-todo)
|
|
|
+ "mod+enter") [editor-handler/cycle-todo! true]
|
|
|
+ (or (shortcut :editor/expand-block-children) "mod+down") [editor-handler/expand! true]
|
|
|
+ (or (shortcut :editor/collapse-block-children) "mod+up") [editor-handler/collapse! true]
|
|
|
+ (or (shortcut :editor/follow-link) "mod+o") [editor-handler/follow-link-under-cursor! true]
|
|
|
+ (or (shortcut :editor/open-link-in-sidebar) "mod+shift+o") [editor-handler/open-link-in-sidebar! true]
|
|
|
+ (or (shortcut :editor/bold) "mod+b") [editor-handler/bold-format! true]
|
|
|
+ (or (shortcut :editor/italics) "mod+i") [editor-handler/italics-format! true]
|
|
|
+ (or (shortcut :editor/highlight) "mod+h") [editor-handler/highlight-format! true]
|
|
|
+ (or (shortcut :editor/insert-link) "mod+k") [editor-handler/html-link-format! true]
|
|
|
+ (or (shortcut :editor/select-all-blocks) "mod+shift+a") [editor-handler/select-all-blocks! true]
|
|
|
+ (or (shortcut :editor/move-block-up) (if util/mac? "mod+shift+up" "alt+shift+up")) [(fn [state e] (editor-handler/move-up-down e true)) true]
|
|
|
+ (or (shortcut :editor/move-block-down) (if util/mac? "mod+shift+down" "alt+shift+down")) [(fn [state e] (editor-handler/move-up-down e false)) true]
|
|
|
+ (or (shortcut :editor/save) "mod+s") [editor-handler/save! true]
|
|
|
|
|
|
- (or (shortcut :editor/next) "down") (fn [state e] (editor-handler/open-block! true))
|
|
|
- (or (shortcut :editor/prev) "up") (fn [state e] (editor-handler/open-block! false))
|
|
|
+ (or (shortcut :editor/next) "down") (fn [state e] (editor-handler/open-block! true))
|
|
|
+ (or (shortcut :editor/prev) "up") (fn [state e] (editor-handler/open-block! false))
|
|
|
|
|
|
- (or (shortcut :search/re-index) "mod+c mod+s") [search-handler/rebuild-indices! true]
|
|
|
+ (or (shortcut :search/re-index) "mod+c mod+s") [search-handler/rebuild-indices! true]
|
|
|
|
|
|
- (or (shortcut :graph/re-index) "mod+c mod+r") [re-index! true]
|
|
|
+ (or (shortcut :graph/re-index) "mod+c mod+r") [re-index! true]
|
|
|
|
|
|
- (or (shortcut :ui/toggle-brackets) "mod+c mod+b") [config-handler/toggle-ui-show-brackets! true]})
|
|
|
+ (or (shortcut :ui/toggle-brackets) "mod+c mod+b") [config-handler/toggle-ui-show-brackets! true]}
|
|
|
+ (merge
|
|
|
+ (when-not util/mac?
|
|
|
+ {"mod+," [#(ui-handler/toggle-settings-modal!) true]}))))
|
|
|
|
|
|
(defonce bind! (gobj/get mousetrap "bind"))
|
|
|
|
charlie