From eead7d38b86578c5b095b3e3ed4e46b1f7d3988c Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Thu, 24 Jan 2008 21:35:10 +0000 Subject: [PATCH] Monotone-Parent: 46d42d040199ad6d8849025055fba6fdf50d9455 Monotone-Revision: 7eb2e419ecd60a47518cc24172e511d8ec968cdd Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2008-01-24T21:35:10 Monotone-Branch: ca.inverse.sogo --- UI/WebServerResources/generic.js | 59 +++++++++++++------------------- 1 file changed, 23 insertions(+), 36 deletions(-) diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js index eee7bbc3a..98b92030a 100644 --- a/UI/WebServerResources/generic.js +++ b/UI/WebServerResources/generic.js @@ -1141,33 +1141,27 @@ function initTabs() { var containers = document.getElementsByClassName("tabsContainer"); for (var x = 0; x < containers.length; x++) { var container = containers[x]; - var firstTab = null; - for (var i = 0; i < container.childNodes.length; i++) { - if (container.childNodes[i].tagName == 'UL') { + var list = container.childNodesWithTag("ul"); + + if (list.length > 0) { + var firstTab = null; + var nodes = $(list[0]).childNodesWithTag("li"); + for (var i = 0; i < nodes.length; i++) { + var currentNode = $(nodes[i]); if (!firstTab) - firstTab = i; - } - } - var nodes = container.childNodes[firstTab].childNodes; - - firstTab = null; - for (var i = 0; i < nodes.length; i++) { - var currentNode = nodes[i]; - if (currentNode.tagName == 'LI') { - if (!firstTab) - firstTab = i; - $(currentNode).observe("mousedown", onTabMouseDown); - $(currentNode).observe("click", onTabClick); + firstTab = currentNode; + currentNode.observe("mousedown", onTabMouseDown); + currentNode.observe("click", onTabClick); //$(currentNode.getAttribute("target")).hide(); } + + firstTab.addClassName("first"); + firstTab.addClassName("active"); + container.activeTab = firstTab; + + var target = $(firstTab.getAttribute("target")); + target.addClassName("active"); } - - nodes[firstTab].addClassName("first"); - nodes[firstTab].addClassName("active"); - container.activeTab = nodes[firstTab]; - - var target = $(nodes[firstTab].getAttribute("target")); - target.addClassName("active"); //target.show(); } } @@ -1210,8 +1204,8 @@ function initMenu(menuDIV, callbacks) { } function onTabMouseDown(event) { - event.cancelBubble = true; - preventDefault(event); + event.stopPropagation(); + event.preventDefault(); } function openExternalLink(anchor) { @@ -1252,18 +1246,13 @@ function getTopWindow() { } function onTabClick(event) { - var node = getTarget(event); // LI element - - var target = node.getAttribute("target"); - - var container = node.parentNode.parentNode; - var oldTarget = container.activeTab.getAttribute("target"); - var content = $(target); - var oldContent = $(oldTarget); + var container = this.parentNode.parentNode; + var content = $(this.getAttribute("target")); + var oldContent = $(container.activeTab.getAttribute("target")); oldContent.removeClassName("active"); container.activeTab.removeClassName("active"); // previous LI - container.activeTab = node; + container.activeTab = this; container.activeTab.addClassName("active"); // current LI content.addClassName("active"); @@ -1280,8 +1269,6 @@ function onTabClick(event) { //container.activeTab = node; //container.activeTab.show(); - - return false; } function enableAnchor(anchor) {