diff --git a/src/main/frontend/commands.cljs b/src/main/frontend/commands.cljs index d47968fa08..e6be24c6e8 100644 --- a/src/main/frontend/commands.cljs +++ b/src/main/frontend/commands.cljs @@ -237,8 +237,8 @@ ["Upload an asset" [[:editor/click-hidden-file-input :id]] "Upload file types like image, pdf, docx, etc.)"] - (state/deprecated-logged?) - ["Upload an image" [[:editor/click-hidden-file-input :id]]])] + ;; ["Upload an image" [[:editor/click-hidden-file-input :id]]] + )] (markdown-headings) diff --git a/src/main/frontend/dicts.cljc b/src/main/frontend/dicts.cljc index 020475c9d8..2a68ddd76d 100644 --- a/src/main/frontend/dicts.cljc +++ b/src/main/frontend/dicts.cljc @@ -4247,7 +4247,7 @@ :settings "Ayarlar" :settings-of-plugins "Eklenti ayarları" :plugins "Eklentiler" - :themes "Temelar" + :themes "Temalar" :developer-mode-alert "Eklenti sistemini etkinleştirmek için uygulamayı yeniden başlatmanız gerekir. Şimdi yeniden başlatmak istiyor musunuz?" :relaunch-confirm-to-work "Çalışması için uygulama yeniden başlatılmalı. Şimdi yeniden başlatmak istiyor musunuz?" :import "İçeri aktar" diff --git a/src/main/frontend/fs/sync.cljs b/src/main/frontend/fs/sync.cljs index 21b51b4ee1..25e5baf999 100644 --- a/src/main/frontend/fs/sync.cljs +++ b/src/main/frontend/fs/sync.cljs @@ -1544,15 +1544,15 @@ [type {:keys [dir path _content stat] :as _payload}] (when-let [current-graph (state/get-current-repo)] (when (string/ends-with? current-graph dir) - (when-not (some-> (state/get-file-sync-state current-graph) - sync-state--stopped?) - (when (or (:mtime stat) (= type "unlink")) - (go - (let [path (remove-dir-prefix dir path) - files-meta (and (not= "unlink" type) - ( files-meta first :etag))] - (>! local-changes-chan (->FileChangeEvent type dir path stat checksum))))))))) + (let [sync-state (state/get-file-sync-state current-graph)] + (when (and sync-state (not (sync-state--stopped? sync-state))) + (when (or (:mtime stat) (= type "unlink")) + (go + (let [path (remove-dir-prefix dir path) + files-meta (and (not= "unlink" type) + ( files-meta first :etag))] + (>! local-changes-chan (->FileChangeEvent type dir path stat checksum)))))))))) (defn local-changes-revised-chan-builder "return chan" @@ -1976,7 +1976,9 @@ add-history? (update :history add-history-items paths now)))) (defn sync-state--stopped? + "Graph syncing is stopped" [sync-state] + {:pre [(s/valid? ::sync-state sync-state)]} (= ::stop (:state sync-state))) ;;; ### remote->local syncer & local->remote syncer @@ -2712,10 +2714,13 @@ (go ;; stop previous sync ())] all-version-list)))))) -(defn get-current-graph-uuid [] (second @sync/graphs-txid)) (def *wait-syncing-graph (atom nil)) diff --git a/src/main/frontend/state.cljs b/src/main/frontend/state.cljs index 0a30beee90..35e262a1f2 100644 --- a/src/main/frontend/state.cljs +++ b/src/main/frontend/state.cljs @@ -1071,11 +1071,6 @@ [] (:me @state)) -(defn deprecated-logged? - "Whether the user has logged in." - [] - false) - (defn set-db-restoring! [value] (set-state! :db/restoring? value))