From bc91cfe3d221ee312d3a7fc7a9c005800f8a3a99 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Mon, 12 Nov 2012 16:36:30 -0500 Subject: [PATCH] Fix scrolling for calendars/addressbooks lists (cherry picked from commit b088f6f97f897520d469e860b3ff740c5bc2a4ba) --- UI/WebServerResources/ContactsUI.css | 3 ++- UI/WebServerResources/SchedulerUI.css | 8 ++------ UI/WebServerResources/SchedulerUI.js | 20 ++++++++++---------- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/UI/WebServerResources/ContactsUI.css b/UI/WebServerResources/ContactsUI.css index 0aef1e1e5..0d45b1d87 100644 --- a/UI/WebServerResources/ContactsUI.css +++ b/UI/WebServerResources/ContactsUI.css @@ -110,7 +110,8 @@ DIV#contactFoldersList bottom: 0px; margin: 0px; padding: 0px; - overflow: hidden; } + overflow: auto; + overflow-x: hidden; } DIV#abToolbar { padding-left: 6px; } diff --git a/UI/WebServerResources/SchedulerUI.css b/UI/WebServerResources/SchedulerUI.css index b4295ffde..597d67c9f 100644 --- a/UI/WebServerResources/SchedulerUI.css +++ b/UI/WebServerResources/SchedulerUI.css @@ -5,7 +5,8 @@ DIV#leftPanel width: 19.25em; bottom: 0px; background-color: #CCDDEC; - overflow: hidden; } + overflow: auto; + overflow-x: hidden; } DIV#schedulerTabs { position: absolute; @@ -21,9 +22,6 @@ DIV#schedulerTabs .tab { left: 0px; right: 0px; } -DIV#calendarSelectorView -{ overflow: hidden; } - DIV#calendarSelectorButtons { padding-left: 6px; } @@ -44,8 +42,6 @@ UL#calendarList padding: 0px; list-style-type: none; list-style-image: none; - overflow: hidden; - overflow-y: auto; -moz-user-select: none; -khtml-user-select: none; } diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js index b57485a42..b177bb014 100644 --- a/UI/WebServerResources/SchedulerUI.js +++ b/UI/WebServerResources/SchedulerUI.js @@ -3239,23 +3239,23 @@ function onWindowResize(event) { handle.adjust(); if (!$(document.body).hasClassName("popup")) - drawNowLine (); + drawNowLine(); } -function drawNowLine () { +function drawNowLine() { var d = new Date(); var hours = d.getHours(); var minutes = d.getMinutes(); if (currentView == "dayview") { - var today = new Date (); - var m = parseInt(today.getMonth ()) + 1; - var d = today.getDate (); + var today = new Date(); + var m = parseInt(today.getMonth()) + 1; + var d = today.getDate(); if (m < 10) m = "0" + m; if (d < 10) d = "0" + d; - var day = today.getFullYear () + "" + m + "" + d; + var day = today.getFullYear() + "" + m + "" + d; var targets = $$("DIV#daysView DIV.days DIV.day[day=" + day + "] DIV.clickableHourCell"); } @@ -3268,12 +3268,12 @@ function drawNowLine () { if (target) { var div = $("nowLineDisplay"); if (!div) - div = new Element ("div", {'id': 'nowLineDisplay'}); + div = new Element("div", {'id': 'nowLineDisplay'}); - div.style.top = parseInt (((minutes * target.offsetHeight) / 60) - 1) + "px"; - target.appendChild (div); + div.style.top = parseInt(((minutes * target.offsetHeight) / 60) - 1) + "px"; + target.appendChild(div); - setTimeout ("drawNowLine ();", 60000); // 1 min. + setTimeout("drawNowLine ();", 60000); // 1 min. } } }