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

[Simon Hanna]

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

[Tim Bentley (trb143)]

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

[Raoul Snyman (raoul-snyman)]

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.

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

[Tim Bentley (trb143)]

review: Approve

[Tomas Groth (tomasgroth)]

review: Approve

=== modified file 'openlp/plugins/remotes/html/stage.js'
--- openlp/plugins/remotes/html/stage.js	2015-01-18 13:39:21 +0000
+++ openlp/plugins/remotes/html/stage.js	2015-12-30 00:17:47 +0000
@@ -61,7 +61,7 @@
           }
           else {
             if ((slide["text"] == data.results.slides[lastChange]["text"]) &&
-              (data.results.slides.length > idx + (idx - lastChange))) {
+              (data.results.slides.length >= idx + (idx - lastChange))) {
               // If the tag hasn't changed, check to see if the same verse
               // has been repeated consecutively. Note the verse may have been
               // split over several slides, so search through. If so, repeat the tag.