diff --git a/client/package-lock.json b/client/package-lock.json index 369efaff..a93003c0 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -1,12 +1,12 @@ { "name": "client", - "version": "0.24.1", + "version": "0.24.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "client", - "version": "0.24.1", + "version": "0.24.2", "dependencies": { "bootstrap": "4.6.2", "bootstrap-vue": "2.23.1", diff --git a/client/package.json b/client/package.json index 06aa6d37..a1d43e4f 100644 --- a/client/package.json +++ b/client/package.json @@ -1,6 +1,6 @@ { "name": "client", - "version": "0.24.1", + "version": "0.24.2", "description": "DigiScript front end", "author": "DreamTeamProd", "private": true, diff --git a/client/src/views/show/ShowLiveView.vue b/client/src/views/show/ShowLiveView.vue index 46706258..d4f07702 100644 --- a/client/src/views/show/ShowLiveView.vue +++ b/client/src/views/show/ShowLiveView.vue @@ -558,7 +558,8 @@ export default { }, navigateTo(targetPage, targetLineOnPage, preventScroll = false) { // Check if the page is loaded - if (targetPage > this.currentLoadedPage) { + // Use Number() for defense-in-depth in case currentLoadedPage is ever a string + if (targetPage > Number(this.currentLoadedPage)) { return false; } @@ -975,7 +976,7 @@ export default { let minLoadedPage = Number.POSITIVE_INFINITY; const respJson = await response.json(); Object.entries(respJson).forEach((value) => { - const pageNumber = value[0]; + const pageNumber = parseInt(value[0], 10); const pageContents = value[1]; if (pageNumber > maxLoadedPage) { diff --git a/electron/package-lock.json b/electron/package-lock.json index 4ee42945..c8e53e08 100644 --- a/electron/package-lock.json +++ b/electron/package-lock.json @@ -1,12 +1,12 @@ { "name": "digiscript-electron", - "version": "0.24.1", + "version": "0.24.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "digiscript-electron", - "version": "0.24.1", + "version": "0.24.2", "license": "GPL-3.0", "dependencies": { "bonjour-service": "^1.3.0", diff --git a/electron/package.json b/electron/package.json index cff74af5..8c3a8319 100644 --- a/electron/package.json +++ b/electron/package.json @@ -1,6 +1,6 @@ { "name": "digiscript-electron", - "version": "0.24.1", + "version": "0.24.2", "description": "DigiScript Electron Desktop Application", "author": "DreamTeamProd", "license": "GPL-3.0", diff --git a/server/pyproject.toml b/server/pyproject.toml index 6895fcb8..d99b93e2 100644 --- a/server/pyproject.toml +++ b/server/pyproject.toml @@ -11,7 +11,7 @@ build-backend = "setuptools.build_meta" [project] name = "digiscript-server" -version = "0.24.1" +version = "0.24.2" description = "DigiScript server - Digital script management for theatrical shows" readme = "../README.md" requires-python = ">=3.13" diff --git a/server/requirements.txt b/server/requirements.txt index c7880fb7..1d8a2d0b 100644 --- a/server/requirements.txt +++ b/server/requirements.txt @@ -9,6 +9,6 @@ anytree==2.13.0 alembic==1.18.1 marshmallow<5 pyjwt[crypto]==2.10.1 -setuptools==80.10.1 +setuptools==80.10.2 xkcdpass==1.30.0 -zeroconf==0.140.0 \ No newline at end of file +zeroconf==0.148.0 \ No newline at end of file