From 14f7b1a1738a68e55e816dc8f75fb75d0202c514 Mon Sep 17 00:00:00 2001
From: jamiewalch <jamiewalch@chromium.org>
Date: Thu, 4 Sep 2014 21:09:24 -0700
Subject: Fix scroll-related issues.

This fixes two related issues:
* Scrolling was broken in apps v2, due to window-body div not being
  full-height.
* Scrolling was broken post-disconnect, due to the addition of an explicit
  scroller node, separate from the body.
* The dialog screen was off by 1px, due to the addition of the window-body
  div.

Since this has broken a few times now, I plan to add a browser to test to verify
the behaviour, but I don't want to hold up this CL for that.

BUG=251443

Review URL: https://codereview.chromium.org/539403002

Cr-Commit-Position: refs/heads/master@{#293431}
---
 remoting/webapp/html/template_main.html | 2 +-
 remoting/webapp/main.css                | 9 ---------
 remoting/webapp/ui_mode.js              | 6 +++---
 3 files changed, 4 insertions(+), 13 deletions(-)

(limited to 'remoting')

diff --git a/remoting/webapp/html/template_main.html b/remoting/webapp/html/template_main.html
index 915ac23..72f8469 100644
--- a/remoting/webapp/html/template_main.html
+++ b/remoting/webapp/html/template_main.html
@@ -25,7 +25,7 @@ found in the LICENSE file.
 
     <meta-include src="webapp/html/window_frame.html"/>
 
-    <div class="window-body">
+    <div class="window-body full-height">
 
       <!-- loading-mode is initially visible, but becomes hidden as soon as an
            AppMode is selected by remoting.init. All other divs are initially
diff --git a/remoting/webapp/main.css b/remoting/webapp/main.css
index 3337ed4..d1ffd11 100644
--- a/remoting/webapp/main.css
+++ b/remoting/webapp/main.css
@@ -633,14 +633,6 @@ button {
   z-index: 1;
 }
 
-/* For apps v2, don't cover the 1px window border. */
-html.apps-v2 .dialog-screen {
-  width: calc(100% - 2px);
-  height: calc(100% - 2px);
-  top: 1px;
-  left: 1px;
-}
-
 /* TODO(jamiewalch): crbug.com/252796: Remove these once crbug.com/240772
  * is fixed. */
 .no-horizontal-scroll {
@@ -655,7 +647,6 @@ html.apps-v2.scrollable {
   overflow: scroll;
 }
 
-
 /* TODO(jamiewalch): Reinstate this if we're able to get translations for
  *     "Why is this safe?" that don't overflow in any language.
 #host-setup-dialog {
diff --git a/remoting/webapp/ui_mode.js b/remoting/webapp/ui_mode.js
index 16e5e53..b69b8a3 100644
--- a/remoting/webapp/ui_mode.js
+++ b/remoting/webapp/ui_mode.js
@@ -139,9 +139,9 @@ remoting.setMode = function(mode) {
                                  remoting.onVisibilityChanged, false);
     // TODO(jamiewalch): crbug.com/252796: Remove this once crbug.com/240772
     // is fixed.
-    var htmlNode = /** @type {HTMLElement} */ (document.body.parentNode);
-    htmlNode.classList.remove('no-horizontal-scroll');
-    htmlNode.classList.remove('no-vertical-scroll');
+    var scroller = document.getElementById('scroller');
+    scroller.classList.remove('no-horizontal-scroll');
+    scroller.classList.remove('no-vertical-scroll');
   }
 
   remoting.testEvents.raiseEvent(remoting.testEvents.Names.uiModeChanged, mode);
-- 
cgit v1.1