openstack/deb-novnc
Code Issues Proposed changes

default_controls.js: canvas fail fix. Misc cleanup.

Browse Source 
- Make sure that canvas exists (i.e. didn't throw an error) before
  trying to call canvas method get_canvas_uri.

- Typos in HTML render engine debug output.
This commit is contained in:
Joel Martin 2010-11-06 12:15:08 -05:00
parent bb0573666e
commit 5286528f5b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/canvas.js
View File

@ -16,7 +16,7 @@ conf = conf || {}; // Configuration
var that = {}, // Public API interface var that = {}, // Public API interface
// Private Canvas namespace variables // Private Canvas namespace variables
c_forceCanvas = false, c_forceCanvas = false,
c_width = 0, c_width = 0,
c_height = 0, c_height = 0,
@ -109,8 +109,8 @@ function constructor() {
if (UE.gecko) { Util.Debug("Browser: gecko " + UE.gecko); } if (UE.gecko) { Util.Debug("Browser: gecko " + UE.gecko); }
if (UE.webkit) { Util.Debug("Browser: webkit " + UE.webkit); } if (UE.webkit) { Util.Debug("Browser: webkit " + UE.webkit); }
if (UE.trident) { Util.Debug("Browser: webkit " + UE.trident); } if (UE.trident) { Util.Debug("Browser: trident " + UE.trident); }
if (UE.presto) { Util.Debug("Browser: webkit " + UE.presto); } if (UE.presto) { Util.Debug("Browser: presto " + UE.presto); }
that.clear(); that.clear();

2
include/default_controls.js
View File

@ -247,7 +247,7 @@ settingsDisabled: function(disabled, rfb) {
//Util.Debug(">> settingsDisabled"); //Util.Debug(">> settingsDisabled");
$('VNC_encrypt').disabled = disabled; $('VNC_encrypt').disabled = disabled;
$('VNC_true_color').disabled = disabled; $('VNC_true_color').disabled = disabled;
if (rfb && rfb.get_canvas().get_cursor_uri()) { if (rfb && rfb.get_canvas() && rfb.get_canvas().get_cursor_uri()) {
$('VNC_cursor').disabled = disabled; $('VNC_cursor').disabled = disabled;
} else { } else {
DefaultControls.updateSetting('cursor', false); DefaultControls.updateSetting('cursor', false);