openlp-core team mailing list archive

[Raoul Snyman <raoul.snyman@xxxxxxxxxxxxxxxxxxxxxxxx>]

Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/support-322 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~raoul-snyman/openlp/support-322/+merge/83525

Service notes are not displayed on stage remote view when the current service item is the last.

(Fix from Jérémie Nau)
-- 
https://code.launchpad.net/~raoul-snyman/openlp/support-322/+merge/83525
Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/support-322 into lp:openlp.

=== modified file 'openlp/plugins/remotes/html/stage.js'
--- openlp/plugins/remotes/html/stage.js	2011-10-01 12:04:09 +0000
+++ openlp/plugins/remotes/html/stage.js	2011-11-27 19:47:24 +0000
@@ -30,10 +30,11 @@
         $("#notes").html("");
         for (idx in data.results.items) {
           idx = parseInt(idx, 10);
-          if ((data.results.items[idx]["selected"]) &&
-            (data.results.items.length > idx + 1)) {
-            $("#notes").html(data.results.items[idx]["notes"]);
-            OpenLP.nextSong = data.results.items[idx + 1]["title"];
+          if (data.results.items[idx]["selected"]) {
+            $("#notes").html(data.results.items[idx]["notes"].replace(/\n/g, "<br />"));
+            if (data.results.items.length > idx + 1) {
+              OpenLP.nextSong = data.results.items[idx + 1]["title"];
+            }
             break;
           }
         }