Skip to content

Commit 4ef6bac

Browse files
committed
Allow multiple replacements inside a confirm message template
1 parent a130885 commit 4ef6bac

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Build/CommonAssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@
1515
//
1616
// You can specify all the values or you can default the Revision and Build Numbers
1717
// by using the '*' as shown below:
18-
[assembly: AssemblyVersion("1.4.1")]
19-
[assembly: AssemblyFileVersion("1.4.1")]
18+
[assembly: AssemblyVersion("1.4.2")]
19+
[assembly: AssemblyFileVersion("1.4.2")]

Griddly/Scripts/griddly.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1177,9 +1177,9 @@
11771177
templatedConfirmMessage = confirmMessage.replace("${count}", selectedCount);
11781178

11791179
if (selectedCount == 1)
1180-
templatedConfirmMessage = templatedConfirmMessage.replace(/\${plural:.*?}/, "").replace(/\${singular:(.*)?}/, "$1");
1180+
templatedConfirmMessage = templatedConfirmMessage.replace(/\${plural:.*?}/g, "").replace(/\${singular:(.*?)}/g, "$1");
11811181
else
1182-
templatedConfirmMessage = templatedConfirmMessage.replace(/\${singular:.*?}/, "").replace(/\${plural:(.*)?}/, "$1");;
1182+
templatedConfirmMessage = templatedConfirmMessage.replace(/\${singular:.*?}/g, "").replace(/\${plural:(.*?)}/g, "$1");;
11831183
}
11841184

11851185
if ((typeof confirmMessage === "undefined" || confirm(templatedConfirmMessage)))

0 commit comments

Comments
 (0)