summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-07 20:54:25 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-07 20:54:25 +0000
commit1c64421dc9b138892e371e6ef764719c95e79681 (patch)
tree120f9d689e996d6e61668815c40a597d8ad79861
parentf2ebdce1a5267cf2ebdce8df910fa2e07c534463 (diff)
downloadchromium_src-1c64421dc9b138892e371e6ef764719c95e79681.zip
chromium_src-1c64421dc9b138892e371e6ef764719c95e79681.tar.gz
chromium_src-1c64421dc9b138892e371e6ef764719c95e79681.tar.bz2
Fix issues in IT2Me webapp caused by r91658.
1. Elemnt IDs were updated in chroice.html, but not in remoting.js 2. Plugin container must not be hidden, otherwise the plugin doesn't load. BUG=None TEST=IT2Me host works. Review URL: http://codereview.chromium.org/7277088 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91750 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--remoting/webapp/me2mom/choice.html2
-rw-r--r--remoting/webapp/me2mom/remoting.js4
2 files changed, 3 insertions, 3 deletions
diff --git a/remoting/webapp/me2mom/choice.html b/remoting/webapp/me2mom/choice.html
index 1b95111..fa3a4b7 100644
--- a/remoting/webapp/me2mom/choice.html
+++ b/remoting/webapp/me2mom/choice.html
@@ -214,7 +214,7 @@ found in the LICENSE file.
<em>Loading&hellip;</em>
</section>
- <div id="host-plugin-container" class="hidden">
+ <div id="host-plugin-container">
</div>
<div id="debug-log" class="hidden">
</div>
diff --git a/remoting/webapp/me2mom/remoting.js b/remoting/webapp/me2mom/remoting.js
index 0508374..83e8ec2 100644
--- a/remoting/webapp/me2mom/remoting.js
+++ b/remoting/webapp/me2mom/remoting.js
@@ -239,8 +239,8 @@ function setClientMode(mode) {
}
function showWaiting_() {
- showElement(document.getElementById('client-footer'), false);
- showElement(document.getElementById('host-footer'), false);
+ showElement(document.getElementById('client-footer-text'), false);
+ showElement(document.getElementById('host-footer-text'), false);
showElement(document.getElementById('waiting-footer'), true);
document.getElementById('cancel-button').disabled = false;
}