From 5d27d1885f583a4517d0341897d7d3bee6875df7 Mon Sep 17 00:00:00 2001 From: hallgren Date: Wed, 8 Jun 2016 19:11:49 +0000 Subject: [PATCH] Minibar: show word dependecy diagrams They are now included in the cycle of images shown when clicking on the parse tree icon. --- src/www/minibar/minibar_support.js | 11 +++++++++ src/www/minibar/minibar_translations.js | 32 +++++++++++++------------ 2 files changed, 28 insertions(+), 15 deletions(-) diff --git a/src/www/minibar/minibar_support.js b/src/www/minibar/minibar_support.js index 749f10d3c..13345ce37 100644 --- a/src/www/minibar/minibar_support.js +++ b/src/www/minibar/minibar_support.js @@ -43,6 +43,17 @@ function button_img(url,action) { return i; } +function cycle_images(img_urls) { + var current=0; + function cycle() { + current++; + if(current>=img_urls.length) current=0; + i.src=img_urls[current] + } + var i=button_img(img_urls[0],cycle); + return i +} + function toggle_img(i) { var tmp=i.src; i.src=i.other; diff --git a/src/www/minibar/minibar_translations.js b/src/www/minibar/minibar_translations.js index 9cb103d67..01b4d21dd 100644 --- a/src/www/minibar/minibar_translations.js +++ b/src/www/minibar/minibar_translations.js @@ -289,12 +289,22 @@ Translations.prototype.alignment_button=function(abs,all,toLangs) { } Translations.prototype.parsetree_button=function(abs,lang) { - var f=this.options.tree_img_format; - var img=this.server.current_grammar_url - +"?command=parsetree&format="+f+"&nodep=true&nodefont=arial" - +"&from="+lang+"&tree="+encodeURIComponent(abs); - var btn=tree_button(img) - btn.title="Click to display parse tree. Click again to show function names." + var f=this.options.tree_img_format; + var img=this.server.current_grammar_url + +"?command=parsetree&format="+f+"&nodep=true&nodefont=arial" + +"&from="+lang+"&tree="+encodeURIComponent(abs); + var img_nofun=img+"&nofun=true" + var help="Click again to display parse tree. Click again to show function names." + if(f=="svg") { + var depimg=this.server.current_grammar_url + +"?command=deptree&format=svg&to="+lang + +"&tree="+encodeURIComponent(abs); + var imgs=[tree_icon,depimg,img_nofun,img] + help="Click to display dependency tree. "+help + } + else var imgs=[tree_icon,img_nofun,img] + var btn=cycle_images(imgs) + btn.title=help return btn; } @@ -305,15 +315,7 @@ function mt_local(grammar_url) { } function tree_button(img_url,opt) { - var imgs=[tree_icon,img_url+(opt||"&nofun=true"),img_url] - var current=0; - function cycle() { - current++; - if(current>=imgs.length) current=0; - i.src=imgs[current] - } - var i=button_img(tree_icon,cycle); - return i + return cycle_images([tree_icon,img_url+(opt||"&nofun=true"),img_url]) } function draw_brackets(b) {