Skip to content

Commit 4607d06

Browse files
committed
* Update app menu to add item for history
1 parent 96e19fd commit 4607d06

File tree

8 files changed

+26
-14
lines changed

8 files changed

+26
-14
lines changed

.eslintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ module.exports = {
3333

3434
rules: {
3535
'space-before-function-paren': 'off',
36-
'comma-dangle': ['error', 'never'],
36+
'comma-dangle': ['error', 'only-multiline'],
3737
'vue/no-v-html': 'off',
3838
'no-console': ['error', { allow: ['warn', 'error'] }],
3939
'no-unused-vars': 'warn',

src/main/index.js

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -997,7 +997,23 @@ function runApp() {
997997
{ role: 'zoomout' },
998998
{ role: 'zoomout', accelerator: 'CmdOrCtrl+numsub', visible: false },
999999
{ type: 'separator' },
1000-
{ role: 'togglefullscreen' }
1000+
{ role: 'togglefullscreen' },
1001+
{ type: 'separator' },
1002+
{
1003+
label: 'History',
1004+
// MacOS: Command + Y
1005+
// Other OS: Ctrl + H
1006+
accelerator: process.platform === 'darwin' ? 'Cmd+Y' : 'Ctrl+H',
1007+
click: (_menuItem, browserWindow, _event) => {
1008+
if (browserWindow == null) { return }
1009+
1010+
browserWindow.webContents.send(
1011+
'change-view',
1012+
{ route: '/history' }
1013+
)
1014+
},
1015+
type: 'normal'
1016+
},
10011017
]
10021018
},
10031019
{

src/renderer/components/side-nav-more-options/side-nav-more-options.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
:class="applyNavIconExpand"
110110
/>
111111
<p class="navLabel">
112-
{{ $t("History.History") }}
112+
{{ $t("History Page.History") }}
113113
</p>
114114
</div>
115115
<hr>

src/renderer/components/side-nav/side-nav.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@
142142
class="navOption mobileShow"
143143
role="button"
144144
tabindex="0"
145-
:title="$t('History.History')"
145+
:title="$t('History Page.History')"
146146
@click="navigate('history')"
147147
@keydown.enter.prevent="navigate('history')"
148148
>
@@ -160,7 +160,7 @@
160160
v-if="!hideText"
161161
class="navLabel"
162162
>
163-
{{ $t("History.History") }}
163+
{{ $t("History Page.History") }}
164164
</p>
165165
</div>
166166
<hr>

src/renderer/router/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ const router = new CustomRouter({
129129
path: '/history',
130130
name: 'history',
131131
meta: {
132-
title: 'History.History',
132+
title: 'History Page.History',
133133
icon: 'fa-home'
134134
},
135135
component: History

src/renderer/views/History/History.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
v-show="!isLoading"
99
class="card"
1010
>
11-
<h3>{{ $t("History.History") }}</h3>
11+
<h3>{{ $t("History Page.History") }}</h3>
1212
<ft-input
1313
v-show="fullData.length > 0"
1414
ref="searchBar"
15-
:placeholder="$t('History.Search bar placeholder')"
15+
:placeholder="$t('History Page.Search bar placeholder')"
1616
:show-clear-text-button="true"
1717
:show-action-button="false"
1818
@input="(input) => query = input"

static/locales/en-US.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ Actual size: Actual size
2525
Zoom in: Zoom in
2626
Zoom out: Zoom out
2727
Toggle fullscreen: Toggle fullscreen
28+
History: History
2829
Window: Window
2930
Minimize: Minimize
3031
Close: Close
@@ -119,7 +120,7 @@ User Playlists:
119120
it listed here
120121
Empty Search Message: There are no videos in this playlist that matches your search
121122
Search bar placeholder: Search in Playlist
122-
History:
123+
History Page:
123124
# On History Page
124125
History: History
125126
Watch History: Watch History

yarn.lock

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7133,11 +7133,6 @@ sax@^1.1.3, sax@^1.2.4:
71337133
resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
71347134
integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
71357135

7136-
sax@~0.6.0:
7137-
version "0.6.1"
7138-
resolved "https://registry.yarnpkg.com/sax/-/sax-0.6.1.tgz#563b19c7c1de892e09bfc4f2fc30e3c27f0952b9"
7139-
integrity sha1-VjsZx8HeiS4Jv8Ty/DDjwn8JUrk=
7140-
71417136
schema-utils@^3.1.0, schema-utils@^3.1.1:
71427137
version "3.1.1"
71437138
resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281"

0 commit comments

Comments
 (0)