Skip to content

Commit cb8911a

Browse files
XtoManuelXtoManuel
authored
Merge pull request #6 from BrowserSourcesForOBS/dev
v1.0.4
2 parents 2430b71 + 91caa69 commit cb8911a

File tree

14 files changed

+222
-61
lines changed

14 files changed

+222
-61
lines changed

‎core/client.js‎

Lines changed: 30 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ const buttonExtensibleContainer = document.getElementById('button-container-exte
77
const buttonTimeContainer = document.getElementById('button-container-time')
88
const buttonClose = document.getElementById('stop-code')
99
const buttonWiki = document.getElementById('button-wiki')
10+
const leftButtons = document.getElementById('left-button')
11+
const textVersion = document.getElementById('span-version')
1012
const languageSelector = document.getElementById('language-selector')
1113
const switchTheme = document.getElementById('switch-theme')
1214
const titleCrono = document.getElementById('crono-title')
@@ -36,10 +38,23 @@ socket.addEventListener('message', (event) => {
3638
translateElements = message.translateElements
3739

3840
// Configuration and translation
39-
switchTheme.checked = message.config.themedark
41+
switchTheme.checked = message.config.themeDark
4042
buttonClose.title = translateElements.home.close
43+
textVersion.textContent = message.config.version
44+
if (message.config.version !== 'Error' && message.config.versionRelease !== 'Error' && compareVersions(message.config.version, message.config.versionRelease) === 1) {
45+
const link = document.createElement('a')
46+
link.href = 'https://github.com/BrowserSourcesForOBS/obs-timer-controller/releases/latest'
47+
link.target = '_blank'
48+
link.id = 'link-newVersion'
49+
const button = document.createElement('button')
50+
button.className = 'button-versionRelease'
51+
button.title = translateElements.home.newVersionTitle
52+
button.textContent = translateElements.home.newVersion + message.config.versionRelease
53+
link.appendChild(button)
54+
leftButtons.appendChild(link)
55+
}
4156
buttonWiki.title = translateElements.home.wiki
42-
if (message.config.themedark) {
57+
if (message.config.themeDark) {
4358
document.body.classList.remove('light-theme')
4459
document.body.classList.add('dark-theme')
4560
} else {
@@ -96,7 +111,7 @@ buttonClose.addEventListener('click', () => {
96111
})
97112

98113
switchTheme.addEventListener('change', () => {
99-
socket.send(JSON.stringify({ action: 'themeChange', themedark: switchTheme.checked }))
114+
socket.send(JSON.stringify({ action: 'themeChange', themeDark: switchTheme.checked }))
100115
})
101116

102117
languageSelector.addEventListener('change', () => {
@@ -291,3 +306,15 @@ function showNotification (message, button) {
291306
notification.remove()
292307
}, 2000)
293308
}
309+
310+
function compareVersions (versionA, versionB) {
311+
const a = versionA.split('v')[1].split('.').map(Number)
312+
const b = versionB.split('v')[1].split('.').map(Number)
313+
314+
for (let i = 0; i < 3; i++) {
315+
if (a[i] < b[i]) return 1 // B es más moderna que A
316+
if (a[i] > b[i]) return -1 // B es más antigua que A
317+
}
318+
319+
return 0 // Son la misma versión
320+
}

‎core/index.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</head>
1919
<body>
2020
<div class="top-bar">
21-
<span class="left-button">
21+
<span class="left-button" id="left-button">
2222
<button class="close-button" id="stop-code">
2323
<i class="fas fa-x"></i>
2424
</button>
@@ -40,6 +40,7 @@
4040
<i class="fas fa-book-open"></i>
4141
</button>
4242
</a>
43+
<span class="span-version" id="span-version"> </span>
4344
</span>
4445
<span class="language-span"
4546
><i class="fas fa-language"></i>

‎core/template/cdown/control/control.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ socket.addEventListener('message', (event) => {
5959
translateElements = message.translateElements
6060

6161
// Config and translates
62-
switchTheme.checked = message.config.themedark
63-
if (message.config.themedark) {
62+
switchTheme.checked = message.config.themeDark
63+
if (message.config.themeDark) {
6464
document.body.classList.remove('light-theme')
6565
document.body.classList.add('dark-theme')
6666
} else {
@@ -149,7 +149,7 @@ socket.addEventListener('close', (event) => {
149149
})
150150

151151
switchTheme.addEventListener('change', () => {
152-
socket.send(JSON.stringify({ action: 'themeChange', themedark: switchTheme.checked }))
152+
socket.send(JSON.stringify({ action: 'themeChange', themeDark: switchTheme.checked }))
153153
})
154154

155155
selectorLang.addEventListener('change', () => {

‎core/template/cdowntime/control/control.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ socket.addEventListener('message', (event) => {
5858
translateElements = message.translateElements
5959

6060
// Config and translates
61-
switchTheme.checked = message.config.themedark
62-
if (message.config.themedark) {
61+
switchTheme.checked = message.config.themeDark
62+
if (message.config.themeDark) {
6363
document.body.classList.remove('light-theme')
6464
document.body.classList.add('dark-theme')
6565
} else {
@@ -139,7 +139,7 @@ socket.addEventListener('close', (event) => {
139139
})
140140

141141
switchTheme.addEventListener('change', () => {
142-
socket.send(JSON.stringify({ action: 'themeChange', themedark: switchTheme.checked }))
142+
socket.send(JSON.stringify({ action: 'themeChange', themeDark: switchTheme.checked }))
143143
})
144144

145145
selectorLang.addEventListener('change', () => {

‎core/template/crono/control/control.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ socket.addEventListener('message', (event) => {
5757
translateElements = message.translateElements
5858

5959
// Configuration and translates
60-
switchTheme.checked = message.config.themedark
61-
if (message.config.themedark) {
60+
switchTheme.checked = message.config.themeDark
61+
if (message.config.themeDark) {
6262
document.body.classList.remove('light-theme')
6363
document.body.classList.add('dark-theme')
6464
} else {
@@ -131,7 +131,7 @@ socket.addEventListener('close', (event) => {
131131
})
132132

133133
switchTheme.addEventListener('change', () => {
134-
socket.send(JSON.stringify({ action: 'themeChange', themedark: switchTheme.checked }))
134+
socket.send(JSON.stringify({ action: 'themeChange', themeDark: switchTheme.checked }))
135135
})
136136

137137
languageSelector.addEventListener('change', () => {

‎core/template/extensible/control/control.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ socket.addEventListener('message', (event) => {
6464
translateElements = message.translateElements
6565

6666
// Config and translates
67-
switchTheme.checked = message.config.themedark
68-
if (message.config.themedark) {
67+
switchTheme.checked = message.config.themeDark
68+
if (message.config.themeDark) {
6969
document.body.classList.remove('light-theme')
7070
document.body.classList.add('dark-theme')
7171
} else {
@@ -171,7 +171,7 @@ socket.addEventListener('close', (event) => {
171171
})
172172

173173
switchTheme.addEventListener('change', () => {
174-
socket.send(JSON.stringify({ action: 'themeChange', themedark: switchTheme.checked }))
174+
socket.send(JSON.stringify({ action: 'themeChange', themeDark: switchTheme.checked }))
175175
})
176176

177177
selectorLang.addEventListener('change', () => {

‎core/template/time/control/control.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ socket.addEventListener('message', (event) => {
5555
// translateElements = message.translateElements;
5656

5757
// Configuration and translations
58-
switchTheme.checked = message.config.themedark
59-
if (message.config.themedark) {
58+
switchTheme.checked = message.config.themeDark
59+
if (message.config.themeDark) {
6060
document.body.classList.remove('light-theme')
6161
document.body.classList.add('dark-theme')
6262
} else {
@@ -128,7 +128,7 @@ socket.addEventListener('close', (event) => {
128128
})
129129

130130
switchTheme.addEventListener('change', () => {
131-
socket.send(JSON.stringify({ action: 'themeChange', themedark: switchTheme.checked }))
131+
socket.send(JSON.stringify({ action: 'themeChange', themeDark: switchTheme.checked }))
132132
})
133133

134134
langSelector.addEventListener('change', () => {

‎core/topbar.css‎

Lines changed: 36 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
border-radius: 5px;
1818
color: white;
1919
vertical-align: bottom;
20-
margin-top: 3.5px;
20+
margin-top: 4.5px;
2121
cursor: pointer;
2222
flex-grow: 1;
2323
}
@@ -34,13 +34,47 @@
3434
border-radius: 5px;
3535
color: white;
3636
vertical-align: bottom;
37-
margin-top: 3.5px;
37+
margin-top: 4.5px;
3838
cursor: pointer;
3939
flex-grow: 1;
4040
margin-right: 2.5px;
4141
margin-left: 2.5px;
4242
}
4343

44+
.span-version {
45+
font-size: 18px;
46+
background-color: #007bff;
47+
border: 2px solid #007bff;
48+
border-radius: 5px;
49+
color: white;
50+
position: relative;
51+
top: -1.5px;
52+
flex-grow: 1;
53+
margin-right: 2.5px;
54+
margin-left: 2.5px;
55+
padding: 0px 10px;
56+
}
57+
58+
.button-versionRelease {
59+
font-size: 16.5px;
60+
background-color: #4caf50;
61+
border: 2px solid #4caf50;
62+
border-radius: 5px;
63+
color: white;
64+
vertical-align: bottom;
65+
margin-top: 4.5px;
66+
cursor: pointer;
67+
flex-grow: 1;
68+
margin-right: 2.5px;
69+
margin-left: 2.5px;
70+
padding: 0px 10px;
71+
}
72+
73+
.button-versionRelease:hover {
74+
background-color: #388e3c; /* Fondo gris más oscuro al pasar el ratón */
75+
border: 2px solid #388e3c;
76+
}
77+
4478
.link-button:hover {
4579
background-color: #444; /* Fondo gris más oscuro al pasar el ratón */
4680
border: 2px solid #444;

‎core/translates/en.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
home:
22
close: Close the window and stop the code
33
wiki: Documentation
4+
newVersionTitle: Download the new update
5+
newVersion: "New update available: "
46
cronoTitle: CHRONOMETERS
57
cdownTitle: COUNTDOWNS
68
cdowntimeTitle: TIME UNTIL...

‎core/translates/es.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
home:
22
close: Cierra la ventana y detiene el código
33
wiki: Documentación
4+
newVersionTitle: Descarga la nueva actualización
5+
newVersion: "Nueva actualización disponible: "
46
cronoTitle: CRONÓMETROS
57
cdownTitle: TEMPORIZADORES
68
cdowntimeTitle: TIEMPO HASTA...

0 commit comments

Comments
 (0)