@@ -145,19 +140,24 @@ export default {
},
computed: {
...mapState(["req", "selected", "selectedCount"]),
- ...mapGetters(["isListing"]),
+ ...mapGetters(["isListing", "selectedCount"]),
url() {
if (!this.isListing) {
return this.$route.path;
}
-
- if (this.selectedCount === 0 || this.selectedCount > 1) {
- // This shouldn't happen.
- return;
+ if (this.selectedCount != 1) {
+ // selecting current view image
+ return this.$route.path;
}
-
return this.req.items[this.selected[0]].url;
},
+ getContext() {
+ let path = this.$route.path.replace("/files/", "./");
+ if (this.selectedCount == 1) {
+ path = path + this.req.items[this.selected[0]].name;
+ }
+ return path;
+ },
},
async beforeMount() {
try {
@@ -226,9 +226,7 @@ export default {
return api.getShareURL(share);
},
hasDownloadLink() {
- return (
- this.selected.length === 1 && !this.req.items[this.selected[0]].isDir
- );
+ return this.selected.length === 1 && !this.req.items[this.selected[0]].isDir;
},
buildDownloadLink(share) {
return pub_api.getDownloadURL(share);
diff --git a/frontend/src/components/prompts/ShareDelete.vue b/frontend/src/components/prompts/ShareDelete.vue
index cdc242c6..00781d32 100644
--- a/frontend/src/components/prompts/ShareDelete.vue
+++ b/frontend/src/components/prompts/ShareDelete.vue
@@ -25,16 +25,15 @@
@@ -19,16 +18,14 @@ import Vue from "vue";
import { mapState, mapGetters, mapMutations } from "vuex";
import { users, files as api } from "@/api";
import url from "@/utils/url";
-import HeaderBar from "@/components/header/HeaderBar.vue";
import Action from "@/components/header/Action.vue";
import * as upload from "@/utils/upload";
import css from "@/utils/css";
-import throttle from "lodash.throttle";
+import throttle from "@/utils/throttle";
export default {
- name: "listing",
+ name: "listingView",
components: {
- HeaderBar,
Action,
},
data: function () {
@@ -38,14 +35,15 @@ export default {
dragCounter: 0,
width: window.innerWidth,
itemWeight: 0,
- viewModes: ['list', 'compact', 'normal', 'gallery'],
+ viewModes: ["list", "compact", "normal", "gallery"],
};
},
+
computed: {
...mapState(["req", "selected", "user", "show", "multiple", "selected", "loading"]),
...mapGetters(["selectedCount"]),
isSettings() {
- return this.$route.path.includes("/settings/")
+ return this.$route.path.includes("/settings/");
},
nameSorted() {
return this.req.sorting.by === "name";
@@ -128,9 +126,6 @@ export default {
},
watch: {
req: function () {
- // Reset the show value
- this.showLimit = 50;
-
// Ensures that the listing is displayed
Vue.nextTick(() => {
// How much every listing item affects the window height
@@ -155,7 +150,9 @@ export default {
window.addEventListener("keydown", this.keyEvent);
window.addEventListener("scroll", this.scrollEvent);
window.addEventListener("resize", this.windowsResize);
-
+ if (this.$route.path.startsWith("/share")) {
+ return;
+ }
if (!this.user.perm.create) return;
document.addEventListener("dragover", this.preventDefault);
document.addEventListener("dragenter", this.dragEnter);
@@ -370,7 +367,7 @@ export default {
let columns = Math.floor(
document.querySelector("main").offsetWidth / this.columnWidth
);
- let items = css(["#listing .item", "#listing .item"]);
+ let items = css(["#listingView .item", "#listingView .item"]);
if (columns === 0) columns = 1;
items.style.width = `calc(${100 / columns}% - 1em)`;
},
@@ -539,7 +536,7 @@ export default {
this.width = window.innerWidth;
// Listing element is not displayed
- if (this.$refs.listing == null) return;
+ if (this.$refs.listingView == null) return;
// How much every listing item affects the window height
this.setItemWeight();
@@ -571,8 +568,9 @@ export default {
});
},
close() {
- if (this.isSettings) { // Use this.isSettings to access the computed property
- this.$router.push({ path: "/files/" }, () => { });
+ if (this.isSettings) {
+ // Use this.isSettings to access the computed property
+ this.$router.push({ path: "/files/" }, () => {});
this.$store.commit("closeHovers");
return;
}
@@ -592,13 +590,13 @@ export default {
},
setItemWeight() {
// Listing element is not displayed
- if (this.$refs.listing == null) return;
+ if (this.$refs.listingView == null) return;
let itemQuantity = this.req.numDirs + this.req.numFiles;
if (itemQuantity > this.showLimit) itemQuantity = this.showLimit;
// How much every listing item affects the window height
- this.itemWeight = this.$refs.listing.offsetHeight / itemQuantity;
+ this.itemWeight = this.$refs.listingView.offsetHeight / itemQuantity;
},
fillWindow(fit = false) {
const totalItems = this.req.numDirs + this.req.numFiles;
diff --git a/frontend/src/views/bars/EditorBar.vue b/frontend/src/views/bars/EditorBar.vue
index 0a7fa2db..c2305fb0 100644
--- a/frontend/src/views/bars/EditorBar.vue
+++ b/frontend/src/views/bars/EditorBar.vue
@@ -1,10 +1,15 @@
-
+
+
+
@@ -28,13 +32,11 @@ import { eventBus } from "@/main";
import buttons from "@/utils/buttons";
import url from "@/utils/url";
-import HeaderBar from "@/components/header/HeaderBar";
import Action from "@/components/header/Action";
export default {
name: "editorBar",
components: {
- HeaderBar,
Action,
},
data: function () {
@@ -113,4 +115,4 @@ export default {
},
},
};
-
\ No newline at end of file
+
diff --git a/frontend/src/views/bars/ListingBar.vue b/frontend/src/views/bars/ListingBar.vue
index d4a73611..e96e8440 100644
--- a/frontend/src/views/bars/ListingBar.vue
+++ b/frontend/src/views/bars/ListingBar.vue
@@ -1,5 +1,5 @@
-
+
+
@@ -28,18 +28,15 @@
import Vue from "vue";
import { mapState, mapGetters, mapMutations } from "vuex";
import { users, files as api } from "@/api";
-import HeaderBar from "@/components/header/HeaderBar.vue";
import Action from "@/components/header/Action.vue";
import * as upload from "@/utils/upload";
import css from "@/utils/css";
-import throttle from "lodash.throttle";
+import throttle from "@/utils/throttle";
import Search from "@/components/Search.vue";
-
export default {
- name: "listing",
+ name: "listingView",
components: {
- HeaderBar,
Action,
Search,
},
@@ -50,12 +47,12 @@ export default {
dragCounter: 0,
width: window.innerWidth,
itemWeight: 0,
- viewModes: ['list', 'compact', 'normal', 'gallery'],
+ viewModes: ["list", "compact", "normal", "gallery"],
};
},
computed: {
...mapState(["req", "selected", "user", "show", "multiple", "selected", "loading"]),
- ...mapGetters(["selectedCount"]),
+ ...mapGetters(["selectedCount", "currentPrompt"]),
nameSorted() {
return this.req.sorting.by === "name";
},
@@ -164,7 +161,7 @@ export default {
window.addEventListener("keydown", this.keyEvent);
window.addEventListener("scroll", this.scrollEvent);
window.addEventListener("resize", this.windowsResize);
-
+ if (!this.user) return
if (!this.user.perm.create) return;
document.addEventListener("dragover", this.preventDefault);
document.addEventListener("dragenter", this.dragEnter);
@@ -192,7 +189,7 @@ export default {
this.$emit("action");
},
toggleSidebar() {
- if (this.$store.state.show == "sidebar") {
+ if (this.currentPrompt?.prompt === "sidebar") {
this.$store.commit("closeHovers");
} else {
this.$store.commit("showHover", "sidebar");
@@ -379,7 +376,7 @@ export default {
let columns = Math.floor(
document.querySelector("main").offsetWidth / this.columnWidth
);
- let items = css(["#listing .item", "#listing .item"]);
+ let items = css(["#listingView .item", "#listingView .item"]);
if (columns === 0) columns = 1;
items.style.width = `calc(${100 / columns}% - 1em)`;
},
@@ -548,7 +545,7 @@ export default {
this.width = window.innerWidth;
// Listing element is not displayed
- if (this.$refs.listing == null) return;
+ if (this.$refs.listingView == null) return;
// How much every listing item affects the window height
this.setItemWeight();
@@ -592,13 +589,13 @@ export default {
},
setItemWeight() {
// Listing element is not displayed
- if (this.$refs.listing == null) return;
+ if (this.$refs.listingView == null) return;
let itemQuantity = this.req.numDirs + this.req.numFiles;
if (itemQuantity > this.showLimit) itemQuantity = this.showLimit;
// How much every listing item affects the window height
- this.itemWeight = this.$refs.listing.offsetHeight / itemQuantity;
+ this.itemWeight = this.$refs.listingView.offsetHeight / itemQuantity;
},
fillWindow(fit = false) {
const totalItems = this.req.numDirs + this.req.numFiles;
diff --git a/frontend/src/views/files/Editor.vue b/frontend/src/views/files/Editor.vue
index 955f5ef2..8357a7c4 100644
--- a/frontend/src/views/files/Editor.vue
+++ b/frontend/src/views/files/Editor.vue
@@ -81,7 +81,6 @@ export default {
},
methods: {
handleEditorValueRequest() {
- console.log("trying to save");
try {
api.put(this.$route.path, this.editor.getValue());
} catch (e) {
diff --git a/frontend/src/views/files/Listing.vue b/frontend/src/views/files/ListingView.vue
similarity index 96%
rename from frontend/src/views/files/Listing.vue
rename to frontend/src/views/files/ListingView.vue
index 0cbf72bd..425f3729 100644
--- a/frontend/src/views/files/Listing.vue
+++ b/frontend/src/views/files/ListingView.vue
@@ -1,5 +1,5 @@
-
+
{{ selectedCount }} selected
@@ -87,7 +87,12 @@
multiple
/>
-