summaryrefslogtreecommitdiffstats
path: root/remoting
diff options
context:
space:
mode:
authorgarykac@chromium.org <garykac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-23 21:23:11 +0000
committergarykac@chromium.org <garykac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-23 21:23:11 +0000
commitf737129b49234d38fe7c5547193a27d970e92e3e (patch)
tree715d761231113b60f374cf049dd1f45ec377c379 /remoting
parentb64ee296a8f469b3f2ec5c5cc1f2788c613856e1 (diff)
downloadchromium_src-f737129b49234d38fe7c5547193a27d970e92e3e.zip
chromium_src-f737129b49234d38fe7c5547193a27d970e92e3e.tar.gz
chromium_src-f737129b49234d38fe7c5547193a27d970e92e3e.tar.bz2
Chromoting: Change the "Your session has ended" OK button to redirect home after
a successful session. It still goes to the Access Code page if there was an error. BUG=none TEST=none Review URL: http://codereview.chromium.org/9214012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118739 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
-rw-r--r--remoting/webapp/event_handlers.js9
1 files changed, 8 insertions, 1 deletions
diff --git a/remoting/webapp/event_handlers.js b/remoting/webapp/event_handlers.js
index 0a75f16..c4b5ce9 100644
--- a/remoting/webapp/event_handlers.js
+++ b/remoting/webapp/event_handlers.js
@@ -14,6 +14,13 @@ function onLoad() {
var goEnterAccessCode = function() {
remoting.setMode(remoting.AppMode.CLIENT_UNCONNECTED);
};
+ var goFinishedIt2Me = function() {
+ if (remoting.currentMode == remoting.AppMode.CLIENT_CONNECT_FAILED_IT2ME) {
+ remoting.setMode(remoting.AppMode.CLIENT_UNCONNECTED);
+ } else {
+ remoting.setMode(remoting.AppMode.HOME);
+ }
+ };
var reload = function() {
window.location.reload();
};
@@ -42,7 +49,7 @@ function onLoad() {
{ event: 'click', id: 'host-finished-button', fn: goHome },
{ event: 'click', id: 'client-cancel-button', fn: goHome },
{ event: 'click', id: 'client-finished-it2me-button',
- fn: goEnterAccessCode },
+ fn: goFinishedIt2Me },
{ event: 'click', id: 'client-finished-me2me-button', fn: goHome },
{ event: 'click', id: 'client-reconnect-button', fn: reload },
{ event: 'click', id: 'cancel-button',