summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsamhed <samuel@cendio.se>2015-04-29 14:54:28 +0200
committersamhed <samuel@cendio.se>2015-04-29 14:54:28 +0200
commit8ce27ddb4bb51e7e67bfac91505da73c22b09a79 (patch)
treea04bd5ed94d02ec78ebafb77e50a8f29e360fce3
parentf9ffb21b6b60cf6d7c394a82d4801da5cc82ba04 (diff)
downloadnovnc-8ce27ddb4bb51e7e67bfac91505da73c22b09a79.tar.gz
Re-fixes #428 which was broken by commit 58ded70
* Disable local cursor when the browser doesn't support data uri
-rw-r--r--include/display.js2
-rw-r--r--include/rfb.js1
2 files changed, 2 insertions, 1 deletions
diff --git a/include/display.js b/include/display.js
index 201acf3..9a8e455 100644
--- a/include/display.js
+++ b/include/display.js
@@ -88,7 +88,7 @@ var Display;
// Determine browser support for setting the cursor via data URI scheme
if (this._cursor_uri || this._cursor_uri === null ||
this._cursor_uri === undefined) {
- this._cursor_uri = Util.browserSupportsCursorURIs(this._target);
+ this._cursor_uri = Util.browserSupportsCursorURIs();
}
Util.Debug("<< Display.constructor");
diff --git a/include/rfb.js b/include/rfb.js
index b9db39c..a591ca2 100644
--- a/include/rfb.js
+++ b/include/rfb.js
@@ -1265,6 +1265,7 @@ var RFB;
this._local_cursor = true;
} else {
Util.Warn("Browser does not support local cursor");
+ this._display.disableLocalCursor();
}
}
};