Merge pull request #7 from BrowserSourcesForOBS/dev

v1.0.5
BrowserSourcesForOBS · Oct 12, 2023 · f04f608 · f04f608
2 parents cb8911a + 01dcf1e
commit f04f608
Show file tree

Hide file tree

Showing 9 changed files with 249 additions and 279 deletions.
diff --git a/core/client.js b/core/client.js
@@ -5,7 +5,7 @@ const buttonCdownContainer = document.getElementById('button-container-cdown')
 const buttonCdowntimeContainer = document.getElementById('button-container-cdowntime')
 const buttonExtensibleContainer = document.getElementById('button-container-extensible')
 const buttonTimeContainer = document.getElementById('button-container-time')
-const buttonClose = document.getElementById('stop-code')
+const buttonClose = document.getElementById('stopCode')
 const buttonWiki = document.getElementById('button-wiki')
 const leftButtons = document.getElementById('left-button')
 const textVersion = document.getElementById('span-version')
@@ -102,7 +102,7 @@ socket.addEventListener('close', (event) => {
 })
 
 window.addEventListener('unload', (event) => {
-  socket.send(JSON.stringify({ action: 'stop-code' }))
+  socket.send(JSON.stringify({ action: 'stopCode' }))
 })
 
 buttonClose.addEventListener('click', () => {

diff --git a/core/index.html b/core/index.html
@@ -19,7 +19,7 @@
   <body>
     <div class="top-bar">
       <span class="left-button" id="left-button">
-        <button class="close-button" id="stop-code">
+        <button class="close-button" id="stopCode">
           <i class="fas fa-x"></i>
         </button>
         <a

diff --git a/core/template/cdown/control/control.js b/core/template/cdown/control/control.js
@@ -158,7 +158,7 @@ selectorLang.addEventListener('change', () => {
 
 controlButton.addEventListener('click', () => {
   if (controlButton.textContent === translateElements.timer.buttons.start) {
-    socket.send(JSON.stringify({ action: 'startCdown', classElement }))
+    socket.send(JSON.stringify({ action: 'startTimer', classElement }))
   } else {
     socket.send(JSON.stringify({ action: 'pauseCdown', classElement }))
   }
@@ -196,7 +196,7 @@ addContainer.addEventListener('click', (event) => {
     const data = button.id.split('-')
 
     if (button.id.startsWith('addtime-')) {
-      socket.send(JSON.stringify({ action: 'editTimeCdown', time: `+${data[1]}`, classElement }))
+      socket.send(JSON.stringify({ action: 'editTime', time: `+${data[1]}`, classElement }))
     }
   }
 })
@@ -212,7 +212,7 @@ subContainer.addEventListener('click', (event) => {
     const data = button.id.split('-')
 
     if (button.id.startsWith('subtime-')) {
-      socket.send(JSON.stringify({ action: 'editTimeCdown', time: `-${data[1]}`, classElement }))
+      socket.send(JSON.stringify({ action: 'editTime', time: `-${data[1]}`, classElement }))
     }
   }
 })
@@ -225,7 +225,7 @@ textMsg.addEventListener('focus', () => {
 })
 
 textMsg.addEventListener('blur', () => {
-  socket.send(JSON.stringify({ action: 'editMsgCdown', msg: textMsg.textContent, classElement }))
+  socket.send(JSON.stringify({ action: 'editMsg', msg: textMsg.textContent, classElement }))
   if (textMsg.textContent === '') {
     textMsg.textContent = translateElements.timer.phMsgEnd
     textMsg.style.color = '#555'

diff --git a/core/template/cdowntime/control/control.js b/core/template/cdowntime/control/control.js
@@ -151,7 +151,7 @@ timeData.addEventListener('change', () => {
 })
 
 timezoneSelector.addEventListener('change', () => {
-  socket.send(JSON.stringify({ action: 'changeTimezoneCdownTime', timezone: timezoneSelector.value, classElement }))
+  socket.send(JSON.stringify({ action: 'changeTimezoneTime', timezone: timezoneSelector.value, classElement }))
   window.location.reload()
 })
 
@@ -167,7 +167,7 @@ addContainer.addEventListener('click', (event) => {
     const data = button.id.split('-')
 
     if (button.id.startsWith('addtime-')) {
-      socket.send(JSON.stringify({ action: 'editTimeCdownTime', time: `+${data[1]}`, classElement }))
+      socket.send(JSON.stringify({ action: 'editTime', time: `+${data[1]}`, classElement }))
     }
   }
 })
@@ -183,7 +183,7 @@ subContainer.addEventListener('click', (event) => {
     const data = button.id.split('-')
 
     if (button.id.startsWith('subtime-')) {
-      socket.send(JSON.stringify({ action: 'editTimeCdownTime', time: `-${data[1]}`, classElement }))
+      socket.send(JSON.stringify({ action: 'editTime', time: `-${data[1]}`, classElement }))
     }
   }
 })
@@ -196,7 +196,7 @@ textMsg.addEventListener('focus', () => {
 })
 
 textMsg.addEventListener('blur', () => {
-  socket.send(JSON.stringify({ action: 'editMsgCdownTime', msg: textMsg.textContent, classElement }))
+  socket.send(JSON.stringify({ action: 'editMsg', msg: textMsg.textContent, classElement }))
   if (textMsg.textContent === '') {
     textMsg.textContent = translateElements.timer.phMsgEnd
     textMsg.style.color = '#555'

diff --git a/core/template/crono/control/control.js b/core/template/crono/control/control.js
@@ -140,7 +140,7 @@ languageSelector.addEventListener('change', () => {
 
 controlButton.addEventListener('click', () => {
   if (controlButton.textContent === translateElements.timer.buttons.start) {
-    socket.send(JSON.stringify({ action: 'startCrono', classElement }))
+    socket.send(JSON.stringify({ action: 'startTimer', classElement }))
   } else {
     socket.send(JSON.stringify({ action: 'pauseCrono', classElement }))
   }
@@ -162,7 +162,7 @@ addContainer.addEventListener('click', (event) => {
     const data = button.id.split('-')
 
     if (button.id.startsWith('addtime-')) {
-      socket.send(JSON.stringify({ action: 'editTimeCrono', time: `+${data[1]}`, classElement }))
+      socket.send(JSON.stringify({ action: 'editTime', time: `+${data[1]}`, classElement }))
     }
   }
 })
@@ -178,7 +178,7 @@ subContainer.addEventListener('click', (event) => {
     const data = button.id.split('-')
 
     if (button.id.startsWith('subtime-')) {
-      socket.send(JSON.stringify({ action: 'editTimeCrono', time: `-${data[1]}`, classElement }))
+      socket.send(JSON.stringify({ action: 'editTime', time: `-${data[1]}`, classElement }))
     }
   }
 })

diff --git a/core/template/extensible/control/control.js b/core/template/extensible/control/control.js
@@ -180,7 +180,7 @@ selectorLang.addEventListener('change', () => {
 
 controlButton.addEventListener('click', () => {
   if (controlButton.textContent === translateElements.timer.buttons.start) {
-    socket.send(JSON.stringify({ action: 'startExtensible', classElement }))
+    socket.send(JSON.stringify({ action: 'startTimer', classElement }))
   } else {
     socket.send(JSON.stringify({ action: 'pauseExtensible', classElement }))
   }
@@ -218,7 +218,7 @@ addContainer.addEventListener('click', (event) => {
     const data = button.id.split('-')
 
     if (button.id.startsWith('addtime-')) {
-      socket.send(JSON.stringify({ action: 'editTimeExtensible', time: `+${data[1]}`, classElement }))
+      socket.send(JSON.stringify({ action: 'editTime', time: `+${data[1]}`, classElement }))
     }
   }
 })
@@ -234,7 +234,7 @@ subContainer.addEventListener('click', (event) => {
     const data = button.id.split('-')
 
     if (button.id.startsWith('subtime-')) {
-      socket.send(JSON.stringify({ action: 'editTimeExtensible', time: `-${data[1]}`, classElement }))
+      socket.send(JSON.stringify({ action: 'editTime', time: `-${data[1]}`, classElement }))
     }
   }
 })
@@ -255,7 +255,7 @@ textMsg.addEventListener('focus', () => {
 })
 
 textMsg.addEventListener('blur', () => {
-  socket.send(JSON.stringify({ action: 'editMsgExtensible', msg: textMsg.textContent, classElement }))
+  socket.send(JSON.stringify({ action: 'editMsg', msg: textMsg.textContent, classElement }))
   if (textMsg.textContent === '') {
     textMsg.textContent = translateElements.timer.phMsgEnd
     textMsg.style.color = '#555'

diff --git a/functions.js b/functions.js
@@ -128,8 +128,8 @@ exports.getFonts = () => {
 // Initialize configuration settings
 exports.initConfig = async () => {
   const Config = {
-    lang: await getLanguage(),
-    themeDark: await darkThemeCheck(),
+    lang: await getLanguage() || 'en',
+    themeDark: await darkThemeCheck() || false,
     version: await getVersion(),
     versionRelease: await getVersionRelease()
   }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "obs-timer-controller",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "Handling browser fonts for OBS related to timers and countdowns.",
   "main": "server.js",
   "repository": {
@@ -23,7 +23,10 @@
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "node": "node . test",
-    "pkg-win": "electron-packager . OBS-Timer-Controller --platform=win32 --arch=x64 --app-version=1.0.4 --out=dist --overwrite --icon=icon.ico --author=\"XtoManuel\" --description=\"Handling browser fonts for OBS related to timers and countdowns.\""
+    "pkg-win": "electron-packager . OBS-Timer-Controller --platform=win32 --arch=x64 --app-version=1.0.5 --out=dist --overwrite --icon=icon.ico --author=\"XtoManuel\" --description=\"Handling browser fonts for OBS related to timers and countdowns.\"",
+    "pkg-linux": "electron-packager . OBS-Timer-Controller --platform=linux --arch=x64 --app-version=1.0.5 --out=dist --overwrite --icon=icon.ico --author=\"XtoManuel\" --description=\"Handling browser fonts for OBS related to timers and countdowns.\"",
+    "pkg-mac": "electron-packager . OBS-Timer-Controller --platform=darwin --arch=x64 --app-version=1.0.5 --out=dist --overwrite --icon=icon.ico --author=\"XtoManuel\" --description=\"Handling browser fonts for OBS related to timers and countdowns.\"",
+    "pkg-all": "npm run pkg-win && npm run pkg-linux && npm run pkg-mac"
   },
   "author": "XtoManuel",
   "license": "ISC",