From 0b1a2bb20b680d1b10822e76a6639655fd4ee78d Mon Sep 17 00:00:00 2001 From: hallgren Date: Thu, 15 Apr 2010 13:33:21 +0000 Subject: [PATCH] Fix bug in get_grammarlist. Some code simplificaiton. --- src/runtime/javascript/minibar/minibar.js | 29 ++++++++++++----------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/src/runtime/javascript/minibar/minibar.js b/src/runtime/javascript/minibar/minibar.js index 33b5de1be..51f98ddc9 100644 --- a/src/runtime/javascript/minibar/minibar.js +++ b/src/runtime/javascript/minibar/minibar.js @@ -19,8 +19,8 @@ var server = { this.current_grammar_url=grammars_url+grammar_name; }, - get_grammarlist: function() { - jsonp(grammars_url+"grammars.cgi") // calls show_grammarlist + get_grammarlist: function(cont_name) { + jsonp(grammars_url+"grammars.cgi",cont_name); }, get_languages: function(cont_name) { jsonp(this.current_grammar_url,cont_name); @@ -53,12 +53,12 @@ var server = { /* --- Initialisation ------------------------------------------------------- */ function start_minibar() { // typically called when the HTML document is loaded - var minibar=element("minibar"); - minibar.appendChild(div_id("menubar")); - minibar.appendChild(div_id("surface")); - minibar.appendChild(div_id("words")); - minibar.appendChild(div_id("translations")); - server.get_grammarlist(); // calls show_grammarlist + appendChildren(element("minibar"), + [div_id("menubar"), + div_id("surface"), + div_id("words"), + div_id("translations")]); + server.get_grammarlist("show_grammarlist"); } @@ -75,12 +75,13 @@ function show_grammarlist(grammars) { menu.setAttribute("onchange","new_grammar(this)"); var menubar=element("menubar"); menubar.innerHTML="Grammar: "; - menubar.appendChild(menu); - menubar.appendChild(text(" Input language: ")); - menubar.appendChild(empty_id("select","language_menu")); - menubar.appendChild(button("Clear","clear_all()")); - menubar.appendChild(button("⌫","delete_last()")); - menubar.appendChild(button("Random","generate_random()")); + appendChildren(menubar, + [menu, + text(" Input language: "), + empty_id("select","language_menu"), + button("Clear","clear_all()"), + button("⌫","delete_last()"), + button("Random","generate_random()")]); select_grammar(grammars[0]); }