* Adding a way to set the DOM document to use.
This is very usefull when you need to open a new window (with a new document) from javascript, without having to reload the script.js. (cherry picked from commit 8ded53c1de06d01e50d58543c19e73926f0fbbd4) Signed-off-by: Joel Martin <github@martintribe.org>
This commit is contained in:
parent
b925c96781
commit
6425f611d8
|
@ -41,6 +41,7 @@ Util.conf_default(conf, that, 'true_color', true);
|
||||||
Util.conf_default(conf, that, 'focused', true);
|
Util.conf_default(conf, that, 'focused', true);
|
||||||
Util.conf_default(conf, that, 'colourMap', []);
|
Util.conf_default(conf, that, 'colourMap', []);
|
||||||
Util.conf_default(conf, that, 'scale', 1);
|
Util.conf_default(conf, that, 'scale', 1);
|
||||||
|
Util.conf_default(conf, that, 'currentDocument', document);
|
||||||
|
|
||||||
// Override some specific getters/setters
|
// Override some specific getters/setters
|
||||||
that.set_prefer_js = function(val) {
|
that.set_prefer_js = function(val) {
|
||||||
|
@ -386,8 +387,8 @@ that.start = function(keyPressFunc, mouseButtonFunc, mouseMoveFunc) {
|
||||||
c_mouseButton = mouseButtonFunc || null;
|
c_mouseButton = mouseButtonFunc || null;
|
||||||
c_mouseMove = mouseMoveFunc || null;
|
c_mouseMove = mouseMoveFunc || null;
|
||||||
|
|
||||||
Util.addEvent(document, 'keydown', onKeyDown);
|
Util.addEvent(conf.currentDocument, 'keydown', onKeyDown);
|
||||||
Util.addEvent(document, 'keyup', onKeyUp);
|
Util.addEvent(conf.currentDocument, 'keyup', onKeyUp);
|
||||||
Util.addEvent(c, 'mousedown', onMouseDown);
|
Util.addEvent(c, 'mousedown', onMouseDown);
|
||||||
Util.addEvent(c, 'mouseup', onMouseUp);
|
Util.addEvent(c, 'mouseup', onMouseUp);
|
||||||
Util.addEvent(c, 'mousemove', onMouseMove);
|
Util.addEvent(c, 'mousemove', onMouseMove);
|
||||||
|
@ -395,8 +396,8 @@ that.start = function(keyPressFunc, mouseButtonFunc, mouseMoveFunc) {
|
||||||
onMouseWheel);
|
onMouseWheel);
|
||||||
|
|
||||||
/* Work around right and middle click browser behaviors */
|
/* Work around right and middle click browser behaviors */
|
||||||
Util.addEvent(document, 'click', onMouseDisable);
|
Util.addEvent(conf.currentDocument, 'click', onMouseDisable);
|
||||||
Util.addEvent(document.body, 'contextmenu', onMouseDisable);
|
Util.addEvent(conf.currentDocument.body, 'contextmenu', onMouseDisable);
|
||||||
|
|
||||||
Util.Debug("<< Canvas.start");
|
Util.Debug("<< Canvas.start");
|
||||||
};
|
};
|
||||||
|
@ -452,8 +453,8 @@ that.clear = function() {
|
||||||
|
|
||||||
that.stop = function() {
|
that.stop = function() {
|
||||||
var c = conf.target;
|
var c = conf.target;
|
||||||
Util.removeEvent(document, 'keydown', onKeyDown);
|
Util.removeEvent(conf.currentDocument, 'keydown', onKeyDown);
|
||||||
Util.removeEvent(document, 'keyup', onKeyUp);
|
Util.removeEvent(conf.currentDocument, 'keyup', onKeyUp);
|
||||||
Util.removeEvent(c, 'mousedown', onMouseDown);
|
Util.removeEvent(c, 'mousedown', onMouseDown);
|
||||||
Util.removeEvent(c, 'mouseup', onMouseUp);
|
Util.removeEvent(c, 'mouseup', onMouseUp);
|
||||||
Util.removeEvent(c, 'mousemove', onMouseMove);
|
Util.removeEvent(c, 'mousemove', onMouseMove);
|
||||||
|
@ -461,8 +462,8 @@ that.stop = function() {
|
||||||
onMouseWheel);
|
onMouseWheel);
|
||||||
|
|
||||||
/* Work around right and middle click browser behaviors */
|
/* Work around right and middle click browser behaviors */
|
||||||
Util.removeEvent(document, 'click', onMouseDisable);
|
Util.removeEvent(conf.currentDocument, 'click', onMouseDisable);
|
||||||
Util.removeEvent(document.body, 'contextmenu', onMouseDisable);
|
Util.removeEvent(conf.currentDocument.body, 'contextmenu', onMouseDisable);
|
||||||
|
|
||||||
// Turn off cursor rendering
|
// Turn off cursor rendering
|
||||||
if (conf.cursor_uri) {
|
if (conf.cursor_uri) {
|
||||||
|
|
|
@ -132,7 +132,7 @@ var that = {}, // Public API interface
|
||||||
//
|
//
|
||||||
|
|
||||||
// VNC viewport rendering Canvas
|
// VNC viewport rendering Canvas
|
||||||
Util.conf_default(conf, that, 'target', 'VNC_canvas');
|
//Util.conf_default(conf, that, 'target', 'VNC_canvas');
|
||||||
|
|
||||||
Util.conf_default(conf, that, 'encrypt', false, true);
|
Util.conf_default(conf, that, 'encrypt', false, true);
|
||||||
Util.conf_default(conf, that, 'true_color', true, true);
|
Util.conf_default(conf, that, 'true_color', true, true);
|
||||||
|
@ -140,6 +140,8 @@ Util.conf_default(conf, that, 'true_color', true, true);
|
||||||
Util.conf_default(conf, that, 'b64encode', true, true);
|
Util.conf_default(conf, that, 'b64encode', true, true);
|
||||||
Util.conf_default(conf, that, 'local_cursor', true, true);
|
Util.conf_default(conf, that, 'local_cursor', true, true);
|
||||||
|
|
||||||
|
Util.conf_default(conf, that, 'currentDocument', true, document);
|
||||||
|
|
||||||
// time to wait for connection
|
// time to wait for connection
|
||||||
Util.conf_default(conf, that, 'connectTimeout', 2000);
|
Util.conf_default(conf, that, 'connectTimeout', 2000);
|
||||||
// frequency to check for send/receive
|
// frequency to check for send/receive
|
||||||
|
@ -195,7 +197,7 @@ function constructor() {
|
||||||
}
|
}
|
||||||
// Initialize canvas
|
// Initialize canvas
|
||||||
try {
|
try {
|
||||||
canvas = new Canvas({'target': conf.target});
|
canvas = new Canvas({'target': conf.target, 'currentDocument': conf.currentDocument});
|
||||||
} catch (exc) {
|
} catch (exc) {
|
||||||
Util.Error("Canvas exception: " + exc);
|
Util.Error("Canvas exception: " + exc);
|
||||||
updateState('fatal', "No working Canvas");
|
updateState('fatal', "No working Canvas");
|
||||||
|
|
Loading…
Reference in New Issue