From c53331484380e1718babcda192aaa1fa26ae9ef3 Mon Sep 17 00:00:00 2001 From: hallgren Date: Tue, 14 Sep 2010 17:15:37 +0000 Subject: [PATCH] minibar.js: server API code cleanup --- src/runtime/javascript/minibar/minibar.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/runtime/javascript/minibar/minibar.js b/src/runtime/javascript/minibar/minibar.js index 5bf586e5b..7849f0153 100644 --- a/src/runtime/javascript/minibar/minibar.js +++ b/src/runtime/javascript/minibar/minibar.js @@ -33,22 +33,21 @@ var server = { get_grammarlist: function(cont) { http_get_json(options.grammars_url+"grammars.cgi",cont); }, - get_languages: function(cont) { - http_get_json(this.current_grammar_url,cont); - }, pgf_call: function(cmd,args,cont) { var url=this.current_grammar_url+"?command="+cmd; for(var arg in args) url+="&"+arg+"="+encodeURIComponent(args[arg]); http_get_json(url,cont); }, + get_languages: function(cont) { + this.pgf_call("grammar",{},cont); + }, + get_random: function(cont) { - //jsonpf(this.current_grammar_url+"?command=random&random="+Math.random(),cont); this.pgf_call("random",{random:Math.random()},cont); }, linearize: function(tree,to,cont) { - jsonpf(this.current_grammar_url+"?command=linearize&tree=" - +encodeURIComponent(tree)+"&to="+to,cont) + this.pgf_call("linearize",{tree:tree,to:to},cont); }, complete: function(from,input,cont) { this.pgf_call("complete",{from:from,input:input},cont);