diff --git a/src/sunstone/public/app/tabs/vms-tab/dialogs/vnc.js b/src/sunstone/public/app/tabs/vms-tab/dialogs/vnc.js index 03c96eb675..b751e88adc 100644 --- a/src/sunstone/public/app/tabs/vms-tab/dialogs/vnc.js +++ b/src/sunstone/public/app/tabs/vms-tab/dialogs/vnc.js @@ -67,7 +67,7 @@ define(function(require) { return false; } - function _onClose(context) { + function _onClose(context) { Vnc.disconnect(); Vnc.unlock(); return false; diff --git a/src/sunstone/public/app/utils/dialogs/dialog.js b/src/sunstone/public/app/utils/dialogs/dialog.js index d1bd36cfc3..047310c763 100644 --- a/src/sunstone/public/app/utils/dialogs/dialog.js +++ b/src/sunstone/public/app/utils/dialogs/dialog.js @@ -25,7 +25,9 @@ define(function(require) { that.onShow(dialogElement); }); - dialogElement.on('opened.fndtn.close', function (e) { + dialogElement.on('close.fndtn.reveal', function (e) { + if (e.namespace !== 'fndtn.reveal') { return; } + console.log("close.reveal") if (that.onClose) { that.onClose(dialogElement); } diff --git a/src/sunstone/public/app/utils/vnc.js b/src/sunstone/public/app/utils/vnc.js index 85f8c3c089..c8d5a658b0 100644 --- a/src/sunstone/public/app/utils/vnc.js +++ b/src/sunstone/public/app/utils/vnc.js @@ -71,7 +71,7 @@ define(function(require) { } function sendCtrlAltDel() { - if (_rfb) { rfb.sendCtrlAltDel(); } + if (_rfb) { _rfb.sendCtrlAltDel(); } } //This is taken from noVNC examples