fix (menubar): filename regression

This commit is contained in:
MickaelK 2024-12-29 19:14:01 +11:00
parent 4baeae2f59
commit 0a2f3c6b3c
8 changed files with 25 additions and 29 deletions

View file

@ -12,16 +12,16 @@ import { renderMenubar, buttonDownload } from "./component_menubar.js";
import { ICON } from "./common_icon.js";
import { formatTimecode } from "./common_player.js";
import { transition, getFilename, getDownloadUrl } from "./common.js";
import { transition } from "./common.js";
const STATUS_PLAYING = "PLAYING";
const STATUS_PAUSED = "PAUSED";
const STATUS_BUFFERING = "BUFFERING";
export default function(render) {
export default function(render, { getFilename, getDownloadUrl }) {
const $page = createElement(`
<div class="component_audioplayer">
<component-menubar></component-menubar>
<component-menubar filename="${getFilename()}"></component-menubar>
<div class="audioplayer_container">
<div class="audioplayer_box">
<div data-bind="loader" class="hidde">

View file

@ -5,15 +5,14 @@ import { loadCSS } from "../../helpers/loader.js";
import t from "../../locales/index.js";
import ctrlError from "../ctrl_error.js";
import { transition, getFilename, getDownloadUrl } from "./common.js";
import { transition } from "./common.js";
import "../../components/icon.js";
import "./component_menubar.js";
export default async function(render, { acl$ }) {
export default async function(render, { acl$, getFilename, getDownloadUrl }) {
const $page = createElement(`
<div class="component_filedownloader">
<component-menubar></component-menubar>
<component-menubar filename="${getFilename()}"></component-menubar>
<div class="download_button no-select">
<a download="${getFilename()}" href="${getDownloadUrl()}">${t("DOWNLOAD")}</a>
<component-icon name="loading" class="hidden"></component-icon>

View file

@ -6,14 +6,12 @@ import { loadJS, loadCSS } from "../../helpers/loader.js";
import { createLoader } from "../../components/loader.js";
import ctrlError from "../ctrl_error.js";
import { getFilename, getDownloadUrl } from "./common.js";
import { renderMenubar, buttonDownload } from "./component_menubar.js";
export default function(render) {
export default function(render, { getFilename, getDownloadUrl }) {
const $page = createElement(`
<div class="component_ebookviewer">
<component-menubar></component-menubar>
<component-menubar filename="${getFilename()}"></component-menubar>
<div class="ebookviewer_container" data-bind="epub"></div>
</div>
`);

View file

@ -11,7 +11,6 @@ import t from "../../locales/index.js";
import ctrlError from "../ctrl_error.js";
import ctrlDownloader, { init as initDownloader } from "./application_downloader.js";
import { getFilename, getDownloadUrl } from "./common.js";
import { $ICON } from "./common_fab.js";
import { cat, save } from "./model_files.js";
@ -21,10 +20,10 @@ import "../../components/icon.js";
const TIME_BEFORE_ABORT_EDIT = 5000;
export default async function(render, { acl$ }) {
export default async function(render, { acl$, getFilename, getDownloadUrl }) {
const $page = createElement(`
<div class="component_ide">
<component-menubar class="hidden"></component-menubar>
<component-menubar filename="${getFilename()}" class="hidden"></component-menubar>
<div class="component_editor hidden"></div>
<button is="component-fab" class="hidden"></button>
</div>

View file

@ -16,10 +16,10 @@ import "./component_menubar.js";
import "../../components/icon.js";
import "../../components/fab.js";
export default function(render, { acl$ }) {
export default function(render, { acl$, getFilename }) {
const $page = createElement(`
<div class="component_formviewer">
<component-menubar></component-menubar>
<component-menubar filename="${getFilename()}"></component-menubar>
<div class="formviewer_container hidden">
<form class="sticky box"></form>
</div>

View file

@ -11,17 +11,17 @@ import t from "../../locales/index.js";
import ctrlError from "../ctrl_error.js";
import { Chromecast } from "../../model/chromecast.js";
import { transition, getFilename, getDownloadUrl } from "./common.js";
import { transition } from "./common.js";
import componentMetadata, { init as initMetadata } from "./application_image_metadata.js";
import componentPager, { init as initPager } from "./component_pager.js";
import { renderMenubar, buttonDownload, buttonFullscreen } from "./component_menubar.js";
export default function(render) {
export default function(render, { getFilename, getDownloadUrl }) {
const $page = createElement(`
<div class="component_imageviewer">
<component-menubar></component-menubar>
<component-menubar filename="${getFilename()}"></component-menubar>
<div class="component_image_container">
<div class="images_wrapper">
<img class="photo idle hidden" src="${getDownloadUrl()}&size=${window.innerWidth}">

View file

@ -6,22 +6,22 @@ import { loadCSS, loadJS } from "../../helpers/loader.js";
import { join } from "../../lib/path.js";
import ctrlError from "../ctrl_error.js";
import { transition, getFilename, getDownloadUrl } from "./common.js";
import { transition } from "./common.js";
import { renderMenubar, buttonDownload } from "./component_menubar.js";
import "../../components/icon.js";
const hasNativePDF = "application/pdf" in window.navigator.mimeTypes && !!window.chrome;
export default async function(render) {
export default async function(render, opts) {
const ctrl = hasNativePDF ? ctrlPDFNative : ctrlPDFJs;
ctrl(render);
ctrl(render, opts);
}
function ctrlPDFNative(render) {
function ctrlPDFNative(render, { getFilename, getDownloadUrl }) {
const $page = createElement(`
<div class="component_pdfviewer">
<component-menubar></component-menubar>
<component-menubar filename="${getFilename()}"></component-menubar>
<div data-bind="pdf">
<embed
class="hidden"
@ -43,10 +43,10 @@ function ctrlPDFNative(render) {
));
}
async function ctrlPDFJs(render) {
async function ctrlPDFJs(render, { getFilename, getDownloadUrl }) {
const $page = createElement(`
<div class="component_pdfviewer">
<component-menubar></component-menubar>
<component-menubar filename="${getFilename()}"></component-menubar>
<div data-bind="pdf"></div>
</div>
`);

View file

@ -10,7 +10,7 @@ import Hls from "../../lib/vendor/hlsjs/hls.js";
import ctrlError from "../ctrl_error.js";
import { transition, getFilename, getDownloadUrl } from "./common.js";
import { transition } from "./common.js";
import { formatTimecode } from "./common_player.js";
import { ICON } from "./common_icon.js";
import { renderMenubar, buttonDownload, buttonFullscreen } from "./component_menubar.js";
@ -21,10 +21,10 @@ const STATUS_PLAYING = "PLAYING";
const STATUS_PAUSED = "PAUSED";
const STATUS_BUFFERING = "BUFFERING";
export default function(render, { mime }) {
export default function(render, { mime, getFilename, getDownloadUrl }) {
const $page = createElement(`
<div class="component_videoplayer">
<component-menubar></component-menubar>
<component-menubar filename="${getFilename()}"></component-menubar>
<div class="video_container">
<span>
<div class="video_screen video-state-pause is-casting-no">