Fix bugs in Web UI parameters

* Fixes #49
* Slightly cleaner javascript code

senpy/static/js/main.js

@@ -28,74 +28,70 @@ function hashchanged(){
 $(document).ready(function() {
     var response = JSON.parse($.ajax({type: "GET", url: "/api/plugins/" , async: false}).responseText);
     var defaultPlugin= JSON.parse($.ajax({type: "GET", url: "/api/plugins/default" , async: false}).responseText);
-	html="";
+    html="";
     var availablePlugins = document.getElementById('availablePlugins');
     plugins = response.plugins;
-	gplugins = {};
-	for (r in plugins){
-	  ptype = plugins[r]['@type'];
-	  if(gplugins[ptype] == undefined){
-		  gplugins[ptype] = [r]
-	  }else{
-		  gplugins[ptype].push(r)
+    gplugins = {};
+    for (r in plugins){
+        ptype = plugins[r]['@type'];
+        if(gplugins[ptype] == undefined){
+            gplugins[ptype] = [r]
+        }else{
+            gplugins[ptype].push(r)
+	      }
 	  }
-	}
-	for (g in gplugins){	
-		html += "<optgroup label=\""+g+"\">"
-		for (r in gplugins[g]){
-		  plugin = plugins[r]
-		  if (plugin["name"]){
-			if (plugin["name"] == defaultPlugin["name"]){
-			  if (plugin["is_activated"]){
-				html+= "<option value=\""+plugin["name"]+"\" selected=\"selected\">"+plugin["name"]+"</option>"
-			  }else{
-				html+= "<option value=\""+plugin["name"]+"\" selected=\"selected\" disabled=\"disabled\">"+plugin["name"]+"</option>"
-			  }
-			}
-			else{
-			  if (plugin["is_activated"]){
-				html+= "<option value=\""+plugin["name"]+"\">"+plugin["name"]+"</option>"
-			  }
-			  else{
-				html+= "<option value=\""+plugin["name"]+"\" disabled=\"disabled\">"+plugin["name"]+"</option>"
-			  }
-			}
-		  }
+    for (g in gplugins){	
+        html += "<optgroup label=\""+g+"\">"
+        for (r in gplugins[g]){
+            plugin = plugins[gplugins[g][r]]
+            if (!plugin["name"]){
+                console.log("No name for plugin ", plugin);
+                continue;
 
-		 if (plugin["extra_params"]){
-			plugins_params[plugin["name"]]={};
-			for (param in plugin["extra_params"]){
-			  if (typeof plugin["extra_params"][param] !="string"){
-				var params = new Array();
-				var alias = plugin["extra_params"][param]["aliases"][0];
-				params[alias]=new Array();
-				for (option in plugin["extra_params"][param]["options"]){
-				  params[alias].push(plugin["extra_params"][param]["options"][option])
-				}
-				plugins_params[plugin["name"]][alias] = (params[alias])
-			  }
-			}
-		  }
-		  var pluginList = document.createElement('li');
-		  
-		  newHtml = ""
-		  if(plugin.url) {
-			newHtml= "<a href="+plugin.url+">" + plugin.name + "</a>";
-		  }else {
-			newHtml= plugin["name"];
-		  }
-		  newHtml += ": " + replaceURLWithHTMLLinks(plugin.description);
-		  pluginList.innerHTML = newHtml;
-		  availablePlugins.appendChild(pluginList)
-		}
-	 html += "</optgroup>"
-	}
+            }
+            html+= "<option value=\""+plugin["name"]+"\" "
+            if (plugin["name"] == defaultPlugin["name"]){
+                html+= " selected=\"selected\""
+            }
+            if (!plugin["is_activated"]){
+                html+= " disabled=\"disabled\" "
+            }
+            html+=">"+plugin["name"]+"</option>"
+        }
+
+        if (plugin["extra_params"]){
+            plugins_params[plugin["name"]]={};
+            for (param in plugin["extra_params"]){
+                if (typeof plugin["extra_params"][param] !="string"){
+                    var params = new Array();
+                    var alias = plugin["extra_params"][param]["aliases"][0];
+                    params[alias]=new Array();
+                    for (option in plugin["extra_params"][param]["options"]){
+                        params[alias].push(plugin["extra_params"][param]["options"][option])
+                    }
+                    plugins_params[plugin["name"]][alias] = (params[alias])
+			          }
+			      }
+		    }
+        var pluginEntry = document.createElement('li');
+        
+        newHtml = ""
+        if(plugin.url) {
+            newHtml= "<a href="+plugin.url+">" + plugin.name + "</a>";
+        }else {
+            newHtml= plugin["name"];
+        }
+        newHtml += ": " + replaceURLWithHTMLLinks(plugin.description);
+        pluginEntry.innerHTML = newHtml;
+        availablePlugins.appendChild(pluginEntry)
+    }
+    html += "</optgroup>"
     document.getElementById('plugins').innerHTML = html;
     change_params();
-  
-  $(window).on('hashchange', hashchanged);
-  hashchanged();
-  $('.tooltip-form').tooltip();
+    
+    $(window).on('hashchange', hashchanged);
+    hashchanged();
+    $('.tooltip-form').tooltip();
 
 });
 
@@ -154,10 +150,11 @@ function load_JSON(){
       url += "?algo="+plugin+"&i="+input
       for (param in plugins_params[plugin]){
         if (param != null){
-            if (plugins_params[plugin].length > 0){
-                var param_value = encodeURIComponent(document.getElementById(param).options[document.getElementById(param).selectedIndex].text);
+            field = document.getElementById(param);
+            if (plugins_params[plugin][param].length > 0){
+                var param_value = encodeURIComponent(field.options[field.selectedIndex].text);
             } else {
-                var param_value = encodeURIComponent(document.getElementById(param).value);
+                var param_value = encodeURIComponent(field.text);
             }
             if (param_value !== "undefined" && param_value.length > 0){
                 url+="&"+param+"="+param_value
@@ -167,7 +164,7 @@ function load_JSON(){
 
       for (param in default_params){
         if ((param != null) && (default_params[param]['options']) && (['help','conversion'].indexOf(param) < 0)){
-            var param_value = encodeURIComponent(document.getElementById(param).options[document.getElementById(param).selectedIndex].text);
+            var param_value = encodeURIComponent(document.getElementById(param).options[document.getElementById(param).selectedIndex].value);
             if (param_value){
               url+="&"+param+"="+param_value
             }