|
186 | 186 | splitName = tempToken[ 1 ].split("."); |
187 | 187 |
|
188 | 188 | // K.D. September 25th, 2012 Bug #122463 The property can contain $ in its name. |
189 | | - template = template.replace(new RegExp("\\$\\{" + tempToken[ 1 ].replace(/\$/g, "\\$") + "\\}", "g"), ""); |
190 | | - tempToken[ 3 ] = new RegExp("\\$\\{" + tempToken[ 1 ].replace(/\$/g, "\\$") + "\\}", "g"); |
| 189 | + tempToken[ 1 ] = tempToken[ 1 ].replace(/\\/g, "\\\\").replace(/\$/g, "\\$"); |
| 190 | + template = template.replace(new RegExp("\\$\\{" + tempToken[ 1 ] + "\\}", "g"), ""); |
| 191 | + tempToken[ 3 ] = new RegExp("\\$\\{" + tempToken[ 1 ] + "\\}", "g"); |
191 | 192 | tempToken[ 1 ] = splitName; |
192 | 193 | tempToken[ 2 ] = true; |
193 | 194 | this.tokens.push(tempToken); |
|
200 | 201 | splitName = tempToken[ 1 ].split("."); |
201 | 202 |
|
202 | 203 | // K.D. September 25th, 2012 Bug #122463 The property can contain $ in its name. |
203 | | - template = template.replace(new RegExp("\\{\\{html\\s+" + tempToken[ 1 ].replace(/\$/g, "\\$") + "\\}\\}", "g"), ""); |
204 | | - tempToken[ 3 ] = new RegExp("\\{\\{html\\s+" + tempToken[ 1 ].replace(/\$/g, "\\$") + "\\}\\}", "g"); |
| 204 | + tempToken[ 1 ] = tempToken[ 1 ].replace(/\\/g, "\\\\").replace(/\$/g, "\\$"); |
| 205 | + template = template.replace(new RegExp("\\{\\{html\\s+" + tempToken[ 1 ] + "\\}\\}", "g"), ""); |
| 206 | + tempToken[ 3 ] = new RegExp("\\{\\{html\\s+" + tempToken[ 1 ] + "\\}\\}", "g"); |
205 | 207 | tempToken[ 1 ] = splitName; |
206 | 208 | tempToken[ 2 ] = false; |
207 | 209 | this.tokens.push(tempToken); |
|
0 commit comments