From 500daf3bd4bbefa64b80d9920e4288f89abc8cfe Mon Sep 17 00:00:00 2001 From: hallgren Date: Tue, 10 Apr 2012 13:33:12 +0000 Subject: [PATCH] minibar/pgf_online.js: pass arguments to the browse function in the same way as the other functions Also document it in gf-web-api-examples.html. --- src/www/minibar/gf-web-api-examples.html | 12 +++++++++++- src/www/minibar/minibar_input.js | 2 +- src/www/minibar/pgf_online.js | 5 +++-- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/www/minibar/gf-web-api-examples.html b/src/www/minibar/gf-web-api-examples.html index 520a66070..df6db0756 100644 --- a/src/www/minibar/gf-web-api-examples.html +++ b/src/www/minibar/gf-web-api-examples.html @@ -143,10 +143,20 @@ full API. "brackets":{"cat":"_","fid":0,"index":0,"children":[{"cat":"Item","fid":7,"index":0,"children":[{"token":"that"},{"cat":"Kind","fid":6,"index":0,"children":[{"token":"pizza"}]}]},{"token":"is"},{"token":"very"}]}, "completions":["boring","delicious","expensive","fresh","Italian","very","warm"], "text":""}] +
// Get info about a category in the abstract syntax +
server.browse({id:"Kind"},callback) +
http://localhost:41296/grammars/Foods.pgf?command=browse&id=Kind&format=json +
{"def":"cat Kind", + "producers":["Cheese","Fish","Mod","Pizza","Wine"], + "consumers":["Mod","That","These","This","Those"]} +
// Get info about a function in the abstract syntax +
server.browse({id:"This"},callback) +
http://localhost:41296/grammars/Foods.pgf?command=browse&id=This&format=json +
{"def":"fun This : Kind -> Item","producers":[],"consumers":[]}
- Last modified: Tue Oct 18 16:36:36 CEST 2011 + Last modified: Tue Apr 10 15:08:14 CEST 2012
TH
\ No newline at end of file diff --git a/src/www/minibar/minibar_input.js b/src/www/minibar/minibar_input.js index cf12ac40f..a5a169cc7 100644 --- a/src/www/minibar/minibar_input.js +++ b/src/www/minibar/minibar_input.js @@ -444,7 +444,7 @@ Input.prototype.browse=function(id,cont) { t.grammar.browse[id]=info; cont(info); } - t.server.browse(id,browsed); + t.server.browse({id:id},browsed); } } diff --git a/src/www/minibar/pgf_online.js b/src/www/minibar/pgf_online.js index 970aae062..6fe23b13e 100644 --- a/src/www/minibar/pgf_online.js +++ b/src/www/minibar/pgf_online.js @@ -68,8 +68,9 @@ function pgf_online(options) { translategroup: function(args,cont,err) { // from, input, cat, to this.pgf_call("translategroup",args,cont,err); }, - browse: function(id,cont,err) { - this.pgf_call("browse",{id:id,format:"json"},cont,err); + browse: function(args,cont,err) { // id, format + if(!args.format) args.format="json"; // sife effect!! + this.pgf_call("browse",args,cont,err); } }; for(var o in options) server[o]=options[o];