jcarr
/
noVNC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Catch exceptions in cursor detection. 

If cursor Data URI scheme detection threw an exception, it would cause
canvas initialization to fail. cursor detection exceptions should just
disable local cursor change support, not cause canvas init to fail.
This commit is contained in:
Joel Martin 2010-08-02 10:11:47 -05:00
parent 125d8bbb8f
commit 8171f4d818
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/canvas.js
View File

@ -194,6 +194,7 @@ init: function (id) {
for (i=0; i < 8 * 8 * 4; i++) { for (i=0; i < 8 * 8 * 4; i++) {
curDat.push(255); curDat.push(255);
} }
try {
curSave = c.style.cursor; curSave = c.style.cursor;
Canvas.changeCursor(curDat, curDat, 2, 2, 8, 8); Canvas.changeCursor(curDat, curDat, 2, 2, 8, 8);
if (c.style.cursor) { if (c.style.cursor) {
@ -203,6 +204,10 @@ init: function (id) {
Util.Warn("Data URI scheme cursor not supported"); Util.Warn("Data URI scheme cursor not supported");
} }
c.style.cursor = curSave; c.style.cursor = curSave;
} catch (exc2) {
Util.Error("Data URI scheme cursor test exception: " + exc2);
conf.cursor_uri = false;
}
Canvas.colourMap = []; Canvas.colourMap = [];
Canvas.prevStyle = ""; Canvas.prevStyle = "";