Bladeren bron

Merge branch 'master' into feat/chrome-native-fs

Tienson Qin 5 jaren geleden
bovenliggende
commit
c239892b69
2 gewijzigde bestanden met toevoegingen van 3 en 3 verwijderingen
  1. 1 2
      src/main/frontend/components/repo.cljs
  2. 2 1
      src/main/frontend/fs.cljs

+ 1 - 2
src/main/frontend/components/repo.cljs

@@ -43,7 +43,6 @@
              (ui/button
               (t :open-a-directory)
               :on-click nfs-handler/ls-dir-files))]
-
           (for [{:keys [id url] :as repo} repos]
             (let [local? (config/local-db? url)]
               [:div.flex.justify-between.mb-1 {:key id}
@@ -134,7 +133,7 @@
                        [:p (t :git/push-failed)]
                        (and should-push? (seq changed-files))
                        [:div.changes
-                        [:ul
+                        [:ul.overflow-y-scroll {:style {:max-height 250}}
                          (for [file changed-files]
                            [:li {:key (str "sync-" file)}
                             [:div.flex.flex-row.justify-between.align-items

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

@@ -98,7 +98,8 @@
       (->
        (p/let [handle (idb/get-item (str "handle" dir))
                _ (idb/remove-item! handle-path)]
-         (.removeEntry ^js handle basename)
+         (when handle
+           (.removeEntry ^js handle basename))
          (remove-nfs-file-handle! handle-path))
        (p/catch (fn [error]
                   (log/error :unlink/path {:path path