From 335e276d6db6dcbd3365d8432894aa7ad278cb19 Mon Sep 17 00:00:00 2001
From: Simon Scudder <samscudder@yahoo.com>
Date: Sat, 11 Jun 2011 12:18:58 -0300
Subject: [PATCH 1/3] Fixed bug #795945 "Text colour appearing in shadow"

---
 openlp/core/lib/htmlbuilder.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openlp/core/lib/htmlbuilder.py b/openlp/core/lib/htmlbuilder.py
index cf7e73648..1a66f9288 100644
--- a/openlp/core/lib/htmlbuilder.py
+++ b/openlp/core/lib/htmlbuilder.py
@@ -261,7 +261,7 @@ sup {
             clearTimeout(timer);
         text_fade('lyricsmain', newtext);
         text_fade('lyricsoutline', newtext);
-        text_fade('lyricsshadow', newtext);
+        text_fade('lyricsshadow', newtext.replace(/-webkit-text-fill-color:[^;\"]+/gi, ""));
         if(text_opacity()==1) return;
         timer = setTimeout(function(){
             show_text(newtext);

From 0b2f44685616e824aac075be0491d9bbc2619d24 Mon Sep 17 00:00:00 2001
From: Simon Scudder <samscudder@yahoo.com>
Date: Sat, 11 Jun 2011 15:14:20 -0300
Subject: [PATCH 2/3] Fixed bug #795945 "Text colour appearing in shadow" now
 within 80 columns

---
 openlp/core/lib/htmlbuilder.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/openlp/core/lib/htmlbuilder.py b/openlp/core/lib/htmlbuilder.py
index 1a66f9288..3a8e21285 100644
--- a/openlp/core/lib/htmlbuilder.py
+++ b/openlp/core/lib/htmlbuilder.py
@@ -261,7 +261,8 @@ sup {
             clearTimeout(timer);
         text_fade('lyricsmain', newtext);
         text_fade('lyricsoutline', newtext);
-        text_fade('lyricsshadow', newtext.replace(/-webkit-text-fill-color:[^;\"]+/gi, ""));
+        cleantext = newtext.replace(/-webkit-text-fill-color:[^;\"]+/gi, "");
+        text_fade('lyricsshadow', cleantext);
         if(text_opacity()==1) return;
         timer = setTimeout(function(){
             show_text(newtext);

From 9aa9952609ac51711f4ffbe7939b4676e8cf1e26 Mon Sep 17 00:00:00 2001
From: Simon Scudder <samscudder@yahoo.com>
Date: Sun, 12 Jun 2011 11:13:01 -0300
Subject: [PATCH 3/3] Fixed bug #795945 "Text colour appearing in shadow"

---
 openlp/core/lib/htmlbuilder.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openlp/core/lib/htmlbuilder.py b/openlp/core/lib/htmlbuilder.py
index 3a8e21285..36f11d1a5 100644
--- a/openlp/core/lib/htmlbuilder.py
+++ b/openlp/core/lib/htmlbuilder.py
@@ -257,12 +257,12 @@ sup {
     }
 
     function show_text(newtext){
+        var match = /-webkit-text-fill-color:[^;\"]+/gi;
         if(timer != null)
             clearTimeout(timer);
         text_fade('lyricsmain', newtext);
         text_fade('lyricsoutline', newtext);
-        cleantext = newtext.replace(/-webkit-text-fill-color:[^;\"]+/gi, "");
-        text_fade('lyricsshadow', cleantext);
+        text_fade('lyricsshadow', newtext.replace(match, ""));
         if(text_opacity()==1) return;
         timer = setTimeout(function(){
             show_text(newtext);