Fix showing axes context menu in 3D painter

linev · linev · commit 838fbfcf1e78 · 2020-10-02T15:22:41.000+02:00
diff --git a/scripts/JSRootPainter.hist3d.js b/scripts/JSRootPainter.hist3d.js
@@ -214,13 +214,14 @@
          if (intersects)
             for (var n=0;n<intersects.length;++n) {
                var mesh = intersects[n].object;
-               if (mesh.zoom) { kind = mesh.zoom; break; }
+               if (mesh.zoom) { kind = mesh.zoom; p = obj_painter.frame_painter(); break; }
                if (mesh.painter && typeof mesh.painter.ShowContextMenu === 'function') {
                   p = mesh.painter; break;
                }
             }
 
-         p.ShowContextMenu(kind, pos);
+         if (typeof p.ShowContextMenu == 'function')
+            p.ShowContextMenu(kind, pos);
       }
    }
 
diff --git a/scripts/JSRootPainter.v7hist3d.js b/scripts/JSRootPainter.v7hist3d.js
@@ -194,7 +194,7 @@
          if (intersects)
             for (var n=0;n<intersects.length;++n) {
                var mesh = intersects[n].object;
-               if (mesh.zoom) { kind = mesh.zoom; break; }
+               if (mesh.zoom) { kind = mesh.zoom; p = obj_painter.frame_painter(); break; }
                if (mesh.painter && typeof mesh.painter.ShowContextMenu === 'function') {
                   p = mesh.painter; break;
                }

Original file line number	Diff line number	Diff line change
`@@ -214,13 +214,14 @@`
`214`	`214`	`if (intersects)`
`215`	`215`	`for (var n=0;n<intersects.length;++n) {`
`216`	`216`	`var mesh = intersects[n].object;`
`217`		`- if (mesh.zoom) { kind = mesh.zoom; break; }`
	`217`	`+ if (mesh.zoom) { kind = mesh.zoom; p = obj_painter.frame_painter(); break; }`
`218`	`218`	`if (mesh.painter && typeof mesh.painter.ShowContextMenu === 'function') {`
`219`	`219`	`p = mesh.painter; break;`
`220`	`220`	`}`
`221`	`221`	`}`
`222`	`222`
`223`		`- p.ShowContextMenu(kind, pos);`
	`223`	`+ if (typeof p.ShowContextMenu == 'function')`
	`224`	`+ p.ShowContextMenu(kind, pos);`
`224`	`225`	`}`
`225`	`226`	`}`
`226`	`227`
Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,7 @@`
`194`	`194`	`if (intersects)`
`195`	`195`	`for (var n=0;n<intersects.length;++n) {`
`196`	`196`	`var mesh = intersects[n].object;`
`197`		`- if (mesh.zoom) { kind = mesh.zoom; break; }`
	`197`	`+ if (mesh.zoom) { kind = mesh.zoom; p = obj_painter.frame_painter(); break; }`
`198`	`198`	`if (mesh.painter && typeof mesh.painter.ShowContextMenu === 'function') {`
`199`	`199`	`p = mesh.painter; break;`
`200`	`200`	`}`