Zergling_man/thedesk
Zergling_man/thedesk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

TheDesk 21.2.2 (Mayu)

Browse Source
This commit is contained in:
cutls 2020-09-09 22:04:24 +09:00
parent ccc44ca769
commit 81c476c1bb
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/main/css.js
View File

@ -44,7 +44,7 @@ function css(mainWindow) {
}) })
ipc.on('theme-json-request', function (e, arg) { ipc.on('theme-json-request', function (e, arg) {
try { try {
var themecss = join('./source/themes', arg) var themecss = join(app.getAppPath(), '/source/themes', arg)
var raw = fs.readFileSync(themecss, 'utf8') var raw = fs.readFileSync(themecss, 'utf8')
var json = JSON5.parse(raw) var json = JSON5.parse(raw)
} catch { } catch {
@ -56,7 +56,7 @@ function css(mainWindow) {
}) })
ipc.on('theme-css-request', function (e, arg) { ipc.on('theme-css-request', function (e, arg) {
try { try {
var themecss = join('./source/themes', arg) var themecss = join(app.getAppPath(), '/source/themes', arg)
var json = JSON5.parse(fs.readFileSync(themecss, 'utf8')) var json = JSON5.parse(fs.readFileSync(themecss, 'utf8'))
} catch { } catch {
var themecss = join(app.getPath("userData"), arg) var themecss = join(app.getPath("userData"), arg)
@ -227,10 +227,10 @@ function css(mainWindow) {
return css return css
} }
ipc.on('theme-json-list', function (e, arg) { ipc.on('theme-json-list', function (e, arg) {
var files1 = fs.readdirSync('./source/themes') var files1 = fs.readdirSync(join(app.getAppPath(), '/source/themes'))
var file1List = files1.filter(function (file) { var file1List = files1.filter(function (file) {
if (file.match(/\.thedesktheme$/)) { if (file.match(/\.thedesktheme$/)) {
var tfile = join('./source/themes', file) var tfile = join(app.getAppPath(), '/source/themes', file)
return fs.statSync(tfile).isFile() && /.*\.thedesktheme$/.test(tfile) return fs.statSync(tfile).isFile() && /.*\.thedesktheme$/.test(tfile)
} else { } else {
return null return null
@ -238,7 +238,7 @@ function css(mainWindow) {
}) })
var themes = []; var themes = [];
for (var i = 0; i < file1List.length; i++) { for (var i = 0; i < file1List.length; i++) {
var themecss = join('./source/themes', file1List[i]); var themecss = join(app.getAppPath(), '/source/themes', file1List[i]);
var json = JSON5.parse(fs.readFileSync(themecss, 'utf8')); var json = JSON5.parse(fs.readFileSync(themecss, 'utf8'));
let compat = true let compat = true
if (json.version) compat = false if (json.version) compat = false

2
app/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "thedesk", "name": "thedesk",
"version": "21.2.1", "version": "21.2.2",
"codename": "Mayu", "codename": "Mayu",
"description": "TheDesk is a Mastodon client for PC.", "description": "TheDesk is a Mastodon client for PC.",
"repository": "https://github.com/cutls/TheDesk", "repository": "https://github.com/cutls/TheDesk",

3
app/view/make/index.sample.html
View File

@ -1123,12 +1123,13 @@
<a href="https://thedesk.top" target="_blank">HP</a><br /> <a href="https://thedesk.top" target="_blank">HP</a><br />
<a href="https://github.com/cutls/TheDesk" target="_blank">GitHub</a><br /> <a href="https://github.com/cutls/TheDesk" target="_blank">GitHub</a><br />
<br /> <br />
<div id="release-21-2-1_Mayu" class="release-do" style="display:none; "> <div id="release-21-2-2_Mayu" class="release-do" style="display:none; ">
<br /> <br />
<a href="https://ja.mstdn.wiki/TheDesk" target="_blank">機能一覧</a><br /> <a href="https://ja.mstdn.wiki/TheDesk" target="_blank">機能一覧</a><br />
Pixiv Pixiv
FanboxやPatreonでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。最低月一更新。<br /> FanboxやPatreonでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。最低月一更新。<br />
困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。 困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
<h5>Release Note 21.2.2 (Mayu)</h5>
<h5>Release Note 21.2.1 (Mayu)</h5> <h5>Release Note 21.2.1 (Mayu)</h5>
<h5>Release Note 21.2.0 (Mayu)</h5> <h5>Release Note 21.2.0 (Mayu)</h5>
<!--上のdivのidも変えてね--> <!--上のdivのidも変えてね-->