raoul
/
openlp
forked from openlp/openlp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove version check and js tidyups

This commit is contained in:
Jonathan Corwin 2011-12-08 19:24:25 +00:00
parent 44eb1fb024
commit 15d5b97075
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
openlp/core/lib/htmlbuilder.py
View File

@ -114,10 +114,10 @@ sup {
document.getElementById('lyricsmain').style.visibility = lyrics; document.getElementById('lyricsmain').style.visibility = lyrics;
document.getElementById('image').style.visibility = lyrics; document.getElementById('image').style.visibility = lyrics;
outline = document.getElementById('lyricsoutline') outline = document.getElementById('lyricsoutline')
if(outline!=null) if(outline != null)
outline.style.visibility = lyrics; outline.style.visibility = lyrics;
shadow = document.getElementById('lyricsshadow') shadow = document.getElementById('lyricsshadow')
if(shadow!=null) if(shadow != null)
shadow.style.visibility = lyrics; shadow.style.visibility = lyrics;
document.getElementById('footer').style.visibility = lyrics; document.getElementById('footer').style.visibility = lyrics;
} }
@ -130,23 +130,25 @@ sup {
var match = /-webkit-text-fill-color:[^;\"]+/gi; var match = /-webkit-text-fill-color:[^;\"]+/gi;
if(timer != null) if(timer != null)
clearTimeout(timer); clearTimeout(timer);
/* QtWebkit bug with outlines and justify causing outline alignment problems. (Bug 859950) /*
Surround each word with a <span> to workaround, but only in this scenario. */ QtWebkit bug with outlines and justify causing outline alignment
if(webkitvers<=534.3){ problems. (Bug 859950) Surround each word with a <span> to workaround,
but only in this scenario.
*/
var txt = document.getElementById('lyricsmain'); var txt = document.getElementById('lyricsmain');
if(window.getComputedStyle(txt).textAlign=='justify'){ if(window.getComputedStyle(txt).textAlign == 'justify'){
var outline = document.getElementById('lyricsoutline'); var outline = document.getElementById('lyricsoutline');
if(outline!=null) if(outline != null)
txt = outline; txt = outline;
if(window.getComputedStyle(txt).webkitTextStrokeWidth!="0px"){ if(window.getComputedStyle(txt).webkitTextStrokeWidth != '0px'){
newtext = '<span>' + newtext.replace(/[ ](?![^<]*>)/g, "</span> <span>") + '</span>'; newtext = '<span>' + newtext.replace(/[ ](?![^<]*>)/g,
} '</span> <span>') + '</span>';
} }
} }
text_fade('lyricsmain', newtext); text_fade('lyricsmain', newtext);
text_fade('lyricsoutline', newtext); text_fade('lyricsoutline', newtext);
text_fade('lyricsshadow', newtext.replace(match, "")); text_fade('lyricsshadow', newtext.replace(match, ''));
if(text_opacity()==1) return; if(text_opacity() == 1) return;
timer = setTimeout(function(){ timer = setTimeout(function(){
show_text(newtext); show_text(newtext);
}, 100); }, 100);
@ -163,18 +165,18 @@ sup {
slides) still looks pretty and is zippy. slides) still looks pretty and is zippy.
*/ */
var text = document.getElementById(id); var text = document.getElementById(id);
if(text==null) return; if(text == null) return;
if(!transition){ if(!transition){
text.innerHTML = newtext; text.innerHTML = newtext;
return; return;
} }
if(newtext==text.innerHTML){ if(newtext == text.innerHTML){
text.style.opacity = parseFloat(text.style.opacity) + 0.3; text.style.opacity = parseFloat(text.style.opacity) + 0.3;
if(text.style.opacity>0.7) if(text.style.opacity > 0.7)
text.style.opacity = 1; text.style.opacity = 1;
} else { } else {
text.style.opacity = parseFloat(text.style.opacity) - 0.3; text.style.opacity = parseFloat(text.style.opacity) - 0.3;
if(text.style.opacity<=0.1){ if(text.style.opacity <= 0.1){
text.innerHTML = newtext; text.innerHTML = newtext;
} }
} }
@ -186,7 +188,7 @@ sup {
} }
function show_text_complete(){ function show_text_complete(){
return (text_opacity()==1); return (text_opacity() == 1);
} }
</script> </script>
</head> </head>