Use readonly <input/>s for type="result" dataforms

[adhocweb.git] / js / main.js

diff --git a/js/main.js b/js/main.js
index 8724764fc49cb711496bb102ebd044a48c171df8..52e6296a5c54908a740595d00a36e3712faa3c6f 100644 (file)
--- a/js/main.js
+++ b/js/main.js
@@ -7,6 +7,7 @@ var localJID = null;
 var connection   = null;
 var sessionid = null;
 var cmdNode = null;
+var queryJID = null;
 
 function log(msg) {
     var entry = $('<div></div>').append(document.createTextNode(msg));
@@ -39,6 +40,9 @@ function onConnect(status) {
         }
     } else if (status == Strophe.Status.CONNECTED) {
         log('Strophe is connected.');
+        queryJID = connection.domain;
+        $('#queryJID').val(queryJID);
+        $('#query').show();
         checkFeatures();
     }
 }
@@ -52,7 +56,7 @@ function addNote(elem, text, type) {
 
 function addForm(elem, x) {
     var form = $("<form/>");
-    form.submit(function(){return false;});
+    form.submit(function(event){event.preventDefault();});
     var fieldset = $("<fieldset/>");
     form.append(fieldset);
     if ($(x).find("title").length > 0)
@@ -64,6 +68,7 @@ function addForm(elem, x) {
         var type = $(this).attr("type");
         if($(this).attr("label")) {
             $("<label/>").text($(this).attr("label")).attr("for", $(this).attr("var")).appendTo(fieldset);
+            $("<br/>").appendTo(fieldset);
         }
         switch(type) {
         case "hidden":
@@ -73,7 +78,7 @@ function addForm(elem, x) {
             item = $("<input type='checkbox'/>");
             break;
         case "text-multi":
-            item = $("<textarea/>");
+            item = $("<textarea rows='10' cols='70'/>");
             break;
         case "text-single":
             item = $("<input type='text'/>");
@@ -82,7 +87,7 @@ function addForm(elem, x) {
             item = $("<input type='text'/>").attr("readonly",true);
             break;
         case "jid-multi":
-            item = $("<textarea/>");
+            item = $("<textarea rows='10' cols'70'/>");
             break;
         case "jid-single":
             item = $("<input type='text'/>");
@@ -123,12 +128,15 @@ function addForm(elem, x) {
                 item.val($(this).find("value").text());
             }
         }
+        if ($(x).attr("type") == "result")
+            item.attr("readonly", true);
         if ($(this).attr("var")) {
             item.attr("name", $(this).attr("var"));
             item.attr("id", $(this).attr("var"));
         }
         fieldset.append(item);
-        fieldset.append("<br/>");
+        if (type != "hidden")
+            fieldset.append("<br/>");
     });
     $(elem).append(form);
 }
@@ -182,14 +190,14 @@ function displayResult(result) {
                 $('#' + kind + 'Button').attr("disabled", "false");
         }
         $('#executeButton').bind("click", function() {
-            var execIQ = $iq({ type: "set", to: connection.domain, id: connection.getUniqueId() })
+            var execIQ = $iq({ type: "set", to: queryJID, id: connection.getUniqueId() })
                 .c("command", { xmlns: Strophe.NS.ADHOC, node: cmdNode, sessionid: sessionid, action: "execute" });
             serializeToDataform($('form'), execIQ);
             connection.sendIQ(execIQ, displayResult);
         });
 
         $('#cancelButton').bind("click", function() {
-            var cancelIQ = $iq({ type: "set", to: connection.domain, id: connection.getUniqueId() })
+            var cancelIQ = $iq({ type: "set", to: queryJID, id: connection.getUniqueId() })
                 .c("command", { xmlns: Strophe.NS.ADHOC, node: cmdNode, sessionid: sessionid, action: "cancel" });
             cmdNode = null
             sessionid = null;
@@ -206,29 +214,31 @@ function displayResult(result) {
     }
 }
 
-function runCommand() {
+function runCommand(event) {
     cmdNode = $(this).attr("id"); // Save node of executed command (in global var)
-    var execIQ = $iq({ type: "set", to: connection.domain, id: connection.getUniqueId() })
+    var execIQ = $iq({ type: "set", to: queryJID, id: connection.getUniqueId() })
         .c("command", { xmlns: Strophe.NS.ADHOC, node: cmdNode, action: "execute" });
     connection.sendIQ(execIQ, function(result) {
         sessionid = $(result).find("command").attr("sessionid");
         displayResult(result);
     });
+    event.preventDefault();
 }
 
 function getCommandNodes() {
-    var nodesIQ = $iq({ type: "get", to: connection.domain, id: "nodes1" }).c("query", {xmlns: Strophe.NS.DISCO_ITEMS, node: Strophe.NS.ADHOC});
+    var nodesIQ = $iq({ type: "get", to: queryJID, id: "nodes1" }).c("query", {xmlns: Strophe.NS.DISCO_ITEMS, node: Strophe.NS.ADHOC});
     connection.sendIQ(nodesIQ, function(result) {
         $('#output').append("<ul id='items'></ul>");
         $(result).find("item").each(function(index, e) {
-            item = $("<li id='" + $(e).attr("node") + "'>" + $(e).attr("name") + "</li>").bind("click", runCommand);
+            link = $("<a href='#' id='" + $(e).attr("node") + "'>" + $(e).attr("name") + "</a>").click(runCommand)
+            item = $("<li></li>").append(link);
             $("#items").append(item);
         });
     });
 }
 
 function checkFeatures() {
-    featureIQ = $iq({ type: "get", to: connection.domain, id: "features1" }).c("query", {xmlns: Strophe.NS.DISCO_INFO});
+    featureIQ = $iq({ type: "get", to: queryJID, id: "features1" }).c("query", {xmlns: Strophe.NS.DISCO_INFO});
     connection.sendIQ(featureIQ, function(result) {
         if ($(result).find("feature[var='" + Strophe.NS.ADHOC + "']").length > 0) {
             $('#output').append("<p>This entitiy does support AdHoc commands</p>");
@@ -236,6 +246,7 @@ function checkFeatures() {
             $('#output').append("<p>This entitiy does NOT support AdHoc commands</p>");
         }
     });
+    $('#output').empty();
     getCommandNodes();
 }
 
@@ -245,11 +256,12 @@ function showConnect() {
     var button = $('#connect').get(0);        
 
     button.value = 'connect';
+    $('#query').hide();
     pass.show();
     jid.show();
-    $('label').show();
+    $('#cred label').show();
+    $('#cred br').show();
     $('#output').empty();
-    return false;
 }
 
 function showDisconnect() {
@@ -260,8 +272,8 @@ function showDisconnect() {
     button.value = 'disconnect';
     pass.hide();
     jid.hide();
-    $('label').hide();
-    return false;
+    $('#cred label').hide();
+    $('#cred br').hide();
 }
 
 $(document).ready(function () {
@@ -276,7 +288,7 @@ $(document).ready(function () {
         $("#log").toggle();
       });
 
-    $('#cred').bind('submit', function () {
+    $('#cred').bind('submit', function (event) {
         var button = $('#connect').get(0);
         var jid = $('#jid');
         var pass = $('#pass');        
@@ -291,7 +303,13 @@ $(document).ready(function () {
         } else {
             connection.disconnect();
         }
-        return false;
+       event.preventDefault();
+    });
+
+    $('#queryForm').bind('submit', function (event) {
+        queryJID = $('#queryJID').val();
+        checkFeatures();
+       event.preventDefault();
     });
 });