From 5fcb41bc9df557ca84eaadcd1e9b036b62dbc149 Mon Sep 17 00:00:00 2001 From: Jonathan Corwin Date: Mon, 16 May 2011 22:01:21 +0100 Subject: [PATCH] fixes --- openlp/plugins/remotes/html/openlp.js | 4 ++-- openlp/plugins/remotes/lib/httpserver.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/openlp/plugins/remotes/html/openlp.js b/openlp/plugins/remotes/html/openlp.js index 04945425b..57c770447 100644 --- a/openlp/plugins/remotes/html/openlp.js +++ b/openlp/plugins/remotes/html/openlp.js @@ -39,7 +39,7 @@ window.OpenLP = { } return $(targ); }, - searchPlugins: function (event) { + getSearchablePlugins: function (event) { $.getJSON( "/api/plugin/search", function (data, status) { @@ -259,7 +259,7 @@ $("#alert-submit").live("click", OpenLP.showAlert); // Search $("#search-submit").live("click", OpenLP.search); // Poll the server twice a second to get any updates. -OpenLP.searchPlugins(); +OpenLP.getSearchablePlugins(); $.ajaxSetup({ cache: false }); setInterval("OpenLP.pollServer();", 500); OpenLP.pollServer(); diff --git a/openlp/plugins/remotes/lib/httpserver.py b/openlp/plugins/remotes/lib/httpserver.py index e1e2857bf..122ea64b4 100644 --- a/openlp/plugins/remotes/lib/httpserver.py +++ b/openlp/plugins/remotes/lib/httpserver.py @@ -251,7 +251,7 @@ class HttpConnection(object): (r'^/api/service/(.*)$', self.service), (r'^/api/display/(hide|show)$', self.display), (r'^/api/alert$', self.alert), - (r'^/api/plugin/(search)$', self.plugin), + (r'^/api/plugin/(search)$', self.pluginInfo), (r'^/api/(.*)/search$', self.search), (r'^/api/(.*)/live$', self.go_live) ] @@ -446,9 +446,9 @@ class HttpConnection(object): return HttpResponse(json.dumps({u'results': {u'success': True}}), {u'Content-Type': u'application/json'}) - def plugin(self, action): + def pluginInfo(self, action): """ - Return plugin related actions + Return plugin related information, based on the action ``action`` - The action to perform if 'search' return a list of plugin names which support search