Merge lp:~raoul-snyman/openlp/support-322 into lp:openlp

[Raoul Snyman]

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

(Fix from Jérémie Nau)

[Tim Bentley (trb143)]

review: Approve

=== 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;
           }
         }