Zhizhen He 3 éve
szülő
commit
7fdb9aaffb

+ 5 - 5
src/main/frontend/components/settings.cljs

@@ -357,11 +357,11 @@
           logical-outdenting?
           config-handler/toggle-logical-outdenting!))
 
-(defn perferred-pasting-file [t perferred-pasting-file?]
+(defn preferred-pasting-file [t preferred-pasting-file?]
   (toggle "preferred_pasting_file"
           (t :settings-page/preferred-pasting-file)
-          perferred-pasting-file?
-          config-handler/toggle-perferred-pasting-file!))
+          preferred-pasting-file?
+          config-handler/toggle-preferred-pasting-file!))
 
 (defn tooltip-row [t enable-tooltip?]
   (toggle "enable_tooltip"
@@ -572,7 +572,7 @@
         enable-timetracking? (state/enable-timetracking?)
         enable-all-pages-public? (state/all-pages-public?)
         logical-outdenting? (state/logical-outdenting?)
-        perferred-pasting-file? (state/perferred-pasting-file?)
+        preferred-pasting-file? (state/preferred-pasting-file?)
         enable-tooltip? (state/enable-tooltip?)
         enable-shortcut-tooltip? (state/sub :ui/shortcut-tooltip?)
         show-brackets? (state/show-brackets?)
@@ -586,7 +586,7 @@
      (show-brackets-row t show-brackets?)
      (when (util/electron?) (switch-spell-check-row t))
      (outdenting-row t logical-outdenting?)
-     (perferred-pasting-file t perferred-pasting-file?)
+     (preferred-pasting-file t preferred-pasting-file?)
      (when-not (or (util/mobile?) (mobile-util/native-platform?))
        (shortcut-tooltip-row t enable-shortcut-tooltip?))
      (when-not (or (util/mobile?) (mobile-util/native-platform?))

+ 3 - 3
src/main/frontend/handler/config.cljs

@@ -48,6 +48,6 @@
   (let [enable-tooltip? (state/enable-tooltip?)]
     (set-config! :ui/enable-tooltip? (not enable-tooltip?))))
 
-(defn toggle-perferred-pasting-file! []
-  (let [perferred-pasting-file? (state/perferred-pasting-file?)]
-    (set-config! :editor/perferred-pasting-file? (not perferred-pasting-file?))))
+(defn toggle-preferred-pasting-file! []
+  (let [preferred-pasting-file? (state/preferred-pasting-file?)]
+    (set-config! :editor/preferred-pasting-file? (not preferred-pasting-file?))))

+ 1 - 1
src/main/frontend/handler/conversion.cljs

@@ -100,7 +100,7 @@
      {:status        :informal | :breaking | :unreachable
       :target        the new file name
       :old-title     the old title
-      :chagned-title the new title} | nil"
+      :changed-title the new title} | nil"
   [page path old-format new-format]
   (let [prop-title (get-in page [:block/properties :title])
         file-body  (gp-util/path->file-body path)

+ 4 - 4
src/main/frontend/handler/editor.cljs

@@ -2409,7 +2409,7 @@
       (scroll-to-block sibling-block)
       (state/exit-editing-and-set-selected-blocks! [sibling-block]))))
 
