From 00ddf45ab106e35e0fccd782fea206534b827fce Mon Sep 17 00:00:00 2001 From: James Rankin Date: Wed, 1 Jun 2022 17:21:13 +0100 Subject: [PATCH 1/3] Allow decimal point in parameters --- index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.js b/index.js index 1061412..2c0516f 100644 --- a/index.js +++ b/index.js @@ -669,7 +669,7 @@ function handleStageDisplayMessage(message) { propresenter_csn = objData.ary[i].txt.toString() propresenter_csn_commands = [] let noteString = objData.ary[i].txt.toString() + ';' // add terminating semicolon to allow for backwards compatibility of a single command in notes without a terminator - let commandset = noteString.match(/(\w+\s*:[\w\s,]*?;)/g) + let commandset = noteString.match(/(\w+\s*:[\w\s,\.]*?;)/g) if (commandset !== null) { for (const item of commandset) { let command = item.substring(0, item.indexOf(':')).trim().toLowerCase() @@ -1088,4 +1088,4 @@ ipcMain.on('presentationbridge_disconnect', function (event) { ipcMain.on('presentationbridge_force_disconnect', function (event) { presentationbridge_disconnect(); -}); \ No newline at end of file +}); From 75b3184c2220d56333fe515507bffa01570fb6f3 Mon Sep 17 00:00:00 2001 From: James Rankin Date: Wed, 1 Jun 2022 20:47:21 +0100 Subject: [PATCH 2/3] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6e7c14e..06c6432 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "presentationbridge-client", "productName": "PresentationBridge Client", - "version": "1.0.13", + "version": "1.0.14", "description": "Links data from your Presentation / lyrics software to other software.", "license": "MIT", "repository": "josephdadams/presentationbridge-client", From d1aa0a129635ebdc0e07eff668a9a238af7bf3fe Mon Sep 17 00:00:00 2001 From: James Rankin Date: Fri, 3 Jun 2022 19:22:45 +0100 Subject: [PATCH 3/3] Allow parameters with decimal point, also show in next command for monitor --- index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.js b/index.js index 2c0516f..cefb0c5 100644 --- a/index.js +++ b/index.js @@ -715,7 +715,7 @@ function handleStageDisplayMessage(message) { propresenter_nsn = objData.ary[i].txt.toString() propresenter_nsn_commands = [] let noteString = objData.ary[i].txt.toString() + ';' // add terminating semicolon to allow for backwards compatibility of a single command in notes without a terminator - let commandset = noteString.match(/(\w+\s*:[\w\s,]*?;)/g) + let commandset = noteString.match(/(\w+\s*:[\w\s,\.]*?;)/g) if (commandset !== null) { for (const item of commandset) { let command = item.substring(0, item.indexOf(':')).trim().toLowerCase()