Replace all special symbols in object name/class

linev · linev · commit 8f38703f3233 · 2021-11-16T15:22:37.000+01:00
Let easier use regex to remove such attributes later
diff --git a/scripts/JSRoot.painter.js b/scripts/JSRoot.painter.js
@@ -2066,8 +2066,8 @@ JSROOT.define(['d3'], (d3) => {
 
       // set attributes for debugging
       if (this.draw_object) {
-         this.draw_g.attr('objname', encodeURI(this.draw_object.fName || "name"));
-         this.draw_g.attr('objtype', encodeURI(this.draw_object._typename || "type"));
+         this.draw_g.attr('objname', (this.draw_object.fName || "name").replace(/[^\w]/g, '_'));
+         this.draw_g.attr('objtype', (this.draw_object.fName || "name").replace(/[^\w]/g, '_'));
       }
 
       this.draw_g.property('in_frame', !!frame_layer); // indicates coordinate system

Original file line number	Diff line number	Diff line change
`@@ -2066,8 +2066,8 @@ JSROOT.define(['d3'], (d3) => {`
`2066`	`2066`
`2067`	`2067`	`// set attributes for debugging`
`2068`	`2068`	`if (this.draw_object) {`
`2069`		`- this.draw_g.attr('objname', encodeURI(this.draw_object.fName \|\| "name"));`
`2070`		`- this.draw_g.attr('objtype', encodeURI(this.draw_object._typename \|\| "type"));`
	`2069`	`+ this.draw_g.attr('objname', (this.draw_object.fName \|\| "name").replace(/[^\w]/g, '_'));`
	`2070`	`+ this.draw_g.attr('objtype', (this.draw_object.fName \|\| "name").replace(/[^\w]/g, '_'));`
`2071`	`2071`	`}`
`2072`	`2072`
`2073`	`2073`	`this.draw_g.property('in_frame', !!frame_layer); // indicates coordinate system`