[Mapbender-commits] r3911 - branches/2.5/http/javascripts branches/2.6/http/javascripts trunk/mapbender/http/javascripts

[svn_mapbender at osgeo.org]

Author: christoph
Date: 2009-04-28 08:13:59 -0400 (Tue, 28 Apr 2009)
New Revision: 3911

Modified:
   branches/2.5/http/javascripts/mod_sandclock.php
   branches/2.6/http/javascripts/mod_sandclock.php
   trunk/mapbender/http/javascripts/mod_sandclock.php
Log:
http://trac.osgeo.org/mapbender/ticket/457

Modified: branches/2.5/http/javascripts/mod_sandclock.php
===================================================================
--- branches/2.5/http/javascripts/mod_sandclock.php	2009-04-28 10:43:33 UTC (rev 3910)
+++ branches/2.5/http/javascripts/mod_sandclock.php	2009-04-28 12:13:59 UTC (rev 3911)
@@ -40,9 +40,21 @@
 		writeTag(mod_sandclock_target, "sandclock", temp);
 		mb_arrangeElement(mod_sandclock_target, "sandclock", (mb_mapObj[ind].width/2 - 16), (mb_mapObj[ind].height/2 - 16));
 	}
-	aktiv = setTimeout("mod_sandclock('','"+myMapId+"')",100);
-	if(window.frames[mod_sandclock_target].document.getElementById(myMapId) && window.frames[mod_sandclock_target].document.getElementById(myMapId).complete){
-		clearTimeout(aktiv);
-		writeTag(mod_sandclock_target, "sandclock", "");
-	} 
+
+	//
+	// if myMapId is nopt given, the sandclock has to be turned off manually
+	// by calling mod_sandclock_off. Usually this is done in a callback 
+	// function.
+	//
+	if (typeof myMapId !== "undefined") {
+		aktiv = setTimeout("mod_sandclock('','"+myMapId+"')",100);
+		if(window.frames[mod_sandclock_target].document.getElementById(myMapId) && window.frames[mod_sandclock_target].document.getElementById(myMapId).complete){
+			clearTimeout(aktiv);
+			mod_sandclock_off();
+		} 
+	}
+}
+
+function mod_sandclock_off() {
+	writeTag(mod_sandclock_target, "sandclock", "");
 }
\ No newline at end of file

Modified: branches/2.6/http/javascripts/mod_sandclock.php
===================================================================
--- branches/2.6/http/javascripts/mod_sandclock.php	2009-04-28 10:43:33 UTC (rev 3910)
+++ branches/2.6/http/javascripts/mod_sandclock.php	2009-04-28 12:13:59 UTC (rev 3911)
@@ -47,35 +47,44 @@
 			el_top.style.position = "absolute";
 			el_top.style.top = "0px";
 			el_top.style.left = "0px";
-			el_top.style.width = "0px";
-			el_top.style.height = "0px";
 			el_top.style.overflow = "hidden";
 			el_top.style.zIndex = "10";
-			el_top.style.visibility = "hidden";
+			el_top.style.visibility = "visible";
 			el_top.style.cursor = "crosshair";
-			el_top.style.backgroundColor = "#ff0000";
 			el_top.id = mb_mapObj[ind].elementName+"_sandclock";
 			map_el.appendChild(el_top);
 		}
 		writeTag(mb_mapObj[ind].frameName, mb_mapObj[ind].elementName+"_sandclock", temp);
 		mb_arrangeElement("", mod_sandclock_target+"_sandclock", (mb_mapObj[ind].width/2 - 16), (mb_mapObj[ind].height/2 - 16));
 	}
