Author: simoneg
Date: Mon Jan 12 05:00:01 2009
New Revision: 733718
URL: http://svn.apache.org/viewvc?rev=733718&view=rev
Log:
LABS-273 : force connection from menu to parent divs, to avoid closure problems
Modified:
labs/magma/trunk/website-administration-inline/src/main/resources/org/apache/magma/website/admin/inlineMenu.js
Modified:
labs/magma/trunk/website-administration-inline/src/main/resources/org/apache/magma/website/admin/inlineMenu.js
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/website-administration-inline/src/main/resources/org/apache/magma/website/admin/inlineMenu.js?rev=733718&r1=733717&r2=733718&view=diff
==============================================================================
---
labs/magma/trunk/website-administration-inline/src/main/resources/org/apache/magma/website/admin/inlineMenu.js
(original)
+++
labs/magma/trunk/website-administration-inline/src/main/resources/org/apache/magma/website/admin/inlineMenu.js
Mon Jan 12 05:00:01 2009
@@ -1,16 +1,22 @@
function setupInlineMenu() {
$('.MagmaInlineAdminMenu').each(function() {
- var parent = this.parentNode;
- document.body.appendChild(this);
- this.style.zIndex = "400";
- var hilite = hiliteBoxFor(parent, this);
+ if (!this.targetDiv) {
+ var parent = this.parentNode;
+ document.body.appendChild(this);
+ this.style.zIndex = "400";
+ var hilite = hiliteBoxFor(parent, this);
+ }
});
-
$('#MagmaAdminSubs a').each(function() {
if (this.href.charAt(this.href.length - 1) != '#') {
- this.onclick = function() { popup(this.href); return
false; };
+ //this.onclick = function() { popup(this.href); return
false; };
+ this.href = "javascript:popup('" + this.href + "');";
}
});
+ var adminmenu = $('#MagmaAdminMenu').get(0);
+ if (adminmenu) {
+ adminmenu.style.display = 'block';
+ }
}
function findPos(obj) {
var curleft = curtop = 0;
@@ -29,8 +35,10 @@
hilite[i] = document.createElement('div');
}
- hilite[4].onclick = function() { display(menu, div) };
- menu.onmouseover = function() { display(menu, div) };
+ menu.targetDiv = div;
+
+ hilite[4].onclick = function() { display(menu) };
+ menu.onmouseover = function() { display(menu) };
hilite[4].onmouseover = function() { bolderHilite(hilite) };
for (var i = 0; i < hilite.length; i++) {
@@ -43,7 +51,7 @@
lighterHilite(hilite);
setTimeout(function() { reposition(hilite, div) }, 500);
setInterval(function() { reposition(hilite, div) }, 1500);
-
+
var links = menu.getElementsByTagName("a");
for (var i = 0; i < links.length; i++) {
links[i].onclick = function() { popup(this.href, div); return
false; };
@@ -101,7 +109,8 @@
hilite[hilite.length - 1].className += " MagmaAdminContextMenuBox";
}
-function display(menu, div) {
+function display(menu) {
+ var div = menu.targetDiv;
clearTimeout(menu.timer);
menu.timer = setTimeout(function() { menu.timer = null;
menu.style.display = 'none'; }, 2000);
var pos = findPos(div);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@labs.apache.org
For additional commands, e-mail: commits-h...@labs.apache.org
