X-Git-Url: http://cgit.babelmonkeys.de/?p=adhocweb.git;a=blobdiff_plain;f=js%2Fmain.js;h=73ace060a8394f96a984b32e9ba61fa9080e287c;hp=955ceb9f5d9a0795529b5f9a9d577e134789b73c;hb=e55b23864a9911c15d930b43ed9afe1df5943bf7;hpb=c61edf2757c92c0460b9e0581771f7a9b06ed1ba

diff --git a/js/main.js b/js/main.js
index 955ceb9..73ace06 100644
--- a/js/main.js
+++ b/js/main.js
@@ -1,15 +1,8 @@
 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 adhoc_status = {
-    sessionid: null,
-    cmdNode: null,
-    queryJID: null
-};
 
 function log(msg) {
     var entry = $('<div></div>').append(document.createTextNode(msg));
@@ -42,243 +35,12 @@ function onConnect(status) {
         }
     } else if (status == Strophe.Status.CONNECTED) {
         log('Strophe is connected.');
-        adhoc_status.queryJID = connection.domain;
-        $('#queryJID').val(adhoc_status.queryJID);
+        $('#queryJID').val(connection.domain);
         $('#query').show();
-        checkFeatures();
-    }
-}
-
-function addNote(elem, text, type) {
-    if (!type) {
-       type = "info";
-    }
-    text = text.replace(/\n/g, "<br/>");
-    $(elem).append("<p class='" + type + "Note'>" + text + "</p>");
-}
-
-function addForm(elem, x) {
-    var form = $("<form/>");
-    form.submit(function(event){event.preventDefault();});
-    var fieldset = $("<fieldset/>");
-    form.append(fieldset);
-    if ($(x).find("title").length > 0)
-        $("<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() {
-        var item = null;
-        var type = $(this).attr("type");
-        if($(this).attr("label")) {
-            $("<label/>").text($(this).attr("label")).attr("for", $(this).attr("var")).appendTo(fieldset);
-            $("<br/>").appendTo(fieldset);
-        }
-        switch(type) {
-        case "hidden":
-            item = $("<input type='hidden'/>");
-            break;
-        case "boolean":
-            item = $("<input type='checkbox'/>");
-            break;
-        case "text-multi":
-            item = $("<textarea rows='10' cols='70'/>");
-            break;
-        case "text-single":
-            item = $("<input type='text'/>");
-            break;
-        case "fixed":
-            item = $("<input type='text'/>").attr("readonly",true);
-            break;
-        case "jid-multi":
-            item = $("<textarea rows='10' cols='70'/>");
-            break;
-        case "jid-single":
-            item = $("<input type='text'/>");
-            break;
-        case "list-multi":
-            item = $("<select multiple='multiple'/>");
-            $(this).find("option").each(function() {
-                $("<option/>").val($(this).find("value").text()).text($(this).attr("label")).appendTo(item);
-            });
-            break;
-        case "list-single":
-            item = $("<select/>");
-            $(this).find("option").each(function() {
-                $("<option/>").val($(this).find("value").text()).text($(this).attr("label")).appendTo(item);
-            });
-            break;
-        case "text-private":
-            item = $("<input type='password'/>");
-            break;
-        default:
-            item = $("<input/>");
-        }
-        item.addClass("df-item");
-        if ($(this).find("value").length > 0) {
-            var value = null;
-            if ((type == "text-multi") || (type == "jid-multi")) {
-                value = "";
-                $(this).find("value").each(function() {
-                    value = value + $(this).text() + "\n";
-                });
-                item.val(value);
-            } else if (type == "list-multi") {
-                $(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);
-        if (type != "hidden")
-            fieldset.append("<br/>");
-    });
-    $(elem).append(form);
-}
-
-function serializeToDataform(form, st) {
-    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 (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").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").t($(this).val()).up();
-        }
-        st.up();
-    });
-    st.up();
-}
-
-function displayResult(result) {
-    var status = $(result).find("command").attr("status");
-
-    $("#output").empty();
-    $(result).find("command > *").each(function(index, e) {
-        if ($(e).is("note")) {
-            addNote("#output", $(e).text(), $(e).attr("type"));
-        } else if ($(e).is("x[xmlns=jabber:x:data]")) {
-            addForm("#output", e);
-        }
-    });
-    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'/>"+
-                            "<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");
-        }
-        $('#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() {
-            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 = $("<input type='button' value='Start over'/>").bind("click", function() {
-            $('#output').empty();
-            adhoc_status.sessionid = null;
-            adhoc_status.cmdNode = null;
-            getCommandNodes();
-        });
-        $("#output").append(input);
+        Adhoc.checkFeatures("#output", connection.domain);
     }
 }
 
-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) {
-        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: 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) {
-            link = $("<a href='#' id='" + $(e).attr("node") + "'>" + $(e).attr("name") + "</a>").click(runCommand)
-            item = $("<li></li>").append(link);
-            $("#items").append(item);
-        });
-    });
-}
-
-function checkFeatures() {
-    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("<p>This entitiy does support AdHoc commands</p>");
-                    getCommandNodes();
-                } else {
-                    $('#output').append("<p>This entitiy does NOT support AdHoc commands</p>");
-                }
-        },
-        function(result) { /* Errback */
-            $('#output').append("<p>Couldn't get list of supported features</p>");
-        }
-    );
-}
-
 function showConnect() {
     var jid = $('#jid');
     var pass = $('#pass');
@@ -336,8 +98,7 @@ $(document).ready(function () {
     });
 
     $('#queryForm').bind('submit', function (event) {
-        adhoc_status.queryJID = $('#queryJID').val();
-        checkFeatures();
+        Adhoc.checkFeatures("#output", $('#queryJID').val());
         event.preventDefault();
     });
 });