From ee4bdc09979a2be269ad29fcfbbe65f762b5711e Mon Sep 17 00:00:00 2001
From: Guangcong Luo <guangcongluo@gmail.com>
Date: Mon, 4 Feb 2013 00:07:25 -0800
Subject: [PATCH] Fix for the z-index change

---
 js/battle.js | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/js/battle.js b/js/battle.js
index 37b538303..b2aedf9dc 100644
--- a/js/battle.js
+++ b/js/battle.js
@@ -791,7 +791,7 @@ function Battle(frame, logFrame, noPreload) {
 			selfS.subsp = subsp;
 			selfS.iw = subsp.w;
 			selfS.ih = subsp.h;
-			self.spriteElemsFront[siden].append('<img src="' + subsp.url + '" style="display:none;position:absolute;z-index:10" />');
+			self.spriteElemsFront[siden].append('<img src="' + subsp.url + '" style="display:none;position:absolute" />');
 			selfS.subElem = self.spriteElemsFront[siden].children().last();
 
 			//temp//selfS.subElem.css({position: 'absolute', display: 'block'});
@@ -914,6 +914,13 @@ function Battle(frame, logFrame, noPreload) {
 			if (!selfS.isBackSprite && slot == 1) selfS.statbarOffset = 17;
 			if (selfS.isBackSprite && slot == 1) selfS.statbarOffset = -7;
 
+			// make sure element is in the right z-order
+			if (!slot && selfS.isBackSprite || slot && !selfS.isBackSprite) {
+				selfS.elem.prependTo(selfS.elem.parent());
+			} else {
+				selfS.elem.appendTo(selfS.elem.parent());
+			}
+
 			var pos = self.pos(selfS, {
 				w: 0,
 				h: 96
@@ -925,7 +932,7 @@ function Battle(frame, logFrame, noPreload) {
 			selfS.w = sp.w;
 			selfS.h = sp.h;
 			selfS.elem.css({
-				'z-index': (selfS.isBackSprite ? 1+slot : 4-slot),
+				// 'z-index': (selfS.isBackSprite ? 1+slot : 4-slot),
 				position: 'absolute',
 				display: 'block'
 			});
@@ -982,6 +989,13 @@ function Battle(frame, logFrame, noPreload) {
 			if (!selfS.isBackSprite && slot == 1) selfS.statbarOffset = 17;
 			if (selfS.isBackSprite && slot == 1) selfS.statbarOffset = -7;
 
+			// make sure element is in the right z-order
+			if (!slot && selfS.isBackSprite || slot && !selfS.isBackSprite) {
+				selfS.elem.prependTo(selfS.elem.parent());
+			} else {
+				selfS.elem.appendTo(selfS.elem.parent());
+			}
+
 			var pos = self.pos(selfS, {
 				w: 0,
 				h: 96
@@ -991,7 +1005,7 @@ function Battle(frame, logFrame, noPreload) {
 
 			selfS.anim();
 			selfS.elem.css({
-				'z-index': (selfS.isBackSprite ? 1+slot : 4-slot),
+				// 'z-index': (selfS.isBackSprite ? 1+slot : 4-slot),
 				position: 'absolute',
 				opacity: 0,
 				display: 'block'