Skip to content

Commit b3bc80b

Browse files
committed
Fix history back
1 parent 49713e8 commit b3bc80b

File tree

6 files changed

+5
-25
lines changed

6 files changed

+5
-25
lines changed

src/components/details.ts

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ export interface DetailsConfig {
3232
@customElement('details-page')
3333
export class DetailsPage extends LitElement {
3434
@property({ type: Object }) config!: DetailsConfig;
35-
@property({ type: Boolean, attribute: 'history-back' }) historyBack = false;
3635
@property({ type: String, attribute: 'back-href' }) backHref = '/';
3736
@state() private isDescriptionExpanded = false;
3837

@@ -330,10 +329,6 @@ export class DetailsPage extends LitElement {
330329
`;
331330

332331
private _goBack() {
333-
if (this.historyBack && window.history.length > 1) {
334-
window.history.back();
335-
return;
336-
}
337332
window.location.href = this.backHref || '/';
338333
}
339334

@@ -368,7 +363,7 @@ export class DetailsPage extends LitElement {
368363
d="M11.354 1.646a.5.5 0 0 1 0 .708L5.707 8l5.647 5.646a.5.5 0 0 1-.708.708l-6-6a.5.5 0 0 1 0-.708l6-6a.5.5 0 0 1 .708 0z"
369364
/>
370365
</svg>
371-
${this.historyBack ? 'Back' : 'Back to Home'}
366+
${this.backHref === '/' ? 'Back to Home' : 'Back'}
372367
</a>
373368
374369
<div class="layout ${actions && actions.length ? '' : 'single'}">

src/pages/vpe-install.ts

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ export class VPEInstallPage extends LitElement {
99
static styles = css`
1010
:host {
1111
display: block;
12-
padding: 20px;
1312
}
1413
.back-button {
1514
display: inline-flex;
@@ -125,11 +124,7 @@ export class VPEInstallPage extends LitElement {
125124
</p>
126125
</div>
127126
</div>`
128-
: html`<details-page
129-
.config=${config}
130-
history-back
131-
back-href="/vpe"
132-
></details-page>`;
127+
: html`<details-page .config=${config} back-href="/vpe/"></details-page>`;
133128
}
134129
}
135130

src/pages/zwa2-details.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ export class ZWA2Details extends LitElement {
99
static styles = css`
1010
:host {
1111
display: block;
12-
padding: 20px;
1312
}
1413
1514
.firmware-section {

src/pages/zwa2-install-original.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,7 @@ export class Zwa2InstallOriginalPage extends LitElement {
7676
} as const;
7777

7878
return html`
79-
<details-page
80-
.config=${config}
81-
history-back
82-
back-href="/zwa2"
83-
></details-page>
79+
<details-page .config=${config} back-href="/zwa2/"></details-page>
8480
`;
8581
}
8682
}

src/pages/zwa2-install-poe.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,8 +236,7 @@ export class Zwa2InstallPoEPage extends LitElement {
236236

237237
return html`<details-page
238238
.config=${config}
239-
history-back
240-
back-href="/zwa2"
239+
back-href="/zwa2/"
241240
></details-page>`;
242241
}
243242
}

src/pages/zwa2-install-portable.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -127,11 +127,7 @@ export class Zwa2InstallPortablePage extends LitElement {
127127
} as const;
128128

129129
return html`
130-
<details-page
131-
.config=${config}
132-
history-back
133-
back-href="/zwa2"
134-
></details-page>
130+
<details-page .config=${config} back-href="/zwa2/"></details-page>
135131
`;
136132
}
137133

0 commit comments

Comments
 (0)