Skip to content

Commit f3aacdb

Browse files
committed
Do not try to close main window if canvas embed into other widget
Used together with RBrowser
1 parent aac1093 commit f3aacdb

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

scripts/JSRoot.gpad.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3955,7 +3955,8 @@ JSROOT.define(['d3', 'painter'], (d3, jsrp) => {
39553955
/** @summary Hanler for websocket close event
39563956
* @private */
39573957
TCanvasPainter.prototype.onWebsocketClosed = function(/*handle*/) {
3958-
jsrp.closeCurrentWindow();
3958+
if (!this.embed_canvas)
3959+
jsrp.closeCurrentWindow();
39593960
}
39603961

39613962
/** @summary Handle websocket messages

scripts/JSRoot.v7gpad.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3968,8 +3968,8 @@ JSROOT.define(['d3', 'painter'], (d3, jsrp) => {
39683968
/** @summary Hanler for websocket close event
39693969
* @private */
39703970
RCanvasPainter.prototype.onWebsocketClosed = function(/*handle*/) {
3971-
console.log('WebSocket closed!!');
3972-
jsrp.closeCurrentWindow();
3971+
if (!this.embed_canvas)
3972+
jsrp.closeCurrentWindow();
39733973
}
39743974

39753975
/** @summary Hanler for websocket message

0 commit comments

Comments
 (0)