X-Git-Url: http://cgit.babelmonkeys.de/?p=adhocweb.git;a=blobdiff_plain;f=js%2Fmain.js;h=955ceb9f5d9a0795529b5f9a9d577e134789b73c;hp=fb76f3810bc0c361f4e453f5c137eee32cd9cc51;hb=c61edf2757c92c0460b9e0581771f7a9b06ed1ba;hpb=043000b3ce1e5b64299def211df4306df2b06315
diff --git a/js/main.js b/js/main.js
index fb76f38..955ceb9 100644
--- a/js/main.js
+++ b/js/main.js
@@ -1,11 +1,15 @@
var BOSH_SERVICE = 'http://localhost:5280/http-bind/';
+var show_log = true;
Strophe.addNamespace("ADHOC", "http://jabber.org/protocol/commands");
var localJID = null;
var connection = null;
-var sessionid = null;
-var cmdNode = null;
+var adhoc_status = {
+ sessionid: null,
+ cmdNode: null,
+ queryJID: null
+};
function log(msg) {
var entry = $('
').append(document.createTextNode(msg));
@@ -38,6 +42,9 @@ function onConnect(status) {
}
} else if (status == Strophe.Status.CONNECTED) {
log('Strophe is connected.');
+ adhoc_status.queryJID = connection.domain;
+ $('#queryJID').val(adhoc_status.queryJID);
+ $('#query').show();
checkFeatures();
}
}
@@ -46,21 +53,25 @@ function addNote(elem, text, type) {
if (!type) {
type = "info";
}
+ text = text.replace(/\n/g, "
");
$(elem).append("" + text + "
");
}
function addForm(elem, x) {
var form = $("");
- form.submit(function(){return false;});
+ form.submit(function(event){event.preventDefault();});
var fieldset = $("");
form.append(fieldset);
- $("").text($(x).find("title").text()).appendTo(fieldset);
- $("").text($(x).find("instructions").text()).appendTo(fieldset);
- $(x).find("field").each(function(){
+ 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() {
var item = null;
var type = $(this).attr("type");
if($(this).attr("label")) {
$("").text($(this).attr("label")).attr("for", $(this).attr("var")).appendTo(fieldset);
+ $("
").appendTo(fieldset);
}
switch(type) {
case "hidden":
@@ -70,7 +81,7 @@ function addForm(elem, x) {
item = $("");
break;
case "text-multi":
- item = $("");
+ item = $("");
break;
case "text-single":
item = $("");
@@ -79,22 +90,22 @@ function addForm(elem, x) {
item = $("").attr("readonly",true);
break;
case "jid-multi":
- item = $("");
+ item = $("");
break;
case "jid-single":
item = $("");
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 = $("");
@@ -103,7 +114,7 @@ function addForm(elem, x) {
item = $("");
}
item.addClass("df-item");
- if ($(this).find("value")) {
+ if ($(this).find("value").length > 0) {
var value = null;
if ((type == "text-multi") || (type == "jid-multi")) {
value = "";
@@ -112,39 +123,49 @@ 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());
}
}
+ 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("
");
+ if (type != "hidden")
+ fieldset.append("
");
});
$(elem).append(form);
}
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").text(options[i]).up();
- } else if(this.nodeName.toLowerCase() == "textarea") {
- var sp_value = this.value.split(/\r\n?|\r/g);
+ if (this.nodeName.toLowerCase() == "select" && this.multiple) {
+ for (var i = 0; i < this.options.length; i++)
+ 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++)
- st.c("value").text(sp_value[i]).up();
+ st.c("value").t(sp_value[i]).up();
+ } else if (this.nodeName.toLowerCase() == "input" && this.type == "checkbox") {
+ if (this.checked) {
+ st.c("value").t("1");
+ } else {
+ st.c("value").t("0");
+ }
} else {
// if this has value then
- st.c("value").text($(this).val()).up();
+ st.c("value").t($(this).val()).up();
}
st.up();
});
@@ -154,7 +175,7 @@ function serializeToDataform(form, st) {
function displayResult(result) {
var status = $(result).find("command").attr("status");
- $("#output *").remove();
+ $("#output").empty();
$(result).find("command > *").each(function(index, e) {
if ($(e).is("note")) {
addNote("#output", $(e).text(), $(e).attr("type"));
@@ -172,55 +193,90 @@ function displayResult(result) {
if ($(result).find('actions ' + kind).length > 0)
$('#' + kind + 'Button').attr("disabled", "false");
}
+ $('#executeButton').bind("click", function() {
+ 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);
+ });
+
$('#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);
+ cancelCommand(displayResult);
});
+
+ $('#queryForm').unbind('submit');
+ $('#queryForm').bind('submit', function (event) {
+ cancelCommand(function(result) {
+ $('#queryForm').unbind('submit');
+ $('#queryForm').bind('submit', function (event) {
+ adhoc_status.queryJID = $('#queryJID').val();
+ checkFeatures();
+ event.preventDefault();
+ });
+ });
+ adhoc_status.queryJID = $('#queryJID').val();
+ checkFeatures();
+ event.preventDefault();
+ });
+
} else {
- input = $("").bind("click", function() {
- $('#output *').remove();
- sessionid = null;
- cmdNode = null;
+ input = $("").bind("click", function() {
+ $('#output').empty();
+ adhoc_status.sessionid = null;
+ adhoc_status.cmdNode = null;
getCommandNodes();
});
$("#output").append(input);
}
}
-function runCommand() {
- 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" });
+function runCommand(event) {
+ 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: 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: "localhost", 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("");
$(result).find("item").each(function(index, e) {
- item = $("" + $(e).attr("name") + "").bind("click", runCommand);
+ link = $("" + $(e).attr("name") + "").click(runCommand)
+ item = $("").append(link);
$("#items").append(item);
});
});
}
function checkFeatures() {
- featureIQ = $iq({ type: "get", to: "localhost", id: "features1" }).c("query", {xmlns: Strophe.NS.DISCO_INFO});
- connection.sendIQ(featureIQ, function(result) {
- if ($(result).find("feature[var='" + Strophe.NS.ADHOC + "']").length > 0) {
- $('#output').append("This entitiy does support AdHoc commands
");
- } else {
- $('#output').append("This entitiy does NOT support AdHoc commands
");
+ 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 */
+ if ($(result).find("feature[var='" + Strophe.NS.ADHOC + "']").length > 0) {
+ $('#output').append("This entitiy does support AdHoc commands
");
+ getCommandNodes();
+ } else {
+ $('#output').append("This entitiy does NOT support AdHoc commands
");
+ }
+ },
+ function(result) { /* Errback */
+ $('#output').append("Couldn't get list of supported features
");
}
- });
- getCommandNodes();
+ );
}
function showConnect() {
@@ -229,11 +285,12 @@ function showConnect() {
var button = $('#connect').get(0);
button.value = 'connect';
+ $('#query').hide();
pass.show();
jid.show();
- $('label').show();
- $('#output *').remove();
- return false;
+ $('#cred label').show();
+ $('#cred br').show();
+ $('#output').empty();
}
function showDisconnect() {
@@ -244,20 +301,23 @@ function showDisconnect() {
button.value = 'disconnect';
pass.hide();
jid.hide();
- $('label').hide();
- return false;
+ $('#cred label').hide();
+ $('#cred br').hide();
}
$(document).ready(function () {
connection = new Strophe.Connection(BOSH_SERVICE);
- connection.rawInput = rawInput;
- connection.rawOutput = rawOutput;
+ if (show_log) {
+ $('#log_container').show();
+ connection.rawInput = rawInput;
+ connection.rawOutput = rawOutput;
+ }
$("#log_toggle").click(function () {
$("#log").toggle();
});
- $('#cred').bind('submit', function () {
+ $('#cred').bind('submit', function (event) {
var button = $('#connect').get(0);
var jid = $('#jid');
var pass = $('#pass');
@@ -265,20 +325,25 @@ $(document).ready(function () {
if (button.value == 'connect') {
showDisconnect();
- $('#log *').remove();
+ $('#log').empty();
connection.connect(localJID,
pass.get(0).value,
onConnect);
} else {
connection.disconnect();
}
- return false;
+ event.preventDefault();
+ });
+
+ $('#queryForm').bind('submit', function (event) {
+ adhoc_status.queryJID = $('#queryJID').val();
+ checkFeatures();
+ event.preventDefault();
});
});
-onunload = function() {
+window.onunload = window.onbeforeunload = function() {
if (connection) {
connection.disconnect();
}
}
-