From 9fe97a5deb901a42491c0c43fec54a5d9d5691db Mon Sep 17 00:00:00 2001
From: Patrick Davison <snapwilliam@gmail.com>
Date: Sun, 24 Feb 2013 03:42:18 -0800
Subject: Fixed stuck-yellow issue with flashElement.

---
 js/mapspecs.js | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'js')

diff --git a/js/mapspecs.js b/js/mapspecs.js
index 9cbd336..0e0a7e5 100644
--- a/js/mapspecs.js
+++ b/js/mapspecs.js
@@ -712,7 +712,12 @@ function targetColor(target) {
 
 
 function flashelement(eid, times, color, speed) {
-	if (document.getElementById(eid) == undefined) return;
+
+	if (typeof(document.getElementById(eid)) == 'undefined') return;
+	var elementToFlash = document.getElementById(eid);
+	if (elementToFlash.isBeingFlashed == true) return;
+	elementToFlash.isBeingFlashed = true;
+	
 	if (!color) {
 		color = "#FFFF44";
 	}
@@ -720,28 +725,23 @@ function flashelement(eid, times, color, speed) {
 		speed = 220;
 	}
 	speedon = speed * .5;
-	//document.getElementById(eid).setAttribute('class', 'no_transition');
-	var currentclass = document.getElementById(eid).className;
-	if (document.getElementById(eid).classOrigName != undefined)
-		currentclass = document.getElementById(eid).classOrigName;
-	var currentColor = document.getElementById(eid).style.backgroundColor;
-	document.getElementById(eid).className='no_transition '+currentclass;
-	document.getElementById(eid).style.backgroundColor = '#000000';
+
+	var currentclass = elementToFlash.className;
+	if (elementToFlash.classOrigName != undefined)
+		currentclass = elementToFlash.classOrigName;
+	var currentColor = elementToFlash.style.backgroundColor;
+	elementToFlash.className='no_transition '+currentclass;
+	elementToFlash.style.backgroundColor = '#000000';
 	for (var i=0; i<times; i++) {
 		//Flash bright
 		setTimeout("document.getElementById('"+eid+"').style.color = '#000000'", i*speed);
 		setTimeout("document.getElementById('"+eid+"').style.backgroundColor = '"+color+"'", i*speed);
-		// setTimeout("document.getElementById('"+mapid+",dspCount').style.fontWeight = 'bold'", i*200);
 		//Flash out
 		setTimeout("document.getElementById('"+eid+"').style.color = ''", (i*speed) + speedon);
 		setTimeout("document.getElementById('"+eid+"').style.backgroundColor = ''", (i*speed) + speedon);
-	// setTimeout("document.getElementById('"+mapid+",dspCount').style.fontWeight = ''", i*200);
 	}
-	
-	//setTimeout("document.getElementById('"+eid+"').className = '"+currentclass+"'", (i*220) + 200);
 	setTimeout("document.getElementById('"+eid+"').style.backgroundColor = '"+currentColor+"'", (i*speed) + 200);
-//document.getElementById(eid).className=currentclass;
-//document.getElementById(eid).style.backgroundColor=currentColor;
+	setTimeout("document.getElementById('"+eid+"').isBeingFlashed = false", (i*speed) + 220);
 }
 
 
-- 
cgit v1.2.3