Implement "cancel" action

diff --git a/js/main.js b/js/main.js
index 2cf542ec2cadb8c251f54a8fa790a6c945b68b7b..61ddaa41f427a51f832208a575c2b97a6a5c61ed 100644 (file)
--- a/js/main.js
+++ b/js/main.js
@@ -4,6 +4,8 @@ Strophe.addNamespace("ADHOC", "http://jabber.org/protocol/commands");
 
 var localJID = null;
 var connection   = null;
 
 var localJID = null;
 var connection   = null;

+var sessionid = null;
+var cmdNode = null;

 
 function log(msg) {
     var entry = $('<div></div>').append(document.createTextNode(msg));
 
 function log(msg) {
     var entry = $('<div></div>').append(document.createTextNode(msg));


@@ -45,24 +47,34 @@ function displayResult(result) {
 
     $("#output *").remove();
     $(result).find("note").each(function(index, e) {
 
     $("#output *").remove();
     $(result).find("note").each(function(index, e) {

-        type = $(e).attr("type");
+        var type = $(e).attr("type");

         if (!type) {
            type = "info";
         }
         $("#output").append("<p class='" + type + "Note'>" + $(e).text() + "</p>");
     });
     if (status == "executing") {
         if (!type) {
            type = "info";
         }
         $("#output").append("<p class='" + type + "Note'>" + $(e).text() + "</p>");
     });
     if (status == "executing") {

-        $("#output").append("<input type='button' disabled='true' id='prevButton' value='prev'/>"+
-                            "<input type='button' disabled='true' id='nextButton' value='next'/>"+
-                            "<input type='button' disabled='true' id='completeButton' value='complete'/>"+
-                            "<input type='button' id='executeButton' value='execute'/>");
+        $("#output").append("<input type='button' disabled='true' id='prevButton' value='Prev'/>"+
+                            "<input type='button' disabled='true' id='nextButton' value='Next'/>"+
+                            "<input type='button' disabled='true' id='completeButton' value='Complete'/>"+
+                            "<input type='button' id='executeButton' value='Execute'/>"+
+                            "<input type='button' id='cancelButton' value='Cancel'/>");

         for (kind in ['prev', 'next', 'complete']) {
             if ($(result).find('actions ' + kind).length > 0)
                 $('#' + kind + 'Button').attr("disabled", "false");
         }
         for (kind in ['prev', 'next', 'complete']) {
             if ($(result).find('actions ' + kind).length > 0)
                 $('#' + kind + 'Button').attr("disabled", "false");
         }

+        $('#cancelButton').bind("click", function() {
+            var cancelIQ = $iq({ type: "set", to: "localhost", id: connection.getUniqueId() })
+                .c("command", { xmlns: Strophe.NS.ADHOC, node: cmdNode, sessionid: sessionid, action: "cancel" });
+            cmdNode = null
+            sessionid = null;
+            connection.sendIQ(cancelIQ, displayResult);
+        });

     } else {
         input = $("<input type='button' value='Restart'/>").bind("click", function() {
             $('#output *').remove();
     } else {
         input = $("<input type='button' value='Restart'/>").bind("click", function() {
             $('#output *').remove();

+            sessionid = null;
+            cmdNode = null;

             getCommandNodes();
         });
         $("#output").append(input);
             getCommandNodes();
         });
         $("#output").append(input);


@@ -70,14 +82,17 @@ function displayResult(result) {
 }
 
 function runCommand() {
 }
 
 function runCommand() {

-    execIQ = $iq({ type: "set", to: "localhost", id: connection.getUniqueId() })
-        .c("command", { xmlns: Strophe.NS.ADHOC, node: $(this).attr("id"),
-            action: "execute" });
-    connection.sendIQ(execIQ, displayResult);
+    cmdNode = $(this).attr("id"); // Save not of executed command (in global)
+    var execIQ = $iq({ type: "set", to: "localhost", 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);
+    });

 }
 
 function getCommandNodes() {
 }
 
 function getCommandNodes() {

-    nodesIQ = $iq({ type: "get", to: "localhost", id: "nodes1" }).c("query", {xmlns: Strophe.NS.DISCO_ITEMS, node: Strophe.NS.ADHOC});
+    var nodesIQ = $iq({ type: "get", to: "localhost", 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) {
     connection.sendIQ(nodesIQ, function(result) {
         $('#output').append("<ul id='items'></ul>");
         $(result).find("item").each(function(index, e) {