From a8a0807a4cc2720a8e75d390a4c8cdf36c3b2717 Mon Sep 17 00:00:00 2001 From: Matt Date: Fri, 13 Feb 2009 02:51:56 +0000 Subject: [PATCH] * CtdlDragDrop library now works in IE7 and 8 * Fix iconbar roomlist floor expansion in IE7, IE6 todo --- webcit/static/ctdldragdrop.js | 15 ++++++++------- webcit/static/wclib.js | 4 ++-- webcit/static/webcit.css | 4 +--- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/webcit/static/ctdldragdrop.js b/webcit/static/ctdldragdrop.js index cf77cfcb1..9e253b3dd 100644 --- a/webcit/static/ctdldragdrop.js +++ b/webcit/static/ctdldragdrop.js @@ -5,7 +5,7 @@ var draggedElement = null; var currentDropTargets = null; var dropTarget = null; var dragAndDropElement = null; - +var oldSelectHandler = null; function mouseDownHandler(event) { var target = event.target; var actualTarget = target; @@ -38,7 +38,7 @@ function mouseMoveHandler(event) { if (draggedElement != null) { if (dragAndDropElement == null) { dragAndDropElement = draggedElement.ctdlDnDElement(); - dragAndDropElement.setAttribute("class", "draganddrop"); + dragAndDropElement.className = "draganddrop"; document.body.appendChild(dragAndDropElement); } var clientX = event.clientX+5; @@ -59,19 +59,20 @@ function mouseMoveOut(event) { } } function setupDragDrop() { -if (document.addEventListener != undefined) { - $(document.body).observe('mousedown', mouseDownHandler); + $(document.body).observe('mousedown', mouseDownHandler); $(document.body).observe('mouseup',mouseUpHandler); $(document.body).observe('mousemove',mouseMoveHandler); $(document.body).observe('mouseover', mouseMoveOver); - $(document.body).observe('mouseout', mouseMoveOut); - } + $(document.body).observe('mouseout', mouseMoveOut); } function turnOffTextSelect() { document.onmousedown = new Function("return false"); -document.onmouseup = new Function("return true"); + document.onmouseup = new Function("return true"); + oldSelectHandler = document.onselectstart; + document.onselectstart = function() { return false; }; } function turnOnTextSelect() { document.onmousedown = null; document.onmouseup = null; + document.onselectstart = oldSelectHandler; } diff --git a/webcit/static/wclib.js b/webcit/static/wclib.js index 4e2d2976e..f7397ed98 100644 --- a/webcit/static/wclib.js +++ b/webcit/static/wclib.js @@ -214,7 +214,7 @@ function IconBarRoomList() { mailboxSPAN.appendChild(document.createTextNode(_mailbox)); $(mailboxSPAN).observe('click', expandFloorEvent); mailboxLI.appendChild(mailboxSPAN); - mailboxLI.setAttribute("class", "floor"); + mailboxLI.className = "floor"; var mailboxUL = document.createElement("ul"); mailboxLI.appendChild(mailboxUL); var mailboxRooms = GetMailboxRooms(); @@ -235,7 +235,7 @@ function IconBarRoomList() { floorSPAN.appendChild(document.createTextNode(name)); $(floorSPAN).observe('click', expandFloorEvent); floorLI.appendChild(floorSPAN); - floorLI.setAttribute("class", "floor"); + floorLI.className = "floor"; var floorUL = document.createElement("ul"); floorLI.appendChild(floorUL); var roomsForFloor = GetRoomsByFloorNum(floornum); diff --git a/webcit/static/webcit.css b/webcit/static/webcit.css index 915b21a05..3312d05f1 100644 --- a/webcit/static/webcit.css +++ b/webcit/static/webcit.css @@ -1106,11 +1106,9 @@ dt { clear: both; } .imsg { text-align: center; } -#summary_view table { -/* table-layout: fixed; stops long subjects overflowing */ -} #summary_view > table { /* hide from IE6 */ width: 100%; + table-layout: fixed; } colgroup.entity { text-align: center; -- 2.30.2