X-Git-Url: http://cgit.babelmonkeys.de/?p=adhocweb.git;a=blobdiff_plain;f=js%2Fmain.js;h=955ceb9f5d9a0795529b5f9a9d577e134789b73c;hp=c03a8cf74c391428363da43a2f1269f1fb40d9c3;hb=c61edf2757c92c0460b9e0581771f7a9b06ed1ba;hpb=9ba3402321b224b65cc3eed994b6cb016cfeabda diff --git a/js/main.js b/js/main.js index c03a8cf..955ceb9 100644 --- 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 sessionid = null; -var cmdNode = null; -var queryJID = null; +var adhoc_status = { + sessionid: null, + cmdNode: null, + queryJID: null +}; function log(msg) { var entry = $('
').append(document.createTextNode(msg)); @@ -40,8 +42,8 @@ function onConnect(status) { } } 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(); } @@ -64,7 +66,7 @@ function addForm(elem, x) { $("").text($(x).find("title").text()).appendTo(fieldset); if ($(x).find("instructions").length > 0) $("").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")) { @@ -95,15 +97,15 @@ function addForm(elem, x) { break; case "list-multi": item = $(""); - $(this).find("option").each(function(){ - $("").val($(this).find("value").text()).text($(this).attr("label")).appendTo(item); - }); + $(this).find("option").each(function() { + $("").val($(this).find("value").text()).text($(this).attr("label")).appendTo(item); + }); break; case "list-single": item = $(""); - $(this).find("option").each(function(){ - $("").val($(this).find("value").text()).text($(this).attr("label")).appendTo(item); - }); + $(this).find("option").each(function() { + $("").val($(this).find("value").text()).text($(this).attr("label")).appendTo(item); + }); break; case "text-private": item = $(""); @@ -121,9 +123,10 @@ function addForm(elem, x) { }); item.val(value); } else if (type == "list-multi") { - value = new Array(); - $(this).find("value").each(function() { - value[value.length] = $(this).text(); + $(this).children("value").each(function() { + item.children('option[value="' + $(this).text() + '"]').each(function() { + $(this).attr("selected", "selected"); + }); }); } else { item.val($(this).find("value").text()); @@ -143,13 +146,13 @@ function addForm(elem, x) { } function serializeToDataform(form, st) { - st.c("x", {"xmlns":"jabber:x:data", "type": "submit"}); + st.c("x", {"xmlns": "jabber:x:data", "type": "submit"}); $(form).find(".df-item").each(function(){ st.c("field", {"var": $(this).attr("name")}); if (this.nodeName.toLowerCase() == "select" && this.multiple) { for (var i = 0; i < this.options.length; i++) - if (options[i].selected) - st.c("value").t(options[i]).up(); + if (this.options[i].selected) + st.c("value").t(this.options[i].text).up(); } else if (this.nodeName.toLowerCase() == "textarea") { var sp_value = this.value.split(/\r?\n|\r/g); for(var i = 0; i < sp_value.length; i++) @@ -191,8 +194,8 @@ function displayResult(result) { $('#' + 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); }); @@ -206,12 +209,12 @@ function displayResult(result) { cancelCommand(function(result) { $('#queryForm').unbind('submit'); $('#queryForm').bind('submit', function (event) { - queryJID = $('#queryJID').val(); + adhoc_status.queryJID = $('#queryJID').val(); checkFeatures(); event.preventDefault(); }); }); - queryJID = $('#queryJID').val(); + adhoc_status.queryJID = $('#queryJID').val(); checkFeatures(); event.preventDefault(); }); @@ -219,8 +222,8 @@ function displayResult(result) { } else { input = $("").bind("click", function() { $('#output').empty(); - sessionid = null; - cmdNode = null; + adhoc_status.sessionid = null; + adhoc_status.cmdNode = null; getCommandNodes(); }); $("#output").append(input); @@ -228,26 +231,26 @@ function displayResult(result) { } 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) { - sessionid = $(result).find("command").attr("sessionid"); + adhoc_status.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; + 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() { - 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("