Backup_Repos/filestash
1
0
Fork 0
mirror of https://github.com/mickael-kerjean/filestash synced 2025-12-09 18:03:15 +01:00
Code Issues Projects Releases Wiki Activity

fix (imageviewer): reuse link builder

Browse source
This commit is contained in:
MickaelK 2025-05-16 13:09:58 +10:00
parent cdd0f3567a
commit 9d1aeb956b
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
public/assets/pages/filespage/ctrl_filesystem.js
View file

@ -349,7 +349,7 @@ export function init() {
]); ]);
} }
function createLink(file, currentPath) { export function createLink(file, currentPath) {
let path = file.path; let path = file.path;
if (!path) path = currentPath + file.name + (file.type === "directory" ? "/" : ""); if (!path) path = currentPath + file.name + (file.type === "directory" ? "/" : "");
let link = file.type === "directory" ? "files" + path : "view" + path; let link = file.type === "directory" ? "files" + path : "view" + path;

6
public/assets/pages/viewerpage/application_image/pagination.js
View file

@ -1,13 +1,14 @@
import { createFragment } from "../../../lib/skeleton/index.js"; import { createFragment } from "../../../lib/skeleton/index.js";
import rxjs, { effect } from "../../../lib/rx.js"; import rxjs, { effect } from "../../../lib/rx.js";
import { qs } from "../../../lib/dom.js"; import { qs } from "../../../lib/dom.js";
import { join } from "../../../lib/path.js"; import { join, forwardURLParams } from "../../../lib/path.js";
import { animate, slideXOut } from "../../../lib/animate.js"; import { animate, slideXOut } from "../../../lib/animate.js";
import { loadCSS } from "../../../helpers/loader.js"; import { loadCSS } from "../../../helpers/loader.js";
import { get as getConfig } from "../../../model/config.js"; import { get as getConfig } from "../../../model/config.js";
import { getCurrentPath, getFilename } from "../common.js"; import { getCurrentPath, getFilename } from "../common.js";
import { getMimeType } from "../mimetype.js"; import { getMimeType } from "../mimetype.js";
import { createLink } from "../../filespage/ctrl_filesystem.js";
import fscache from "../../filespage/cache.js"; import fscache from "../../filespage/cache.js";
import { sort } from "../../filespage/helper.js"; import { sort } from "../../filespage/helper.js";
import { getState$ as getParams$, init as initParams } from "../../filespage/state_config.js"; import { getState$ as getParams$, init as initParams } from "../../filespage/state_config.js";
@ -93,7 +94,8 @@ function updateDOM({ $el, name, $img }) {
$link.setAttribute("data-link", "true"); $link.setAttribute("data-link", "true");
$link.click(); $link.click();
}; };
$link.setAttribute("href", "/view" + join(location, getCurrentPath() + "/../" + name)); // TODO: name with "#" issue const { link } = createLink({ name }, join(location, getCurrentPath() + "/../"));
$link.setAttribute("href", forwardURLParams(link, ["share", "canary"]));
$el.classList.remove("hidden"); $el.classList.remove("hidden");
} }