X-Git-Url: http://cgit.babelmonkeys.de/?p=adhocweb.git;a=blobdiff_plain;f=js%2Fmain.js;h=85f2ccaeaa2ec8887710ca2fe8baed05aff0ada7;hp=188dfc762eda4af93e1ac45659c9671bf8046d5f;hb=7ef6024aa84881aba55e61c38073fc9465aac876;hpb=e3f2eb03a5f4dc014e034cdfc65a572544421336 diff --git a/js/main.js b/js/main.js index 188dfc7..85f2cca 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,10 +42,10 @@ 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(); + checkFeatures("#output"); } } @@ -56,15 +58,18 @@ function addNote(elem, text, type) { } function addForm(elem, x) { - var form = $(""); - form.submit(function(event){event.preventDefault();}); + var form = $(""); + form.submit(function(event) { + executeCommand("execute", serializeToDataform('form'), function(e) { displayResult(elem, e) }); + event.preventDefault(); + }); var fieldset = $(""); form.append(fieldset); if ($(x).find("title").length > 0) $("").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 +100,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 +126,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()); @@ -142,14 +148,14 @@ function addForm(elem, x) { $(elem).append(form); } -function serializeToDataform(form, st) { - st.c("x", {"xmlns": "jabber:x:data", "type": "submit"}); +function serializeToDataform(form) { + st = $build("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++) @@ -167,111 +173,107 @@ function serializeToDataform(form, st) { st.up(); }); st.up(); + return st.tree(); } -function displayResult(result) { +function displayResult(elem, result) { var status = $(result).find("command").attr("status"); + var kinds = {'prev': 'Prev', 'next': 'Next', 'complete': 'Complete'}; - $("#output").empty(); + $(elem).empty(); $(result).find("command > *").each(function(index, e) { if ($(e).is("note")) { - addNote("#output", $(e).text(), $(e).attr("type")); + addNote(elem, $(e).text(), $(e).attr("type")); } else if ($(e).is("x[xmlns=jabber:x:data]")) { - addForm("#output", e); + addForm(elem, e); } }); if (status == "executing") { - $("#output").append(""+ - ""+ - ""+ - ""+ - ""); - for (kind in ['prev', 'next', 'complete']) { + for (kind in kinds) { + input = $("").click(function() { + if (kind == 'prev') + executeCommand(kind, false, function(e) { displayResult(elem, e) }); + else + executeCommand(kind, serializeToDataform('form'), function(e) { displayResult(elem, e) }); + }); if ($(result).find('actions ' + kind).length > 0) - $('#' + kind + 'Button').attr("disabled", "false"); + input.removeAttr("disabled"); + $(elem).append(input); } - $('#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" }); - serializeToDataform($('form'), execIQ); - connection.sendIQ(execIQ, displayResult); - }); - $('#cancelButton').bind("click", function() { - 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(); - }); + $("").click(function() { + executeCommand("execute", serializeToDataform('form'), function(e) { displayResult(elem, e) }); + }).appendTo(elem); + $("").click(function() { + cancelCommand(function(e) { displayResult(elem, e) }); + }).appendTo(elem); } else { input = $("").bind("click", function() { - $('#output').empty(); - sessionid = null; - cmdNode = null; - getCommandNodes(); + $(elem).empty(); + adhoc_status.sessionid = null; + adhoc_status.cmdNode = null; + getCommandNodes(elem); }); - $("#output").append(input); + $(elem).append(input); } } -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" }); - connection.sendIQ(execIQ, function(result) { - sessionid = $(result).find("command").attr("sessionid"); - displayResult(result); +function runCommand(item, callback) { + adhoc_status.cmdNode = $(item).attr("id"); // Save node of executed command (in global var) + executeCommand("execute", false, function(result) { + adhoc_status.sessionid = $(result).find("command").attr("sessionid"); + callback(result); }); - event.preventDefault(); +} + +function executeCommand(type, childs, callback) { + if (adhoc_status.sessionid) + 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: type }); + else + var execIQ = $iq({ type: "set", to: adhoc_status.queryJID, id: connection.getUniqueId() }) + .c("command", { xmlns: Strophe.NS.ADHOC, node: adhoc_status.cmdNode, action: type }); + if (childs) + execIQ.cnode(childs); + connection.sendIQ(execIQ, callback); } 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); + executeCommand("cancel", false, callback); + adhoc_status.cmdNode = null + adhoc_status.sessionid = null; } -function getCommandNodes() { - var nodesIQ = $iq({ type: "get", to: queryJID, id: "nodes1" }).c("query", {xmlns: Strophe.NS.DISCO_ITEMS, node: Strophe.NS.ADHOC}); +function getCommandNodes(elem) { + var nodesIQ = $iq({ type: "get", to: adhoc_status.queryJID, id: connection.getUniqueId() }).c("query", {xmlns: Strophe.NS.DISCO_ITEMS, node: Strophe.NS.ADHOC}); connection.sendIQ(nodesIQ, function(result) { - $('#output').append("This entitiy does support AdHoc commands
"); - getCommandNodes(); - } else { - $('#output').append("This entitiy does NOT support AdHoc commands
"); - } + if ($(result).find("feature[var='" + Strophe.NS.ADHOC + "']").length > 0) { + getCommandNodes(elem); + } else { + $(elem).append("" + adhoc_status.queryJID + " does NOT support AdHoc commands
"); + } }, function(result) { /* Errback */ - $('#output').append("Couldn't get list of supported features
"); + $(elem).append("Couldn't get list of supported features
"); } ); } @@ -333,8 +335,8 @@ $(document).ready(function () { }); $('#queryForm').bind('submit', function (event) { - queryJID = $('#queryJID').val(); - checkFeatures(); + adhoc_status.queryJID = $('#queryJID').val(); + checkFeatures("#output"); event.preventDefault(); }); });