Merge lp:~thelinuxguy/openlp/fix-1510572 into lp:openlp

Proposed by Simon Hanna
Status: Merged
Approved by: Tomas Groth
Approved revision: 2587
Merged at revision: 2587
Proposed branch: lp:~thelinuxguy/openlp/fix-1510572
Merge into: lp:openlp
Diff against target: 12 lines (+1/-1)
1 file modified
openlp/plugins/remotes/html/stage.js (+1/-1)
To merge this branch: bzr merge lp:~thelinuxguy/openlp/fix-1510572
Reviewer Review Type Date Requested Status
Tomas Groth Approve
Tim Bentley Approve
Review via email:

Description of the change

Show double verses at the end of songs in stageview.

They used to be hidden because the function checked to see if there are enough slides remaining. This is a simple off by one error

To post a comment you must log in.
Revision history for this message
Tim Bentley (trb143) wrote :

Nice spot.

Marked as needs fixing as we have a rule that all patches must include a test to build up the test base. Only Raoul can override this and that may be the case for this one as we are on a short time scale.

review: Needs Fixing
Revision history for this message
Raoul Snyman (raoul-snyman) wrote :

Ideally we should have JavaScript tests too. I'm willing to overlook it this time, but we need to look at getting a test framework in place.

Sent from my Android device with K-9 Mail. Please excuse my brevity.

Revision history for this message
Tim Bentley (trb143) :
review: Approve
Revision history for this message
Tomas Groth (tomasgroth) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openlp/plugins/remotes/html/stage.js'
2--- openlp/plugins/remotes/html/stage.js 2015-01-18 13:39:21 +0000
3+++ openlp/plugins/remotes/html/stage.js 2015-12-30 00:17:47 +0000
4@@ -61,7 +61,7 @@
5 }
6 else {
7 if ((slide["text"] == data.results.slides[lastChange]["text"]) &&
8- (data.results.slides.length > idx + (idx - lastChange))) {
9+ (data.results.slides.length >= idx + (idx - lastChange))) {
10 // If the tag hasn't changed, check to see if the same verse
11 // has been repeated consecutively. Note the verse may have been
12 // split over several slides, so search through. If so, repeat the tag.