-(defn- move-cross-boundrary-up-down
+(defn- move-cross-boundary-up-down
   [direction]
   (let [input (state/get-input)
         line-pos (util/get-first-or-last-line-pos input)
@@ -2448,14 +2448,14 @@
 
       (or (and up? (cursor/textarea-cursor-first-row? input))
           (and down? (cursor/textarea-cursor-last-row? input)))
-      (move-cross-boundrary-up-down direction)
+      (move-cross-boundary-up-down direction)
 
       :else
       (if up?
         (cursor/move-cursor-up input)
         (cursor/move-cursor-down input)))))
 
-(defn- move-to-block-when-cross-boundrary
+(defn- move-to-block-when-cross-boundary
   [direction]
   (let [up? (= :left direction)
         pos (if up? :max 0)
@@ -2491,7 +2491,7 @@
 
         (or (and left? (cursor/start? input))
             (and right? (cursor/end? input)))
-        (move-to-block-when-cross-boundrary direction)
+        (move-to-block-when-cross-boundary direction)
 
         :else
         (if left?

+ 1 - 1
src/main/frontend/handler/paste.cljs

@@ -204,5 +204,5 @@
                                           (util/stop e))))]
            (cond
              (and (string/blank? text) (string/blank? html)) (paste-file-if-exist)
-             (and (seq files) (state/perferred-pasting-file?)) (paste-file-if-exist)
+             (and (seq files) (state/preferred-pasting-file?)) (paste-file-if-exist)
              :else (paste-text-or-blocks-aux input e text html))))))))

+ 1 - 1
src/main/frontend/handler/plugin_config.cljs

@@ -125,7 +125,7 @@ returns map of plugins to install and uninstall"
     (js/window.apis.addListener "lsp-installed" listener)))
 
 (defn start
-  "This component has just one reponsibility on start, to create a plugins.edn
+  "This component has just one responsibility on start, to create a plugins.edn
   if none exists"
   []
   (create-plugin-config-file-if-not-exists))

+ 1 - 1
src/main/frontend/handler/repo.cljs

@@ -244,7 +244,7 @@
                                               :file/content)]
                      (repo-config-handler/read-repo-config repo-url content))
                    (state/get-config repo-url))
-        ;; NOTE: Use config while parsing. Make sure it's the corrent journal title format
+        ;; NOTE: Use config while parsing. Make sure it's the current journal title format
         _ (state/set-config! repo-url config)
         relate-path-fn (fn [m k]
                          (some-> (get m k)

+ 1 - 1
src/main/frontend/handler/repo_config.cljs

@@ -57,7 +57,7 @@
    (set-repo-config-state! repo-url config-content)))
 
 (defn start
-  "This component only has one reponsibility on start, to manage db and ui state
+  "This component only has one responsibility on start, to manage db and ui state
   from repo config. It does not manage the repo directory, logseq/, as that is
   loosely done by repo-handler"
   [{:keys [repo]}]

+ 2 - 2
src/main/frontend/handler/whiteboard.cljs

@@ -178,7 +178,7 @@
      (create-new-whiteboard-page! nil))))
 
 (defn- get-whiteboard-blocks
-  "Given a page, return all the logseq blocks (exlude all shapes)"
+  "Given a page, return all the logseq blocks (exclude all shapes)"
   [page-name]
   (let [blocks (model/get-page-blocks-no-cache page-name)]
     (remove gp-whiteboard/shape-block? blocks)))
@@ -261,4 +261,4 @@
           (clone-whiteboard-from-edn edn api)
           (state/set-onboarding-whiteboard! true))
         (p/catch
-         (fn [e] (js/console.warn "Faield to populate onboarding whiteboard" e))))))
+         (fn [e] (js/console.warn "Failed to populate onboarding whiteboard" e))))))

+ 6 - 6
src/main/frontend/state.cljs