-	aktiv = setTimeout(function () {
-		mod_sandclock('',myMapId);
-		},10);
-	var myMapIdArray = myMapId.split(",");
-	var complete = true;
-	var myMapId;
-	for (var i = 0; i < myMapIdArray.length && complete; i++) {
-		myMapId = myMapIdArray[i];
-		var myDoc = mb_mapObj[ind].getDomElement().ownerDocument;
-		if(myDoc.getElementById(myMapId) && 
-			!myDoc.getElementById(myMapId).complete) {
-			complete = false;
+
+	//
+	// if myMapId is nopt given, the sandclock has to be turned off manually
+	// by calling mod_sandclock_off. Usually this is done in a callback 
+	// function.
+	//
+	if (typeof myMapId !== "undefined") {
+		aktiv = setTimeout(function () {
+			mod_sandclock('',myMapId);
+			},10);
+		var myMapIdArray = myMapId.split(",");
+		var complete = true;
+		var myMapId;
+		for (var i = 0; i < myMapIdArray.length && complete; i++) {
+			myMapId = myMapIdArray[i];
+			var myDoc = mb_mapObj[ind].getDomElement().ownerDocument;
+			if(myDoc.getElementById(myMapId) && 
+				!myDoc.getElementById(myMapId).complete) {
+				complete = false;
+			}
 		}
+		if (complete) {
+			clearTimeout(aktiv);
+			mod_sandclock_off(mb_mapObj[ind]);
+		} 
 	}
-	if (complete) {
-		clearTimeout(aktiv);
-		writeTag(mb_mapObj[ind].frameName, mb_mapObj[ind].elementName+"_sandclock", "");
-	} 
 }
+
+function mod_sandclock_off(mapObj) {
+	writeTag(mapObj.frameName, mapObj.elementName+"_sandclock", "");
+}
\ No newline at end of file

Modified: trunk/mapbender/http/javascripts/mod_sandclock.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_sandclock.php	2009-04-28 10:43:33 UTC (rev 3910)
+++ trunk/mapbender/http/javascripts/mod_sandclock.php	2009-04-28 12:13:59 UTC (rev 3911)
@@ -47,35 +47,44 @@
 			el_top.style.position = "absolute";
 			el_top.style.top = "0px";
 			el_top.style.left = "0px";
-			el_top.style.width = "0px";
-			el_top.style.height = "0px";
 			el_top.style.overflow = "hidden";
 			el_top.style.zIndex = "10";
-			el_top.style.visibility = "hidden";
+			el_top.style.visibility = "visible";
 			el_top.style.cursor = "crosshair";
-			el_top.style.backgroundColor = "#ff0000";
 			el_top.id = mb_mapObj[ind].elementName+"_sandclock";
 			map_el.appendChild(el_top);
 		}
 		writeTag(mb_mapObj[ind].frameName, mb_mapObj[ind].elementName+"_sandclock", temp);
 		mb_arrangeElement("", mod_sandclock_target+"_sandclock", (mb_mapObj[ind].width/2 - 16), (mb_mapObj[ind].height/2 - 16));
 	}
-	aktiv = setTimeout(function () {
-		mod_sandclock('',myMapId);
-		},10);
-	var myMapIdArray = myMapId.split(",");
-	var complete = true;
-	var myMapId;
-	for (var i = 0; i < myMapIdArray.length && complete; i++) {
-		myMapId = myMapIdArray[i];
-		var myDoc = mb_mapObj[ind].getDomElement().ownerDocument;
-		if(myDoc.getElementById(myMapId) && 
-			!myDoc.getElementById(myMapId).complete) {
-			complete = false;
+
+	//
+	// if myMapId is nopt given, the sandclock has to be turned off manually
+	// by calling mod_sandclock_off. Usually this is done in a callback 
+	// function.
+	//
+	if (typeof myMapId !== "undefined") {
+		aktiv = setTimeout(function () {
+			mod_sandclock('',myMapId);
+			},10);
+		var myMapIdArray = myMapId.split(",");
+		var complete = true;
+		var myMapId;
+		for (var i = 0; i < myMapIdArray.length && complete; i++) {
+			myMapId = myMapIdArray[i];
+			var myDoc = mb_mapObj[ind].getDomElement().ownerDocument;
+			if(myDoc.getElementById(myMapId) && 
+				!myDoc.getElementById(myMapId).complete) {
+				complete = false;
+			}
 		}
+		if (complete) {
+			clearTimeout(aktiv);
+			mod_sandclock_off(mb_mapObj[ind]);
+		} 
 	}
-	if (complete) {
-		clearTimeout(aktiv);
-		writeTag(mb_mapObj[ind].frameName, mb_mapObj[ind].elementName+"_sandclock", "");
-	} 
 }
+
+function mod_sandclock_off(mapObj) {
+	writeTag(mapObj.frameName, mapObj.elementName+"_sandclock", "");
+}
\ No newline at end of file