From 261ac0bdc337a071d3f881ebe9b46b45d2e9f476 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Fri, 13 Jun 2014 13:29:29 +0200
Subject: [PATCH] Better etherpad iframe sizing

---
 public/css/vroom.css | 1 +
 public/js/vroom.js   | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/public/css/vroom.css b/public/css/vroom.css
index e4f50b4..3e5cf39 100644
--- a/public/css/vroom.css
+++ b/public/css/vroom.css
@@ -163,6 +163,7 @@
 #etherpadContainer {
   display: none;
   height: auto;
+  overflow-y: scroll;
 }
 #chatBox {
   max-height:300px;
diff --git a/public/js/vroom.js b/public/js/vroom.js
index 693bcc8..09be79d 100644
--- a/public/js/vroom.js
+++ b/public/js/vroom.js
@@ -1937,7 +1937,7 @@ function initVroom(room) {
       padId: etherpad.group + '$' + room,
       showControls: true,
       showLineNumbers: true,
-      height: maxHeight() + 'px',
+      height: maxHeight()-7 + 'px',
       border: 2,
       userColor: peers.local.color
     });
@@ -1991,10 +1991,11 @@ function initVroom(room) {
   window.onresize = function (){
     $('#webRTCVideo').css('max-height', maxHeight());
     $('#mainVideo>video').css('max-height', maxHeight());
-    $('#epframetherpadContainer').css('max-height', maxHeight());
+    $('#etherpadContainer').css('max-height', maxHeight());
   };  
   // Preview heigh is limited to the windows heigh, minus the navbar, minus 25px
   $('#webRTCVideo').css('max-height', maxHeight());
+  $('#etherpadContainer').css('max-height', maxHeight());
 
 };