Move status inside a object

diff --git a/js/main.js b/js/main.js
index 188dfc762eda4af93e1ac45659c9671bf8046d5f..1b2aebb9edfd9a28ae29104d107ba420c84371b2 100644 (file)
--- a/js/main.js
+++ b/js/main.js
@@ -5,9 +5,11 @@ 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;
-var queryJID = null;
+var adhoc_status = {
+    sessionid: null,
+    cmdNode: null,
+    queryJID: null
+};

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


@@ -40,8 +42,8 @@ function onConnect(status) {
         }
     } else if (status == Strophe.Status.CONNECTED) {
         log('Strophe is connected.');
         }
     } else if (status == Strophe.Status.CONNECTED) {
         log('Strophe is connected.');

-        queryJID = connection.domain;
-        $('#queryJID').val(queryJID);
+        adhoc_status.queryJID = connection.domain;
+        $('#queryJID').val(adhoc_status.queryJID);

         $('#query').show();
         checkFeatures();
     }
         $('#query').show();
         checkFeatures();
     }


@@ -64,7 +66,7 @@ function addForm(elem, x) {
         $("<legend/>").text($(x).find("title").text()).appendTo(fieldset);
     if ($(x).find("instructions").length > 0)
         $("<p/>").text($(x).find("instructions").text()).appendTo(fieldset);
         $("<legend/>").text($(x).find("title").text()).appendTo(fieldset);
     if ($(x).find("instructions").length > 0)
         $("<p/>").text($(x).find("instructions").text()).appendTo(fieldset);

-    $(x).find("field").each(function(){
+    $(x).find("field").each(function() {

         var item = null;
         var type = $(this).attr("type");
         if($(this).attr("label")) {
         var item = null;
         var type = $(this).attr("type");
         if($(this).attr("label")) {


@@ -191,8 +193,8 @@ function displayResult(result) {
                 $('#' + kind + 'Button').attr("disabled", "false");
         }
         $('#executeButton').bind("click", function() {
                 $('#' + kind + 'Button').attr("disabled", "false");
         }
         $('#executeButton').bind("click", function() {

-            var execIQ = $iq({ type: "set", to: queryJID, id: connection.getUniqueId() })
-                .c("command", { xmlns: Strophe.NS.ADHOC, node: cmdNode, sessionid: sessionid, action: "execute" });
+            var execIQ = $iq({ type: "set", to: adhoc_status.queryJID, id: connection.getUniqueId() })
+                .c("command", { xmlns: Strophe.NS.ADHOC, node: adhoc_status.cmdNode, sessionid: adhoc_status.sessionid, action: "execute" });

             serializeToDataform($('form'), execIQ);
             connection.sendIQ(execIQ, displayResult);
         });
             serializeToDataform($('form'), execIQ);
             connection.sendIQ(execIQ, displayResult);
         });


@@ -206,12 +208,12 @@ function displayResult(result) {
             cancelCommand(function(result) {
                 $('#queryForm').unbind('submit');
                 $('#queryForm').bind('submit', function (event) {
             cancelCommand(function(result) {
                 $('#queryForm').unbind('submit');
                 $('#queryForm').bind('submit', function (event) {

-                    queryJID = $('#queryJID').val();
+                    adhoc_status.queryJID = $('#queryJID').val();

                     checkFeatures();
                     event.preventDefault();
                 });
             });
                     checkFeatures();
                     event.preventDefault();
                 });
             });

-            queryJID = $('#queryJID').val();
+            adhoc_status.queryJID = $('#queryJID').val();

             checkFeatures();
             event.preventDefault();
         });
             checkFeatures();
             event.preventDefault();
         });


@@ -219,8 +221,8 @@ function displayResult(result) {
     } else {
         input = $("<input type='button' value='Start over'/>").bind("click", function() {
             $('#output').empty();
     } else {
         input = $("<input type='button' value='Start over'/>").bind("click", function() {
             $('#output').empty();

-            sessionid = null;
-            cmdNode = null;
+            adhoc_status.sessionid = null;
+            adhoc_status.cmdNode = null;

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


@@ -228,26 +230,26 @@ function displayResult(result) {
 }
 
 function runCommand(event) {
 }
 
 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" });
+    adhoc_status.cmdNode = $(this).attr("id"); // Save node of executed command (in global var)
+    var execIQ = $iq({ type: "set", to: adhoc_status.queryJID, id: connection.getUniqueId() })
+        .c("command", { xmlns: Strophe.NS.ADHOC, node: adhoc_status.cmdNode, action: "execute" });

     connection.sendIQ(execIQ, function(result) {
     connection.sendIQ(execIQ, function(result) {

-        sessionid = $(result).find("command").attr("sessionid");
+        adhoc_status.sessionid = $(result).find("command").attr("sessionid");

         displayResult(result);
     });
     event.preventDefault();
 }
 
 function cancelCommand(callback) {
         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;
+    var cancelIQ = $iq({ type: "set", to: adhoc_status.queryJID, id: connection.getUniqueId() })
+        .c("command", { xmlns: Strophe.NS.ADHOC, node: adhoc_status.cmdNode, sessionid: adhoc_status.sessionid, action: "cancel" });
+    adhoc_status.cmdNode = null
+    adhoc_status.sessionid = null;

     connection.sendIQ(cancelIQ, callback);
 }
 
 function getCommandNodes() {
     connection.sendIQ(cancelIQ, callback);
 }
 
 function getCommandNodes() {

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


@@ -259,7 +261,7 @@ function getCommandNodes() {
 }
 
 function checkFeatures() {
 }
 
 function checkFeatures() {

-    featureIQ = $iq({ type: "get", to: queryJID, id: "features1" }).c("query", {xmlns: Strophe.NS.DISCO_INFO});
+    featureIQ = $iq({ type: "get", to: adhoc_status.queryJID, id: "features1" }).c("query", {xmlns: Strophe.NS.DISCO_INFO});

     $('#output').empty();
     connection.sendIQ(featureIQ,
         function(result) { /* Callback */
     $('#output').empty();
     connection.sendIQ(featureIQ,
         function(result) { /* Callback */


@@ -333,7 +335,7 @@ $(document).ready(function () {
     });
 
     $('#queryForm').bind('submit', function (event) {
     });
 
     $('#queryForm').bind('submit', function (event) {

-        queryJID = $('#queryJID').val();
+        adhoc_status.queryJID = $('#queryJID').val();

         checkFeatures();
         event.preventDefault();
     });
         checkFeatures();
         event.preventDefault();
     });