X-Git-Url: http://cgit.babelmonkeys.de/?p=adhocweb.git;a=blobdiff_plain;f=js%2Fmain.js;h=6bd32412743739166210a6cc07f5d3c9e3df1a29;hp=9f802b5f8e8bea4f4af7bb1334e5beee1ed04384;hb=e5d4fe480e02907b80e91d9ed42854700c5866c1;hpb=38cd189c63c36d684943f0c21e32d4933e26863c

diff --git a/js/main.js b/js/main.js
index 9f802b5..6bd3241 100644
--- a/js/main.js
+++ b/js/main.js
@@ -41,6 +41,7 @@ function onConnect(status) {
     } else if (status == Strophe.Status.CONNECTED) {
         log('Strophe is connected.');
         queryJID = connection.domain;
+        $('#queryJID').val(queryJID);
         $('#query').show();
         checkFeatures();
     }
@@ -50,12 +51,13 @@ function addNote(elem, text, type) {
     if (!type) {
        type = "info";
     }
+    text = text.replace(/\n/g, "<br/>");
     $(elem).append("<p class='" + type + "Note'>" + text + "</p>");
 }
 
 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)
@@ -67,6 +69,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":
@@ -76,7 +79,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'/>");
@@ -85,7 +88,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'/>");
@@ -126,12 +129,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);
 }
@@ -192,12 +198,24 @@ function displayResult(result) {
         });
 
         $('#cancelButton').bind("click", function() {
-            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;
-            connection.sendIQ(cancelIQ, displayResult);
+            cancelCommand(displayResult);
+        });
+
+        $('#queryForm').unbind('submit');
+        $('#queryForm').bind('submit', function (event) {
+            cancelCommand(function(result) {
+                $('#queryForm').unbind('submit');
+                $('#queryForm').bind('submit', function (event) {
+                    queryJID = $('#queryJID').val();
+                    checkFeatures();
+                    event.preventDefault();
+                });
+            });
+            queryJID = $('#queryJID').val();
+            checkFeatures();
+            event.preventDefault();
         });
+
     } else {
         input = $("<input type='button' value='Start over'/>").bind("click", function() {
             $('#output').empty();
@@ -209,7 +227,7 @@ 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: queryJID, id: connection.getUniqueId() })
         .c("command", { xmlns: Strophe.NS.ADHOC, node: cmdNode, action: "execute" });
@@ -217,6 +235,15 @@ function runCommand() {
         sessionid = $(result).find("command").attr("sessionid");
         displayResult(result);
     });
+    event.preventDefault();
+}
+
+function cancelCommand(callback) {
+    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;
+    connection.sendIQ(cancelIQ, callback);
 }
 
 function getCommandNodes() {
@@ -224,7 +251,8 @@ function getCommandNodes() {
     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);
         });
     });
@@ -252,9 +280,9 @@ function showConnect() {
     $('#query').hide();
     pass.show();
     jid.show();
-    $('label').show();
+    $('#cred label').show();
+    $('#cred br').show();
     $('#output').empty();
-    return false;
 }
 
 function showDisconnect() {
@@ -266,7 +294,7 @@ function showDisconnect() {
     pass.hide();
     jid.hide();
     $('#cred label').hide();
-    return false;
+    $('#cred br').hide();
 }
 
 $(document).ready(function () {
@@ -281,7 +309,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');        
@@ -296,13 +324,13 @@ $(document).ready(function () {
         } else {
             connection.disconnect();
         }
-        return false;
+        event.preventDefault();
     });
 
-    $('#queryForm').bind('submit', function () {
+    $('#queryForm').bind('submit', function (event) {
         queryJID = $('#queryJID').val();
         checkFeatures();
-        return false;
+        event.preventDefault();
     });
 });