extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-18 11:58:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Et2VfsPath: Handle trailing /

Browse Source
This commit is contained in:
nathan 2024-02-06 14:37:30 -07:00
parent 7c50457e2c
commit 7b323d3200
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
api/js/etemplate/Et2Vfs/Et2VfsPath.ts
View File

@ -173,11 +173,20 @@ export class Et2VfsPath extends Et2InputWidget(LitElement)
const dirs = Array.from(event.target.parentElement.querySelectorAll('sl-breadcrumb-item')) ?? []; const dirs = Array.from(event.target.parentElement.querySelectorAll('sl-breadcrumb-item')) ?? [];
let stopIndex = dirs.indexOf(event.target) + 1; let stopIndex = dirs.indexOf(event.target) + 1;
let newPath = dirs.slice(0, stopIndex).map(d => d.textContent); let newPath = dirs.slice(0, stopIndex)
// Strip out any extra space
.map(d => d.textContent.trim().replace(/\/*$/, '').trim() + "/")
.filter(p => p);
if(newPath[0] !== '/')
{
// Make sure we start at /, breadcrumb parsing above might lose it
newPath.unshift('/');
}
if(!(this.disabled || this.readonly)) if(!(this.disabled || this.readonly))
{ {
const oldValue = this.value; const oldValue = this.value;
this.value = newPath.join(""); // No trailing slash in the value
this.value = newPath.join("").replace(/\/*$/, '');
if(oldValue != this.value) if(oldValue != this.value)
{ {
this.updateComplete.then(() => this.updateComplete.then(() =>
@ -204,7 +213,11 @@ export class Et2VfsPath extends Et2InputWidget(LitElement)
const hasHelpTextSlot = this.hasSlotController.test('help-text'); const hasHelpTextSlot = this.hasSlotController.test('help-text');
const hasLabel = this.label ? true : !!hasLabelSlot; const hasLabel = this.label ? true : !!hasLabelSlot;
const hasHelpText = this.helpText ? true : !!hasHelpTextSlot; const hasHelpText = this.helpText ? true : !!hasHelpTextSlot;
const pathParts = this.value === "/" ? [""] : this.value.split('/'); // No trailing slash in the path
const pathParts = this.value === "/" ? [""] : this.value
// Remove trailing /
.replace(/\/*$/, '')
.split('/');
const isEditable = !(this.disabled || this.readonly); const isEditable = !(this.disabled || this.readonly);
const editing = this.editing && isEditable; const editing = this.editing && isEditable;
@ -254,7 +267,9 @@ export class Et2VfsPath extends Et2InputWidget(LitElement)
${repeat(pathParts, (path) => ${repeat(pathParts, (path) =>
{ {
return html` return html`
<sl-breadcrumb-item class="vfs-path__directory">${path}</sl-breadcrumb-item>`; <sl-breadcrumb-item class="vfs-path__directory">${path.trim()}
<span slot="separator">/</span>
</sl-breadcrumb-item>`;
})} })}
</sl-breadcrumb> </sl-breadcrumb>
${!isEditable ? nothing : html` ${!isEditable ? nothing : html`