Deal with embedded codes

graham-trott · graham-trott · commit e4dabf120153 · 2022-09-05T18:24:50.000+01:00
diff --git a/dist/plugins/webson.js b/dist/plugins/webson.js
@@ -179,14 +179,16 @@ EasyCoder.domain.webson = EasyCoder_Webson;
                         throw Error(`Mismatched braces in ${input}`);
                     }
                     const substr = output.substring(p + 1, q);
-                    let repl = `<${substr}>`;
-                    try {
-                        const v = eval(substr);
-                        output = output.replace(repl, v);
-                    } catch (e) {
-                        //output = output.replace(repl, substr);
+                    if (!['b', '/b', 'i', '/i'].includes(substr)) {
+                        let repl = `<${substr}>`;
+                        try {
+                            const v = eval(substr);
+                            output = output.replace(repl, v);
+                        } catch (e) {
+                            output = output.replace(repl, substr);
+                        }
+                        changed = true;
                     }
-                    changed = true;
                 }
             }
             catch (e) {
diff --git a/js/plugins/webson.js b/js/plugins/webson.js
@@ -179,14 +179,16 @@ EasyCoder.domain.webson = EasyCoder_Webson;
                         throw Error(`Mismatched braces in ${input}`);
                     }
                     const substr = output.substring(p + 1, q);
-                    let repl = `<${substr}>`;
-                    try {
-                        const v = eval(substr);
-                        output = output.replace(repl, v);
-                    } catch (e) {
-                        //output = output.replace(repl, substr);
+                    if (!['b', '/b', 'i', '/i'].includes(substr)) {
+                        let repl = `<${substr}>`;
+                        try {
+                            const v = eval(substr);
+                            output = output.replace(repl, v);
+                        } catch (e) {
+                            output = output.replace(repl, substr);
+                        }
+                        changed = true;
                     }
-                    changed = true;
                 }
             }
             catch (e) {

Original file line number	Diff line number	Diff line change
`@@ -179,14 +179,16 @@ EasyCoder.domain.webson = EasyCoder_Webson;`
`179`	`179`	throw Error(`Mismatched braces in ${input}`);
`180`	`180`	`}`
`181`	`181`	`const substr = output.substring(p + 1, q);`
`182`		- let repl = `<${substr}>`;
`183`		`- try {`
`184`		`- const v = eval(substr);`
`185`		`- output = output.replace(repl, v);`
`186`		`- } catch (e) {`
`187`		`- //output = output.replace(repl, substr);`
	`182`	`+ if (!['b', '/b', 'i', '/i'].includes(substr)) {`
	`183`	+ let repl = `<${substr}>`;
	`184`	`+ try {`
	`185`	`+ const v = eval(substr);`
	`186`	`+ output = output.replace(repl, v);`
	`187`	`+ } catch (e) {`
	`188`	`+ output = output.replace(repl, substr);`
	`189`	`+ }`
	`190`	`+ changed = true;`
`188`	`191`	`}`
`189`		`- changed = true;`
`190`	`192`	`}`
`191`	`193`	`}`
`192`	`194`	`catch (e) {`