GUAC-589: Fix regression in clipboard support - do not handle Ctrl-V unless clipboard integration is actually enabled.

This commit is contained in:
Michael Jumper committed 2014-03-28 15:00:06 -07:00
1 parent e44ea62d83
commit 84b505dcb7
4 files changed
+74 -28

No files matched your search

+14 -14
View File
@@ -645,8 +645,8 @@ GuacAdmin.UserEditor = function(name, parameters) {
GuacAdmin.reset();
}
catch (e) {
alert(e.message);
catch (status) {
alert(status.message);
}
};
@@ -684,8 +684,8 @@ GuacAdmin.UserEditor = function(name, parameters) {
}
// Alert on failure
catch (e) {
alert(e.message);
catch (status) {
alert(status.message);
}
}
@@ -983,8 +983,8 @@ GuacAdmin.ConnectionEditor = function(connection, parameters) {
GuacAdmin.reset();
}
catch (e) {
alert(e.message);
catch (status) {
alert(status.message);
}
};
@@ -1022,8 +1022,8 @@ GuacAdmin.ConnectionEditor = function(connection, parameters) {
}
// Alert on failure
catch (e) {
alert(e.message);
catch (status) {
alert(status.message);
}
}
@@ -1176,8 +1176,8 @@ GuacAdmin.ConnectionGroupEditor = function(group, parameters) {
GuacAdmin.reset();
}
catch (e) {
alert(e.message);
catch (status) {
alert(status.message);
}
};
@@ -1215,8 +1215,8 @@ GuacAdmin.ConnectionGroupEditor = function(group, parameters) {
}
// Alert on failure
catch (e) {
alert(e.message);
catch (status) {
alert(status.message);
}
}
@@ -1406,8 +1406,8 @@ GuacAdmin.reset = function() {
}
// Alert on failure
catch (e) {
alert(e.message);
catch (status) {
alert(tatusmessage);
}
};