mirrors/cobalt
1
0
Fork 0
mirror of https://github.com/imputnet/cobalt.git synced 2024-12-29 11:06:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

beginning of 2.2 (fix)

Browse source 
- added download popup to solve the issue with downloads on ios
- merged big and small popups into one
- made buttons in donation menu act like buttons
- began to clean up localisation
- added ability to embed repo url into localisation strings
- moved ffmpeg args to config for more flexibility (and hopefully future changes)
- removed error response in stream that could result in a crash
- removed notice for ios users from about cause it's no longer relevant
- made error popup look and act like the rest
- a tiny bit of clean up
- changelog is now made out of latest commit
This commit is contained in:
wukko 2022-07-14 02:43:29 +06:00
parent 137184d469
commit 8e516d9d59
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
modules/page-renderer.js
View file

@ -1,4 +1,5 @@
import { services, appName, authorInfo, version, quality, repo, donations } from "./config.js"; import { services, appName, authorInfo, version, quality, repo, donations } from "./config.js";
import { getCommitInfo } from "./sub/current-commit.js";
import loc from "./sub/loc.js"; import loc from "./sub/loc.js";
let s = services let s = services
@ -19,6 +20,7 @@ for (let i in donations) {
donate += `<div class="subtitle">${i} (${loc("en", 'desc', 'clickToCopy').trim()})</div><div id="don-${i}" class="text-to-copy" onClick="copy('don-${i}')">${donations[i]}</div>` donate += `<div class="subtitle">${i} (${loc("en", 'desc', 'clickToCopy').trim()})</div><div id="don-${i}" class="text-to-copy" onClick="copy('don-${i}')">${donations[i]}</div>`
} }
let com = getCommitInfo();
export default function(obj) { export default function(obj) {
let isIOS = obj.useragent.toLowerCase().match("iphone os") let isIOS = obj.useragent.toLowerCase().match("iphone os")
try { try {
@ -85,10 +87,10 @@ export default function(obj) {
<div id="popup-header" class="popup-header"> <div id="popup-header" class="popup-header">
<button id="close" class="button mono" onclick="popup('changelog', 0)" aria-label="${loc(obj.lang, 'accessibility', 'close')}">x</button> <button id="close" class="button mono" onclick="popup('changelog', 0)" aria-label="${loc(obj.lang, 'accessibility', 'close')}">x</button>
<div id="title" class="popup-title">${loc(obj.lang, 'title', 'changelog')}</div> <div id="title" class="popup-title">${loc(obj.lang, 'title', 'changelog')}</div>
<div id="desc" class="popup-subtitle">${loc(obj.lang, 'changelog', 'subtitle')}(${obj.hash})</div> <div id="desc" class="popup-subtitle">${com[0]} (${obj.hash})</div>
</div> </div>
<div id="content" class="popup-content"> <div id="content" class="popup-content">
<div id="desc" class="popup-desc about-padding">${loc(obj.lang, 'changelog', 'text')}</div> <div id="desc" class="popup-desc about-padding">${com[1]}</div>
<div id="desc" class="popup-desc"><a class="text-backdrop" href="${repo}/commits">${loc(obj.lang, 'changelog', 'github')}</a></div> <div id="desc" class="popup-desc"><a class="text-backdrop" href="${repo}/commits">${loc(obj.lang, 'changelog', 'github')}</a></div>
</div> </div>
</div> </div>

4
modules/sub/current-commit.js
View file

@ -4,5 +4,7 @@ export function shortCommit() {
return execSync('git rev-parse --short HEAD').toString().trim() return execSync('git rev-parse --short HEAD').toString().trim()
} }
export function getCommitInfo() { export function getCommitInfo() {
return execSync(`git show -s --format='%s;;;%B'`).toString().trim().slice(1,-1).replace(/[\r\n]/gm, '\n').split(';;;') let d = execSync(`git show -s --format='%s;;;%B'`).toString().trim().slice(1,-1).replace(/[\r\n]/gm, '\n').split(';;;')
d[1] = d[1].replace(d[0], '').trim().toString().replace(/[\r\n]/gm, '<br>')
return d
} }