@@ -308,7 +308,7 @@
 (declare get-current-repo sub set-state!)
 
 (defn merge-configs
-  "Merges user configs in given orders. All values are overriden except for maps
+  "Merges user configs in given orders. All values are overridden except for maps
   which are merged."
   [& configs]
   (apply merge-with
@@ -646,9 +646,9 @@ Similar to re-frame subscriptions"
   []
   (:editor/logical-outdenting? (sub-config)))
 
-(defn perferred-pasting-file?
+(defn preferred-pasting-file?
   []
-  (:editor/perferred-pasting-file? (sub-config)))
+  (:editor/preferred-pasting-file? (sub-config)))
 
 (defn doc-mode-enter-for-new-line?
   []
@@ -1545,11 +1545,11 @@ Similar to re-frame subscriptions"
     (if-let [tldraw-app (active-tldraw-app)]
       (let [last-time (:block/updated-at whiteboard-page)
             now (util/time-ms)
-            ellapsed (- now last-time)
+            elapsed (- now last-time)
             select-idle (.. tldraw-app (isIn "select.idle"))
             tool-idle (.. tldraw-app -selectedTool (isIn "idle"))]
-        (or (and select-idle (>= ellapsed select-idle-ms))
-            (and (not select-idle) tool-idle (>= ellapsed tool-idle-ms))))
+        (or (and select-idle (>= elapsed select-idle-ms))
+            (and (not select-idle) tool-idle (>= elapsed tool-idle-ms))))
       true)))
 
 (defn set-nfs-refreshing!

+ 2 - 2
src/main/frontend/util.cljc

@@ -742,7 +742,7 @@
           (filter (fn [b] (some? (gobj/get b "offsetParent")))))))
 
 #?(:cljs
-   (defn remove-embeded-blocks [blocks]
+   (defn remove-embedded-blocks [blocks]
      (->> blocks
           (remove (fn [b] (= "true" (d/attr b "data-embed")))))))
 
@@ -822,7 +822,7 @@
    (defn get-prev-block-non-collapsed-non-embed
      [block]
      (when-let [blocks (->> (get-blocks-noncollapse)
-                            remove-embeded-blocks)]
+                            remove-embedded-blocks)]
        (let [block-id (.-id block)
              block-ids (mapv #(.-id %) blocks)]
          (when-let [index (.indexOf block-ids block-id)]

+ 2 - 2
src/main/frontend/util/fs.cljs

@@ -149,7 +149,7 @@
                        (remove-boundary-slashes)
                        ;; Windows reserved path characters
                        (string/replace #"[:\\*\\?\"<>|]+" "_")
-                       ;; for android filesystem compatiblity
+                       ;; for android filesystem compatibility
                        (string/replace #"[\\#|%]+" "_")
                        (normalize))]
       (string/replace page #"/" "."))))
@@ -161,7 +161,7 @@
   (let [url-encode #(some-> % str (js/encodeURIComponent) (.replace "+" "%20"))]
     (some-> page-name
             gp-util/page-name-sanity
-             ;; for android filesystem compatiblity
+             ;; for android filesystem compatibility
             (string/replace #"[\\#|%]+" url-encode)
              ;; Windows reserved path characters
             (string/replace #"[:\\*\\?\"<>|]+" url-encode)

+ 2 - 2
src/test/frontend/handler/repo_conversion_test.cljs

@@ -115,7 +115,7 @@
 
   (query-assertions-v067 db files))
 
-(defn- converst-to-triple-lowbar
+(defn- convert-to-triple-lowbar
   [path]
   (let [original-body (gp-util/path->file-body path)
         ;; only test file name parsing, don't consider title prop overriding
@@ -139,7 +139,7 @@
         _ (docs-graph-helper/clone-docs-repo-if-not-exists graph-dir "v0.6.7")
         files (gp-cli/build-graph-files graph-dir)
         ;; Converting the v0.6.7 ver docs graph under the old namespace naming rule to the new one (:repo/dir-version 0->3)
-        files (convert-graph-files-path files converst-to-triple-lowbar)
+        files (convert-graph-files-path files convert-to-triple-lowbar)
         _ (repo-handler/parse-files-and-load-to-db! test-helper/test-db files {:re-render? false :verbose false})
         db (conn/get-db test-helper/test-db)]
 

+ 1 - 1
src/test/frontend/test/node_test_runner.cljs

@@ -138,7 +138,7 @@ returns selected tests and namespaces to run"
     :multi true
     :update-fn conj
     :desc "Exclude tests that have this keyword"]
-   ;; --test is long name for compatability with older runner
+   ;; --test is long name for compatibility with older runner
    ["-v" "--test VAR" "Fully qualified var to test"
     :id :vars
     :default #{}