From c2794b635564242bb685bf6b0910e2f784fca967 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Sat, 2 Mar 2013 10:30:36 +0100 Subject: [PATCH 01/16] test new libreoffice arg --- openlp/core/utils/__init__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/openlp/core/utils/__init__.py b/openlp/core/utils/__init__.py index 6706750b5..29f1f7089 100644 --- a/openlp/core/utils/__init__.py +++ b/openlp/core/utils/__init__.py @@ -335,11 +335,11 @@ def get_uno_command(): Returns the UNO command to launch an openoffice.org instance. """ COMMAND = u'soffice' - OPTIONS = u'-nologo -norestore -minimized -nodefault -nofirststartwizard' + OPTIONS = u'--headless --nologo --norestore --minimized --nodefault --nofirststartwizard' if UNO_CONNECTION_TYPE == u'pipe': - CONNECTION = u'"-accept=pipe,name=openlp_pipe;urp;"' + CONNECTION = u'"--accept=pipe,name=openlp_pipe;urp;"' else: - CONNECTION = u'"-accept=socket,host=localhost,port=2002;urp;"' + CONNECTION = u'"--accept=socket,host=localhost,port=2002;urp;"' return u'%s %s %s' % (COMMAND, OPTIONS, CONNECTION) From 557c90129aac7021ef4327b577e636e6c7981d9a Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Mon, 4 Mar 2013 11:52:38 +0100 Subject: [PATCH 02/16] started to work on transitions --- openlp/core/lib/htmlbuilder.py | 30 ++++++++++++------------------ openlp/core/ui/maindisplay.py | 4 +++- 2 files changed, 15 insertions(+), 19 deletions(-) diff --git a/openlp/core/lib/htmlbuilder.py b/openlp/core/lib/htmlbuilder.py index 05c71e419..5583e2861 100644 --- a/openlp/core/lib/htmlbuilder.py +++ b/openlp/core/lib/htmlbuilder.py @@ -152,10 +152,6 @@ sup { text_fade('lyricsmain', newtext); text_fade('lyricsoutline', newtext); text_fade('lyricsshadow', newtext.replace(match, '')); - if(text_opacity() == 1) return; - timer = setTimeout(function(){ - show_text(newtext); - }, 100); } function text_fade(id, newtext){ @@ -174,25 +170,18 @@ sup { text.innerHTML = newtext; return; } - if(newtext == text.innerHTML){ - text.style.opacity = parseFloat(text.style.opacity) + 0.3; - if(text.style.opacity > 0.7) - text.style.opacity = 1; - } else { - text.style.opacity = parseFloat(text.style.opacity) - 0.3; - if(text.style.opacity <= 0.1){ - text.innerHTML = newtext; - } - } + text.style.opacity = '0'; + timer = window.setTimeout(function(){bla(text, newtext)}, 1000); } - function text_opacity(){ - var text = document.getElementById('lyricsmain'); - return getComputedStyle(text, '').opacity; + function bla(text, newtext) { + text.innerHTML = newtext; + text.style.opacity = '1'; } function show_text_complete(){ - return (text_opacity() == 1); + var text = document.getElementById('lyricsmain'); + return getComputedStyle(text, '').opacity == 1; } @@ -331,20 +320,25 @@ def build_lyrics_css(item, webkit_ver): z-index: 5; position: absolute; display: table; + -webkit-transition: opacity 0.5s linear; %s } .lyricscell { display: table-cell; word-wrap: break-word; + -webkit-transition: opacity 0.5s linear; %s } .lyricsmain { +-webkit-transition: opacity 0.5s ease-in; %s } .lyricsoutline { +-webkit-transition: opacity 0.5s ease-in; %s } .lyricsshadow { +-webkit-transition: opacity 0.5s ease-in; %s } """ diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py index 58d832101..47b7a8758 100644 --- a/openlp/core/ui/maindisplay.py +++ b/openlp/core/ui/maindisplay.py @@ -76,7 +76,8 @@ class Display(QtGui.QGraphicsView): # time. We need to investigate more how to use OpenGL properly on Mac OS # X. if sys.platform != 'darwin': - self.setViewport(QtOpenGL.QGLWidget()) + pass + #self.setViewport(QtOpenGL.QGLWidget()) def setup(self): """ @@ -353,6 +354,7 @@ class MainDisplay(Display): # Wait for the fade to finish before geting the preview. # Important otherwise preview will have incorrect text if at all! if self.serviceItem.themedata and self.serviceItem.themedata.display_slide_transition: + # FIXME: method does not work. while self.frame.evaluateJavaScript(u'show_text_complete()') == u'false': self.application.process_events() # Wait for the webview to update before getting the preview. From b7448518d29caa43ba5cdd58dde3b045de7f225b Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Mon, 4 Mar 2013 12:04:15 +0100 Subject: [PATCH 03/16] renamed variable/function --- openlp/core/lib/htmlbuilder.py | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/openlp/core/lib/htmlbuilder.py b/openlp/core/lib/htmlbuilder.py index 5583e2861..b9ac74089 100644 --- a/openlp/core/lib/htmlbuilder.py +++ b/openlp/core/lib/htmlbuilder.py @@ -127,7 +127,7 @@ sup { document.getElementById('footer').innerHTML = footertext; } - function show_text(newtext){ + function show_text(new_text){ var match = /-webkit-text-fill-color:[^;\"]+/gi; if(timer != null) clearTimeout(timer); @@ -142,19 +142,19 @@ sup { if(outline != null) txt = outline; if(window.getComputedStyle(txt).webkitTextStrokeWidth != '0px'){ - newtext = newtext.replace(/(\s| )+(?![^<]*>)/g, + new_text = new_text.replace(/(\s| )+(?![^<]*>)/g, function(match) { return '' + match + ''; }); - newtext = '' + newtext + ''; + new_text = '' + new_text + ''; } } - text_fade('lyricsmain', newtext); - text_fade('lyricsoutline', newtext); - text_fade('lyricsshadow', newtext.replace(match, '')); + text_fade('lyricsmain', new_text); + text_fade('lyricsoutline', new_text); + text_fade('lyricsshadow', new_text.replace(match, '')); } - function text_fade(id, newtext){ + function text_fade(id, new_text){ /* Using -webkit-transition: opacity 1s linear; would have been preferred but it isn't currently quick enough when animating multiple layers of @@ -167,15 +167,18 @@ sup { var text = document.getElementById(id); if(text == null) return; if(!transition){ - text.innerHTML = newtext; + text.innerHTML = new_text; return; } text.style.opacity = '0'; - timer = window.setTimeout(function(){bla(text, newtext)}, 1000); + timer = window.setTimeout(function(){_show_text(text, new_text)}, 500); } - function bla(text, newtext) { - text.innerHTML = newtext; + function _show_text(text, new_text) { + /* + Helper function to show the new_text delayed. + */ + text.innerHTML = new_text; text.style.opacity = '1'; } From 6d66e6b957809767c86a84fa0cae1c0c57fe9a92 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Mon, 4 Mar 2013 20:14:36 +0100 Subject: [PATCH 04/16] fixed preview --- openlp/core/lib/htmlbuilder.py | 16 ++++++++-------- openlp/core/ui/maindisplay.py | 3 +-- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/openlp/core/lib/htmlbuilder.py b/openlp/core/lib/htmlbuilder.py index b9ac74089..de002c6af 100644 --- a/openlp/core/lib/htmlbuilder.py +++ b/openlp/core/lib/htmlbuilder.py @@ -171,7 +171,7 @@ sup { return; } text.style.opacity = '0'; - timer = window.setTimeout(function(){_show_text(text, new_text)}, 500); + timer = window.setTimeout(function(){_show_text(text, new_text)}, 400); } function _show_text(text, new_text) { @@ -180,11 +180,11 @@ sup { */ text.innerHTML = new_text; text.style.opacity = '1'; + window.setTimeout(function(){timer = null;}, 500); } function show_text_complete(){ - var text = document.getElementById('lyricsmain'); - return getComputedStyle(text, '').opacity == 1; + return (timer == null); } @@ -323,25 +323,25 @@ def build_lyrics_css(item, webkit_ver): z-index: 5; position: absolute; display: table; - -webkit-transition: opacity 0.5s linear; + -webkit-transition: opacity 0.5s ease; %s } .lyricscell { display: table-cell; word-wrap: break-word; - -webkit-transition: opacity 0.5s linear; + -webkit-transition: opacity 0.5s ease; %s } .lyricsmain { --webkit-transition: opacity 0.5s ease-in; +-webkit-transition: opacity 0.5s ease; %s } .lyricsoutline { --webkit-transition: opacity 0.5s ease-in; +-webkit-transition: opacity 0.5s ease; %s } .lyricsshadow { --webkit-transition: opacity 0.5s ease-in; +-webkit-transition: opacity 0.5s ease; %s } """ diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py index 47b7a8758..bfe223373 100644 --- a/openlp/core/ui/maindisplay.py +++ b/openlp/core/ui/maindisplay.py @@ -354,8 +354,7 @@ class MainDisplay(Display): # Wait for the fade to finish before geting the preview. # Important otherwise preview will have incorrect text if at all! if self.serviceItem.themedata and self.serviceItem.themedata.display_slide_transition: - # FIXME: method does not work. - while self.frame.evaluateJavaScript(u'show_text_complete()') == u'false': + while not self.frame.evaluateJavaScript(u'show_text_complete()'): self.application.process_events() # Wait for the webview to update before getting the preview. # Important otherwise first preview will miss the background ! From 2ed067ea0ca4f24c5ada0a1a547a1d6155e6af30 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Mon, 4 Mar 2013 20:22:43 +0100 Subject: [PATCH 05/16] enable OpenGL again --- openlp/core/ui/maindisplay.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py index bfe223373..f6150f4a2 100644 --- a/openlp/core/ui/maindisplay.py +++ b/openlp/core/ui/maindisplay.py @@ -76,8 +76,7 @@ class Display(QtGui.QGraphicsView): # time. We need to investigate more how to use OpenGL properly on Mac OS # X. if sys.platform != 'darwin': - pass - #self.setViewport(QtOpenGL.QGLWidget()) + self.setViewport(QtOpenGL.QGLWidget()) def setup(self): """ From 044c225fe35888ac3d66cf8bfc1c4d55ad4aeb1b Mon Sep 17 00:00:00 2001 From: Philip Ridout Date: Mon, 4 Mar 2013 20:58:28 +0000 Subject: [PATCH 06/16] Fixes bug:#1135392 by reraising the exception. --- openlp/plugins/songs/forms/editsongform.py | 1 + 1 file changed, 1 insertion(+) diff --git a/openlp/plugins/songs/forms/editsongform.py b/openlp/plugins/songs/forms/editsongform.py index 501ee7eea..694fd1028 100644 --- a/openlp/plugins/songs/forms/editsongform.py +++ b/openlp/plugins/songs/forms/editsongform.py @@ -923,6 +923,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog): self.song.verse_order) except: log.exception(u'Problem processing song Lyrics \n%s', sxml.dump_xml()) + raise def _get_plugin_manager(self): """ From 92a0d5d7ab5825ef8a23dcf267ba5d7aa70a4355 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Tue, 5 Mar 2013 10:40:00 +0100 Subject: [PATCH 07/16] make transition a little faster --- openlp/core/lib/htmlbuilder.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/openlp/core/lib/htmlbuilder.py b/openlp/core/lib/htmlbuilder.py index de002c6af..55551b223 100644 --- a/openlp/core/lib/htmlbuilder.py +++ b/openlp/core/lib/htmlbuilder.py @@ -180,7 +180,7 @@ sup { */ text.innerHTML = new_text; text.style.opacity = '1'; - window.setTimeout(function(){timer = null;}, 500); + window.setTimeout(function(){timer = null;}, 350); } function show_text_complete(){ @@ -323,25 +323,25 @@ def build_lyrics_css(item, webkit_ver): z-index: 5; position: absolute; display: table; - -webkit-transition: opacity 0.5s ease; + -webkit-transition: opacity 0.4s ease; %s } .lyricscell { display: table-cell; word-wrap: break-word; - -webkit-transition: opacity 0.5s ease; + -webkit-transition: opacity 0.4s ease; %s } .lyricsmain { --webkit-transition: opacity 0.5s ease; +-webkit-transition: opacity 0.4s ease; %s } .lyricsoutline { --webkit-transition: opacity 0.5s ease; +-webkit-transition: opacity 0.4s ease; %s } .lyricsshadow { --webkit-transition: opacity 0.5s ease; +-webkit-transition: opacity 0.4s ease; %s } """ From 31abd7247469886ceec1ac613821b71746637c01 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Tue, 5 Mar 2013 11:02:41 +0100 Subject: [PATCH 08/16] minimize the time 'nothing' is shown on the screen --- openlp/core/lib/htmlbuilder.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/openlp/core/lib/htmlbuilder.py b/openlp/core/lib/htmlbuilder.py index 55551b223..16ef12547 100644 --- a/openlp/core/lib/htmlbuilder.py +++ b/openlp/core/lib/htmlbuilder.py @@ -170,7 +170,9 @@ sup { text.innerHTML = new_text; return; } - text.style.opacity = '0'; + // Fade text out. 0.2 to minimize the time "nothing" is shown on the screen. + text.style.opacity = '0.2'; + // Fade new text in after the old text has finished fading out. timer = window.setTimeout(function(){_show_text(text, new_text)}, 400); } @@ -180,7 +182,7 @@ sup { */ text.innerHTML = new_text; text.style.opacity = '1'; - window.setTimeout(function(){timer = null;}, 350); + window.setTimeout(function(){timer = null;}, 400); } function show_text_complete(){ From 02335f6ef61172ea1904870bf2fc1d396eaa4917 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Tue, 5 Mar 2013 11:09:15 +0100 Subject: [PATCH 09/16] added comment --- openlp/core/lib/htmlbuilder.py | 1 + 1 file changed, 1 insertion(+) diff --git a/openlp/core/lib/htmlbuilder.py b/openlp/core/lib/htmlbuilder.py index 16ef12547..db5a6cd77 100644 --- a/openlp/core/lib/htmlbuilder.py +++ b/openlp/core/lib/htmlbuilder.py @@ -182,6 +182,7 @@ sup { */ text.innerHTML = new_text; text.style.opacity = '1'; + // Wait until the text is completely visible. window.setTimeout(function(){timer = null;}, 400); } From fee7797be1a54723cde43a1ab56f01f7a9fda90d Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Tue, 5 Mar 2013 11:32:20 +0100 Subject: [PATCH 10/16] removed not needed --webkit-transition --- openlp/core/lib/htmlbuilder.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/openlp/core/lib/htmlbuilder.py b/openlp/core/lib/htmlbuilder.py index db5a6cd77..540129158 100644 --- a/openlp/core/lib/htmlbuilder.py +++ b/openlp/core/lib/htmlbuilder.py @@ -326,7 +326,6 @@ def build_lyrics_css(item, webkit_ver): z-index: 5; position: absolute; display: table; - -webkit-transition: opacity 0.4s ease; %s } .lyricscell { @@ -336,15 +335,12 @@ def build_lyrics_css(item, webkit_ver): %s } .lyricsmain { --webkit-transition: opacity 0.4s ease; %s } .lyricsoutline { --webkit-transition: opacity 0.4s ease; %s } .lyricsshadow { --webkit-transition: opacity 0.4s ease; %s } """ From a835930990b66e37ddaa240e810c7d71cacbe2e1 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Tue, 5 Mar 2013 11:36:41 +0100 Subject: [PATCH 11/16] renamed JS function --- openlp/core/lib/htmlbuilder.py | 2 +- openlp/core/ui/maindisplay.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/openlp/core/lib/htmlbuilder.py b/openlp/core/lib/htmlbuilder.py index 540129158..f35b7450d 100644 --- a/openlp/core/lib/htmlbuilder.py +++ b/openlp/core/lib/htmlbuilder.py @@ -186,7 +186,7 @@ sup { window.setTimeout(function(){timer = null;}, 400); } - function show_text_complete(){ + function show_text_completed(){ return (timer == null); } diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py index f6150f4a2..35e8b6cf8 100644 --- a/openlp/core/ui/maindisplay.py +++ b/openlp/core/ui/maindisplay.py @@ -353,7 +353,7 @@ class MainDisplay(Display): # Wait for the fade to finish before geting the preview. # Important otherwise preview will have incorrect text if at all! if self.serviceItem.themedata and self.serviceItem.themedata.display_slide_transition: - while not self.frame.evaluateJavaScript(u'show_text_complete()'): + while not self.frame.evaluateJavaScript(u'show_text_completed()'): self.application.process_events() # Wait for the webview to update before getting the preview. # Important otherwise first preview will miss the background ! From d5f4685788a6582b5596aa06001fe7cd693875ae Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Tue, 5 Mar 2013 15:36:01 +0100 Subject: [PATCH 12/16] added expand_tags() method test --- tests/functional/openlp_core_lib/test_lib.py | 42 +++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/tests/functional/openlp_core_lib/test_lib.py b/tests/functional/openlp_core_lib/test_lib.py index 8527373dc..1f09ad75c 100644 --- a/tests/functional/openlp_core_lib/test_lib.py +++ b/tests/functional/openlp_core_lib/test_lib.py @@ -7,7 +7,7 @@ from datetime import datetime, timedelta from mock import MagicMock, patch from openlp.core.lib import str_to_bool, translate, check_directory_exists, get_text_file_string, build_icon, \ - image_to_byte, check_item_selected, validate_thumb, create_separated_list + image_to_byte, check_item_selected, validate_thumb, create_separated_list, expand_tags class TestLib(TestCase): @@ -299,6 +299,46 @@ class TestLib(TestCase): MockedQtGui.QMessageBox.information.assert_called_with(u'parent', u'mocked translate', 'message') assert not result, u'The result should be False' + def expand_tags_test(self): + """ + Test the expand_tags() method. + """ + with patch(u'openlp.core.lib.FormattingTags.get_html_tags') as mocked_get_tags: + # GIVEN: Mocked get_html_tags() method. + mocked_get_tags.return_value = [ + { + u'desc': u'Black', + u'start tag': u'{b}', + u'start html': u'', + u'end tag': u'{/b}', u'end html': u'', u'protected': True, + u'temporary': False + }, + { + u'desc': u'Yellow', + u'start tag': u'{y}', + u'start html': u'', + u'end tag': u'{/y}', u'end html': u'', u'protected': True, + u'temporary': False + }, + { + u'desc': u'Green', + u'start tag': u'{g}', + u'start html': u'', + u'end tag': u'{/g}', u'end html': u'', u'protected': True, + u'temporary': False + } + ] + string_to_pass = u'{b}black{/b}{y}yellow{/y}' + wanted_string = u'black' + \ + 'yellow' + + # WHEN: Replace the tags. + result_string = expand_tags(string_to_pass) + + # THEN: The strings should be identical. + assert result_string == wanted_string, u'The strings should be identical.' + + def validate_thumb_file_does_not_exist_test(self): """ Test the validate_thumb() function when the thumbnail does not exist From 50538d66dbae8d3d6c6d3b758a41d0c81559f8aa Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Tue, 5 Mar 2013 15:44:47 +0100 Subject: [PATCH 13/16] removed not needed line --- tests/functional/openlp_core_lib/test_lib.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/functional/openlp_core_lib/test_lib.py b/tests/functional/openlp_core_lib/test_lib.py index 1f09ad75c..9bbce1359 100644 --- a/tests/functional/openlp_core_lib/test_lib.py +++ b/tests/functional/openlp_core_lib/test_lib.py @@ -338,7 +338,6 @@ class TestLib(TestCase): # THEN: The strings should be identical. assert result_string == wanted_string, u'The strings should be identical.' - def validate_thumb_file_does_not_exist_test(self): """ Test the validate_thumb() function when the thumbnail does not exist From 33db8e143bb5abecd360548bbeb27ea999b441de Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Tue, 5 Mar 2013 18:08:15 +0100 Subject: [PATCH 14/16] fixed maindisplay opening again --- openlp/core/lib/htmlbuilder.py | 5 +++-- openlp/core/ui/maindisplay.py | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/openlp/core/lib/htmlbuilder.py b/openlp/core/lib/htmlbuilder.py index f35b7450d..c3e4c5f4f 100644 --- a/openlp/core/lib/htmlbuilder.py +++ b/openlp/core/lib/htmlbuilder.py @@ -182,8 +182,9 @@ sup { */ text.innerHTML = new_text; text.style.opacity = '1'; - // Wait until the text is completely visible. - window.setTimeout(function(){timer = null;}, 400); + // Wait until the text is completely visible. We want to save the timer id, to be able to call + // clearTimeout(timer) when the text has changed before finishing fading. + timer = window.setTimeout(function(){timer = null;}, 400); } function show_text_completed(){ diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py index 35e8b6cf8..2cc1aded1 100644 --- a/openlp/core/ui/maindisplay.py +++ b/openlp/core/ui/maindisplay.py @@ -346,6 +346,7 @@ class MainDisplay(Display): """ Generates a preview of the image displayed. """ + was_visible = self.isVisible() log.debug(u'preview for %s', self.isLive) self.application.process_events() # We must have a service item to preview. @@ -363,7 +364,8 @@ class MainDisplay(Display): if self.isLive: if self.hideMode: self.hide_display(self.hideMode) - else: + # Only continue if the visibility wasn't changed during method call. + elif was_visible == self.isVisible(): # Single screen active if self.screens.display_count == 1: # Only make visible if setting enabled. From 555e38275a5bf04b8d30027d7e64aa73429777f8 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Tue, 5 Mar 2013 18:12:40 +0100 Subject: [PATCH 15/16] changed order --- openlp/core/ui/maindisplay.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py index 2cc1aded1..cd5f6fe58 100644 --- a/openlp/core/ui/maindisplay.py +++ b/openlp/core/ui/maindisplay.py @@ -346,8 +346,8 @@ class MainDisplay(Display): """ Generates a preview of the image displayed. """ - was_visible = self.isVisible() log.debug(u'preview for %s', self.isLive) + was_visible = self.isVisible() self.application.process_events() # We must have a service item to preview. if self.isLive and hasattr(self, u'serviceItem'): From d4a41180cfb9353bcd2331314f6e22efa12e7196 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Wed, 6 Mar 2013 14:21:27 +0100 Subject: [PATCH 16/16] updated doc --- openlp/core/lib/htmlbuilder.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/openlp/core/lib/htmlbuilder.py b/openlp/core/lib/htmlbuilder.py index c3e4c5f4f..f0fa9800e 100644 --- a/openlp/core/lib/htmlbuilder.py +++ b/openlp/core/lib/htmlbuilder.py @@ -156,13 +156,7 @@ sup { function text_fade(id, new_text){ /* - Using -webkit-transition: opacity 1s linear; would have been preferred - but it isn't currently quick enough when animating multiple layers of - large areas of large text. Therefore do it manually as best we can. - Hopefully in the future we can revisit and do more interesting - transitions using -webkit-transition and -webkit-transform. - However we need to ensure interrupted transitions (quickly change 2 - slides) still looks pretty and is zippy. + Show the text. */ var text = document.getElementById(id); if(text == null) return;