X-Git-Url: http://cgit.babelmonkeys.de/?p=adhocweb.git;a=blobdiff_plain;f=js%2Fadhoc.js;h=cbe27523ab1ab905719fa82ca2fdce232d15c503;hp=68b14c9efa073bf295435f5076492d9e68aa7c43;hb=87bfedccdb91e2ff7cfb165e989e5259c155b513;hpb=813071fb6508e35f97a9893ac7f50b11c59431d3

diff --git a/js/adhoc.js b/js/adhoc.js
index 68b14c9..cbe2752 100644
--- a/js/adhoc.js
+++ b/js/adhoc.js
@@ -1,130 +1,149 @@
-var Adhoc = {
-    status: {
+/*
+ * Implementation of ECMA Script 5 like bind from:
+ * https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Function/bind
+ */
+if (!Function.prototype.bind) {
+  Function.prototype.bind = function (oThis) {
+    if (typeof this !== "function") {
+      /* closest thing possible to the ECMAScript 5 internal IsCallable function */
+      throw new TypeError("Function.prototype.bind - what is trying to be bound is not callable");
+    }
+    var fSlice = Array.prototype.slice,
+        aArgs = fSlice.call(arguments, 1),
+        fToBind = this,
+        fNOP = function () {},
+        fBound = function () {
+          return fToBind.apply(this instanceof fNOP ? this : oThis || window, Args.concat(fSlice.call(arguments)));
+        };
+    fNOP.prototype = this.prototype;
+    fBound.prototype = new fNOP();
+    return fBound;
+  };
+}
+
+Strophe.addNamespace("ADHOC", "http://jabber.org/protocol/commands");
+
+function Adhoc(view, readycb) {
+    this.status = {
         sessionid: null,
         cmdNode: null,
-        queryJID: null
-    },
+        queryJID: null,
+	readycb: readycb,
+	view: view
+    };
+}
+
+Adhoc.prototype = {
+    constructor: Adhoc,
 
-    addNote: function (elem, text, type) {
+    addNote: function (text, type) {
         if (!type) {
            type = "info";
         }
         text = text.replace(/\n/g, "<br/>");
-        $(elem).append("<p class='" + type + "Note'>" + text + "</p>");
+        $(this.status.view).append("<p class='" + type + "Note'>" + text + "</p>");
     },
 
-    addForm: function (elem, x) {
-        var form = $("<form action='#'/>");
+    addForm: function (x) {
+        var self = this;
+        var form = $("<form class='form-stacked' action='#'/>");
         form.submit(function(event) {
-            Adhoc.executeCommand("execute", Adhoc.serializeToDataform('form'),
-                function(e) { Adhoc.displayResult(elem, e) });
+            self.executeCommand("execute", self.serializeToDataform('form'),
+                function(e) { self.displayResult(e) });
             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("title").each(function() { $("<legend/>").text($(this).text()).appendTo(fieldset); });
+        $(x).find("instructions").each(function() { $("<p/>").text($(this).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/>");
+	    var clearfix = $("<div class='clearfix'/>");
+            var item = self.buildHTMLField(this);
+            var label = $(this).attr("label");
+            if(label) {
+                $("<label/>").text(label).attr("for", $(this).attr("var")).appendTo(clearfix);
             }
-            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")
+            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"));
+            clearfix.append(item);
+            fieldset.append(clearfix);
+        });
+        $(self.status.view).append(form);
+    },
+
+    buildHTMLField: function(fld) {
+        var field = $(fld), html = {
+            "hidden"	  : "<input type='hidden'/>",
+            "boolean"	  : "<input type='checkbox'/>",
+            "fixed"       : "<input type='text' readonly='true'/>",
+            "text-single" : "<input type='text'/>",
+            "text-private": "<input type='password'/>",
+            "text-multi"  : "<textarea rows='10' cols='70'/>",
+            "jid-single"  : "<input type='text'/>",
+            "jid-multi"   : "<textarea rows='10' cols='70'/>",
+            "list-single" : "<select/>",
+            "list-multi"  : "<select multiple='multiple'/>",
+        };
+        var type = field.attr('type');
+        var input = $(html[type] || "<input/>");
+        var name = field.attr("var");
+
+        input.addClass("df-item");
+        if (name) {
+            input.attr("name", name);
+            input.attr("id", name);
+        }
+
+        if (field.find("required").length > 0)
+            input.attr("required", "required");
+
+        /* Add possible values to the lists */
+        if (type === 'list-multi' || type==='list-single') {
+            field.find("option").each(function() {
+                var option = $("<option/>");
+                option.text($(this).attr("label"));
+                option.val($(this).find("value").text());
+                input.append(option);
+            });
+        }
+
+        /* Add/select default values */
+        field.children("value").each(function() {
+            var value = $(this).text();
+            if ((type === "text-multi") || (type === "jid-multi")) {
+                input.text(input.text() + value + "\n"); /* .append() would work, but doesn't escape */
+            } else if (type === "list-multi") {
+                input.children('option[value="' + value + '"]').each(function() {
+                    $(this).attr("selected", "selected");
+                });
+            } else {
+                input.val(value);
             }
-            fieldset.append(item);
-            if (type != "hidden")
-                fieldset.append("<br/>");
         });
-        $(elem).append(form);
+
+        return input;
     },
 
     serializeToDataform: function (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) {
+            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") {
+            } 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") {
+            } 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
+                /* if this has value then */
                 st.c("value").t($(this).val()).up();
             }
             st.up();
@@ -133,104 +152,107 @@ var Adhoc = {
         return st.tree();
     },
 
-    displayResult: function (elem, result) {
+    displayResult: function (result) {
+        var self = this;
         var status = $(result).find("command").attr("status");
         var kinds = {'prev': 'Prev', 'next': 'Next', 'complete': 'Complete'};
+	var actions = $(result).find("actions:first");
 
-        $(elem).empty();
-        $(result).find("command > *").each(function(index, e) {
-            if ($(e).is("note")) {
-                Adhoc.addNote(elem, $(e).text(), $(e).attr("type"));
-            } else if ($(e).is("x[xmlns=jabber:x:data]")) {
-                Adhoc.addForm(elem, e);
+        $(self.status.view).empty();
+        $(result).find("command > *").each(function() {
+            if ($(this).is("note")) {
+                self.addNote($(this).text(), $(this).attr("type"));
+            } else if ($(this).is("x[xmlns=jabber:x:data]")) {
+                self.addForm(this);
             }
         });
-        if (status == "executing") {
+        if (status === "executing") {
+	    var controls = $("<div class='actions'/>");
             for (kind in kinds) {
-                input = $("<input type='button' disabled='disabled' value='" + kinds[kind] + "'/>").click(function() {
-                    Adhoc.executeCommand(kind, (kind != 'prev') && Adhoc.serializeToDataform('form'), function(e) { Adhoc.displayResult(elem, e) });
-                });
-                if ($(result).find('actions ' + kind).length > 0)
+		var input;
+		(function (type) {
+		    input = $("<input type='button' disabled='disabled' class='btn' value='" + kinds[type] + "'/>").click(function() {
+			self.executeCommand(type, (type != 'prev') && self.serializeToDataform('form'), function(e) { self.displayResult(e) });
+		    }).appendTo(controls);
+		})(kind);
+                if (actions.find(kind).length > 0)
                     input.removeAttr("disabled");
-                $(elem).append(input);
+		if (actions.attr("execute") == kind)
+		    input.addClass("primary");
             }
 
-            $("<input type='button' id='executeButton' value='Execute'/>").click(function() {
-                Adhoc.executeCommand("execute", Adhoc.serializeToDataform('form'), function(e) { Adhoc.displayResult(elem, e) });
-            }).appendTo(elem);
-
-            $("<input type='button' value='Cancel'/>").click(function() {
-                Adhoc.cancelCommand(function(e) { Adhoc.displayResult(elem, e) });
-            }).appendTo(elem);
+            $("<input type='button' class='btn' value='Cancel'/>").click(function() {
+                self.cancelCommand(function(e) { self.displayResult(e) });
+            }).appendTo(controls);
+	    $(self.status.view + " fieldset").append(controls);
         } else {
-            input = $("<input type='button' value='Start over'/>").bind("click", function() {
-                $(elem).empty();
-                Adhoc.status.sessionid = null;
-                Adhoc.status.cmdNode = null;
-                Adhoc.getCommandNodes(elem);
-            });
-            $(elem).append(input);
+	    self.status.sessionid = null;
+	    self.status.cmdNode = null;
+	    self.status.readycb();
         }
     },
 
     runCommand: function (item, callback) {
-        Adhoc.status.cmdNode = $(item).attr("id"); // Save node of executed command (in global var)
-        Adhoc.executeCommand("execute", false, function(result) {
-            Adhoc.status.sessionid = $(result).find("command").attr("sessionid");
+        var cb;
+        this.status.cmdNode = $(item).attr("id"); /* Save node of executed command */
+        cb = function(result) {
+            this.status.sessionid = $(result).find("command").attr("sessionid");
             callback(result);
-        });
+        }
+        this.executeCommand("execute", false, cb.bind(this));
     },
 
     executeCommand: function (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 });
+        if (this.status.sessionid)
+            var execIQ = $iq({ type: "set", to: this.status.queryJID, id: connection.getUniqueId() })
+                .c("command", { xmlns: Strophe.NS.ADHOC, node: this.status.cmdNode, sessionid: this.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 });
+            var execIQ = $iq({ type: "set", to: this.status.queryJID, id: connection.getUniqueId() })
+                .c("command", { xmlns: Strophe.NS.ADHOC, node: this.status.cmdNode, action: type });
         if (childs)
             execIQ.cnode(childs);
             connection.sendIQ(execIQ, callback);
     },
 
     cancelCommand: function (callback) {
-        Adhoc.executeCommand("cancel", false, callback);
-        Adhoc.status.cmdNode = null
-        Adhoc.status.sessionid = null;
+	if (this.status.cmdNode == null) return;
+        this.executeCommand("cancel", false, callback);
+        this.status.cmdNode = null
+        this.status.sessionid = null;
     },
 
-    getCommandNodes: function (elem) {
-        var nodesIQ = $iq({ type: "get", to: Adhoc.status.queryJID, id: connection.getUniqueId() }).c("query", {xmlns: Strophe.NS.DISCO_ITEMS, node: Strophe.NS.ADHOC});
+    getCommandNodes: function (callback) {
+        var self = this;
+        var nodesIQ = $iq({ type: "get", to: self.status.queryJID, id: connection.getUniqueId() }).c("query", {xmlns: Strophe.NS.DISCO_ITEMS, node: Strophe.NS.ADHOC});
         connection.sendIQ(nodesIQ, function(result) {
             var items = $("<ul></ul>");
-            $(elem).append(items);
-            $(result).find("item").each(function(index, e) {
-                $("<li></li>").append($("<a href='#' id='" + $(e).attr("node") + "'>" + $(e).attr("name") + "</a>").click(function (event) {
-                    Adhoc.runCommand(this, function (result) { Adhoc.displayResult(elem, result); });
+            $(result).find("item").each(function() {
+                $("<li></li>").append($("<a href='#' id='" + $(this).attr("node") + "'>" + $(this).attr("name") + "</a>").click(function (event) {
+		    self.cancelCommand(function(){});
+                    self.runCommand(this, function (result) { self.displayResult(result); });
                     event.preventDefault();
                 })).appendTo(items);
             });
+	    callback(items);
         });
     },
 
-    checkFeatures: function (elem, jid) {
-        if (Adhoc.status.sessionid)
-            Adhoc.cancelCommand();
-        Adhoc.status.queryJID = jid;
-        var featureIQ = $iq({ type: "get", to: Adhoc.status.queryJID, id: connection.getUniqueId() }).c("query", {xmlns: Strophe.NS.DISCO_INFO});
-        $(elem).empty();
-        connection.sendIQ(featureIQ,
-            function(result) { /* Callback */
-                if ($(result).find("feature[var='" + Strophe.NS.ADHOC + "']").length > 0) {
-                    Adhoc.getCommandNodes(elem);
-                } else {
-                    $(elem).append("<p>" + Adhoc.status.queryJID + " does NOT support AdHoc commands</p>");
-                }
-            },
-            function(result) { /* Errback */
-                $(elem).append("<p>Couldn't get list of supported features</p>");
-            }
-        );
-    }
+    checkFeatures: function (jid, cb, ecb) {
+	var callback;
+        if (this.status.sessionid)
+            this.cancelCommand();
+        this.status.queryJID = jid;
+        var featureIQ = $iq({ type: "get", to: this.status.queryJID, id: connection.getUniqueId() }).c("query", {xmlns: Strophe.NS.DISCO_INFO});
+        $(this.status.view).empty();
 
+	function callback(result) {
+	    if ($(result).find("feature[var='" + Strophe.NS.ADHOC + "']").length > 0) {
+		cb(result);
+	    } else {
+		ecb(result);
+	    }
+	}
+
+        connection.sendIQ(featureIQ, callback, ecb);
+    }
 }