Skip to content

Commit 8afec6e

Browse files
committed
Merge branch 'development' into sabr-pr
* development: Translated using Weblate (German) Translated using Weblate (German) Bump shaka-player from 4.16.6 to 4.16.8 (FreeTubeApp#8223) Translated using Weblate (Croatian) Bump globals from 16.4.0 to 16.5.0 (FreeTubeApp#8216) Bump eslint-plugin-jsdoc from 61.1.11 to 61.1.12 in the eslint group (FreeTubeApp#8222) Translated using Weblate (Czech) Translated using Weblate (Estonian) Bump lefthook from 2.0.1 to 2.0.2 (FreeTubeApp#8213) Bump sass from 1.93.2 to 1.93.3 (FreeTubeApp#8214) Bump the eslint group with 3 updates (FreeTubeApp#8211) Remove broken restart window keyboard shortcut (FreeTubeApp#7281) Translated using Weblate (Vietnamese) Translated using Weblate (Hebrew) Translated using Weblate (Chinese (Traditional Han script)) Migrate FtInput to the composition API (FreeTubeApp#8208)
2 parents 2d22a9a + 621a9ad commit 8afec6e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+675
-926
lines changed

package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
"googlevideo": "^4.0.4",
6767
"marked": "^16.4.1",
6868
"process": "^0.11.10",
69-
"shaka-player": "^4.16.6",
69+
"shaka-player": "^4.16.8",
7070
"swiper": "^12.0.3",
7171
"vue": "^3.5.22",
7272
"vue-i18n": "^11.1.12",
@@ -79,32 +79,32 @@
7979
"@babel/core": "^7.28.5",
8080
"@babel/preset-env": "^7.28.5",
8181
"@double-great/stylelint-a11y": "^3.4.0",
82-
"@eslint/js": "^9.38.0",
82+
"@eslint/js": "^9.39.0",
8383
"@intlify/eslint-plugin-vue-i18n": "^4.1.0",
8484
"babel-loader": "^10.0.0",
8585
"copy-webpack-plugin": "^13.0.1",
8686
"css-loader": "^7.1.2",
8787
"css-minimizer-webpack-plugin": "^7.0.2",
8888
"electron": "^38.4.0",
8989
"electron-builder": "^26.1.0",
90-
"eslint": "^9.38.0",
91-
"eslint-plugin-jsdoc": "^61.1.9",
90+
"eslint": "^9.39.0",
91+
"eslint-plugin-jsdoc": "^61.1.12",
9292
"eslint-plugin-jsonc": "^2.21.0",
9393
"eslint-plugin-unicorn": "^62.0.0",
9494
"eslint-plugin-vue": "^10.5.1",
9595
"eslint-plugin-vuejs-accessibility": "^2.4.1",
9696
"eslint-plugin-yml": "^1.19.0",
97-
"globals": "^16.4.0",
97+
"globals": "^16.5.0",
9898
"html-webpack-plugin": "^5.6.4",
9999
"js-yaml": "^4.1.0",
100100
"json-minimizer-webpack-plugin": "^5.0.1",
101-
"lefthook": "^2.0.1",
101+
"lefthook": "^2.0.2",
102102
"mini-css-extract-plugin": "^2.9.4",
103103
"neostandard": "^0.12.2",
104104
"npm-run-all2": "^8.0.4",
105105
"postcss": "^8.5.6",
106106
"postcss-scss": "^4.0.9",
107-
"sass": "^1.93.2",
107+
"sass": "^1.93.3",
108108
"sass-loader": "^16.0.6",
109109
"stylelint": "^16.25.0",
110110
"stylelint-config-sass-guidelines": "^12.1.0",

src/constants.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,6 @@ const KeyboardShortcuts = {
152152
NEW_WINDOW: 'ctrl+N',
153153
MINIMIZE_WINDOW: 'ctrl+M',
154154
CLOSE_WINDOW: 'ctrl+W',
155-
RESTART_WINDOW: 'ctrl+R',
156-
FORCE_RESTART_WINDOW: 'ctrl+shift+R',
157155
TOGGLE_DEVTOOLS: 'ctrl+shift+I',
158156
FOCUS_SEARCH: 'alt+D',
159157
SEARCH_IN_NEW_WINDOW: 'shift+enter',

src/main/index.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2189,11 +2189,6 @@ function runApp() {
21892189
{
21902190
label: 'View',
21912191
submenu: [
2192-
{ role: 'reload' },
2193-
{
2194-
role: 'forcereload',
2195-
accelerator: 'CmdOrCtrl+Shift+R'
2196-
},
21972192
{ role: 'toggledevtools' },
21982193
{ role: 'toggledevtools', accelerator: 'f12', visible: false },
21992194
{

src/renderer/components/ChannelDetails/ChannelDetails.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ import FtCard from '../ft-card/ft-card.vue'
258258
import FtFlexBox from '../ft-flex-box/ft-flex-box.vue'
259259
import FtShareButton from '../FtShareButton/FtShareButton.vue'
260260
import FtSubscribeButton from '../FtSubscribeButton/FtSubscribeButton.vue'
261-
import FtInput from '../ft-input/ft-input.vue'
261+
import FtInput from '../FtInput/FtInput.vue'
262262
263263
import store from '../../store/index'
264264

src/renderer/components/DownloadSettings/DownloadSettings.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ import { useI18n } from '../../composables/use-i18n-polyfill'
5353
5454
import FtButton from '../FtButton/FtButton.vue'
5555
import FtFlexBox from '../ft-flex-box/ft-flex-box.vue'
56-
import FtInput from '../ft-input/ft-input.vue'
56+
import FtInput from '../FtInput/FtInput.vue'
5757
import FtSelect from '../FtSelect/FtSelect.vue'
5858
import FtSettingsSection from '../FtSettingsSection/FtSettingsSection.vue'
5959
import FtToggleSwitch from '../FtToggleSwitch/FtToggleSwitch.vue'

src/renderer/components/ExternalPlayerSettings.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ import { useI18n } from '../composables/use-i18n-polyfill'
6464
6565
import FtSettingsSection from './FtSettingsSection/FtSettingsSection.vue'
6666
import FtSelect from './FtSelect/FtSelect.vue'
67-
import FtInput from './ft-input/ft-input.vue'
67+
import FtInput from './FtInput/FtInput.vue'
6868
import FtToggleSwitch from './FtToggleSwitch/FtToggleSwitch.vue'
6969
import FtFlexBox from './ft-flex-box/ft-flex-box.vue'
7070
import FtInputTags from './FtInputTags/FtInputTags.vue'

src/renderer/components/FtCreatePlaylistPrompt/FtCreatePlaylistPrompt.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ import { useI18n } from '../../composables/use-i18n-polyfill'
4848
4949
import FtButton from '../FtButton/FtButton.vue'
5050
import FtFlexBox from '../ft-flex-box/ft-flex-box.vue'
51-
import FtInput from '../ft-input/ft-input.vue'
51+
import FtInput from '../FtInput/FtInput.vue'
5252
import FtPrompt from '../FtPrompt/FtPrompt.vue'
5353
5454
import store from '../../store/index'

src/renderer/components/ft-input/ft-input.css renamed to src/renderer/components/FtInput/FtInput.css

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,7 @@ body[dir='rtl'] .ft-input-component.search.showClearTextButton:focus-within .inp
4444
opacity: 1;
4545
}
4646

47-
.disabled label,
48-
.disabled .ft-input {
47+
.disabled {
4948
opacity: 0.4;
5049
cursor: not-allowed;
5150
}

0 commit comments

Comments
 (0)