openlp-core team mailing list archive

[Simon Scudder <samscudder@xxxxxxxxx>]

Simon Scudder has proposed merging lp:~samscudder/openlp/bug-795945 into lp:openlp.

Requested reviews:
  Tim Bentley (trb143)
  Jonathan Corwin (j-corwin)
Related bugs:
  Bug #795945 in OpenLP: "Text colour appearing in shadow"
  https://bugs.launchpad.net/openlp/+bug/795945

For more details, see:
https://code.launchpad.net/~samscudder/openlp/bug-795945/+merge/64333

Function showtext in the html javascript was altered, so that the shadow layer (if present) will ignore all the font color settings. This is done using a regular expression replace, that searches for -webkit-text-fill-color and erases up to the first ; or "

If there is only a colour formatting command in the span tag, an empty class attribute is left behind, which shouldn't be a problem.
-- 
https://code.launchpad.net/~samscudder/openlp/bug-795945/+merge/64333
Your team OpenLP Core is subscribed to branch lp:openlp.

=== modified file 'openlp/core/lib/htmlbuilder.py'
--- openlp/core/lib/htmlbuilder.py	2011-05-26 17:11:22 +0000
+++ openlp/core/lib/htmlbuilder.py	2011-06-12 14:26:31 +0000
@@ -257,11 +257,12 @@
     }
 
     function show_text(newtext){
+        var match = /-webkit-text-fill-color:[^;\"]+/gi;
         if(timer != null)
             clearTimeout(timer);
         text_fade('lyricsmain', newtext);
         text_fade('lyricsoutline', newtext);
-        text_fade('lyricsshadow', newtext);
+        text_fade('lyricsshadow', newtext.replace(match, ""));
         if(text_opacity()==1) return;
         timer = setTimeout(function(){
             show_text(newtext);