From 5b1753db6bf6ef1d93f47a2284efd3223488d5e7 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Wed, 9 Jun 2010 21:19:51 +0000 Subject: [PATCH] * Removed a bunch of IE-isms no longer required now that we support IE 6. * Determined that the non-scrolling banner was implemented using a method that only works in Firefox. Removed it. Now it's equally broken in all browsers. I'll implement a fix and commit that next. --- webcit/static/t/head.html | 11 +---------- webcit/static/wclib.js | 33 ++------------------------------- 2 files changed, 3 insertions(+), 41 deletions(-) diff --git a/webcit/static/t/head.html b/webcit/static/t/head.html index 2a1281ebc..fbdcbbb7d 100644 --- a/webcit/static/t/head.html +++ b/webcit/static/t/head.html @@ -27,16 +27,7 @@ - - + diff --git a/webcit/static/wclib.js b/webcit/static/wclib.js index 961b995ca..80da93ded 100644 --- a/webcit/static/wclib.js +++ b/webcit/static/wclib.js @@ -23,7 +23,6 @@ var supportsAddEventListener = (!!document.addEventListener); var today = new Date(); var wc_log = ""; -var is_ie6 = false; if (document.all) {browserType = "ie"} if (window.navigator.userAgent.toLowerCase().match("gecko")) { browserType= "gecko"; @@ -31,7 +30,6 @@ if (window.navigator.userAgent.toLowerCase().match("gecko")) { var ns6=document.getElementById&&!document.all; Event.observe(window, 'load', ToggleTaskDateOrNoDateActivate); Event.observe(window, 'load', taskViewActivate); -Event.observe(window, 'load', fixbanner); //document.observe("dom:loaded", setupPrefEngine); document.observe("dom:loaded", setupIconBar); function CtdlRandomString() { @@ -871,35 +869,8 @@ function fixMissingCSSTable(elems) { } } } -function fixbanner() { - // Use prototype api methods here - var elems = [$('room_banner'),$('actiondiv')]; - fixMissingCSSTable(elems); - if (!is_ie6) { - Event.observe(window, 'resize', makeContentScrollable); - makeContentScrollable(); - } -} -function makeContentScrollable() { -if (document.getElementById("banner") - && document.getElementById("content") - && !document.getElementById("summary_view")) { - WCLog("makeContentScrollable"); - document.body.style.overflowY="hidden"; - var global = $("global"); - global.className += "scrollable"; - var content = document.getElementById("content"); - var banner = document.getElementById("banner"); - var bannerHeight = banner.offsetHeight; - banner.style.width="100%"; - var bannerPercent = (bannerHeight/document.viewport.getHeight())*100; - //banner.style.height=bannerPercent+"%"; - content.style.overflowY="scroll"; - //content.style.top=bannerPercent+"%"; - content.style.height=(100-bannerPercent)+"%"; - content.style.right="0px"; - } -} + + function fixOffsetBanner() { var banner = document.getElementById("banner"); if (banner.offsetLeft > 0) { -- 2.30.2