diff options
| author | simonmorris@chromium.org <simonmorris@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-20 16:51:32 +0000 |
|---|---|---|
| committer | simonmorris@chromium.org <simonmorris@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-20 16:51:32 +0000 |
| commit | 294872a5102ab12dae3376f02feb0bbed09336ea (patch) | |
| tree | 5b211b1ab1ac05af461fd76672c890e6d03ef0d0 /remoting | |
| parent | a16731fee72501c3b9e9a7c2656af27b73adc1a9 (diff) | |
| download | chromium_src-294872a5102ab12dae3376f02feb0bbed09336ea.zip chromium_src-294872a5102ab12dae3376f02feb0bbed09336ea.tar.gz chromium_src-294872a5102ab12dae3376f02feb0bbed09336ea.tar.bz2 | |
[Chromoting] Adds a button that cancels PIN entry.
BUG=116813
Review URL: https://chromiumcodereview.appspot.com/9731014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127705 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/webapp/event_handlers.js | 4 | ||||
| -rw-r--r-- | remoting/webapp/main.html | 4 | ||||
| -rw-r--r-- | remoting/webapp/remoting.js | 2 |
3 files changed, 9 insertions, 1 deletions
diff --git a/remoting/webapp/event_handlers.js b/remoting/webapp/event_handlers.js index 4ab665e..d1b1d75 100644 --- a/remoting/webapp/event_handlers.js +++ b/remoting/webapp/event_handlers.js @@ -34,6 +34,9 @@ function onLoad() { remoting.connectMe2MeWithPin(); event.preventDefault(); }; + var cancelPinEntry = function() { + remoting.initDaemonUi(); + } var doAuthRedirect = function() { remoting.oauth2.doAuthRedirect(); }; @@ -55,6 +58,7 @@ function onLoad() { { event: 'click', id: 'client-finished-it2me-button', fn: goFinishedIt2Me }, { event: 'click', id: 'client-finished-me2me-button', fn: goHome }, + { event: 'click', id: 'cancel-pin-entry-button', fn: cancelPinEntry }, { event: 'click', id: 'client-reconnect-button', fn: reload }, { event: 'click', id: 'cancel-access-code-button', fn: remoting.cancelConnect }, diff --git a/remoting/webapp/main.html b/remoting/webapp/main.html index c86e3d0..3fad92b 100644 --- a/remoting/webapp/main.html +++ b/remoting/webapp/main.html @@ -309,6 +309,10 @@ found in the LICENSE file. type="submit" i18n-content="CONNECT_BUTTON"> </button> + <button id="cancel-pin-entry-button" + type="button" + i18n-content="CANCEL"> + </button> </form> </div> </div> <!-- client.pin-prompt --> diff --git a/remoting/webapp/remoting.js b/remoting/webapp/remoting.js index e7df0b3..e124316 100644 --- a/remoting/webapp/remoting.js +++ b/remoting/webapp/remoting.js @@ -79,7 +79,7 @@ remoting.init = function() { }; // initDaemonUi is called if the app is not starting up in session mode, and -// also if the user cancels the connection in session mode. +// also if the user cancels pin entry or the connection in session mode. remoting.initDaemonUi = function () { remoting.daemonPlugin = new remoting.DaemonPlugin(); remoting.daemonPlugin.updateDom(); |