Fix support issue 354, Web Remote causes a stacktrace when sending an Alert message.

bzr-revno: 1855
This commit is contained in:
Mattias Põldaru 2011-12-23 16:35:51 +00:00 committed by Jonathan Corwin
commit e59d5b014b
1 changed files with 6 additions and 2 deletions

View File

@ -208,7 +208,9 @@ window.OpenLP = {
}, },
showAlert: function (event) { showAlert: function (event) {
event.preventDefault(); event.preventDefault();
var text = "{\"request\": {\"text\": " + $("#alert-text").val() + "}}"; var text = "{\"request\": {\"text\": \"" +
$("#alert-text").val().replace(/\\/g, "\\\\").replace(/"/g, "\\\"") +
"\"}}";
$.getJSON( $.getJSON(
"/api/alert", "/api/alert",
{"data": text}, {"data": text},
@ -219,7 +221,9 @@ window.OpenLP = {
}, },
search: function (event) { search: function (event) {
event.preventDefault(); event.preventDefault();
var text = "{\"request\": {\"text\": \"" + $("#search-text").val() + "\"}}"; var text = "{\"request\": {\"text\": \"" +
$("#search-text").val().replace(/\\/g, "\\\\").replace(/"/g, "\\\"") +
"\"}}";
$.getJSON( $.getJSON(
"/api/" + $("#search-plugin").val() + "/search", "/api/" + $("#search-plugin").val() + "/search",
{"data": text}, {"data": text},