Event handling changes

* Use event.preventDefault() instead of just return false
* remove superfluous returns
* Add <a href='#'/> around commands for usability

diff --git a/js/main.js b/js/main.js
index 9f802b5f8e8bea4f4af7bb1334e5beee1ed04384..4cff25caf4b3a5e62fc7acbf1ae133f656cb383e 100644 (file)
--- a/js/main.js
+++ b/js/main.js
@@ -55,7 +55,7 @@ function addNote(elem, text, type) {
 
 function addForm(elem, x) {
     var form = $("<form/>");
 
 function addForm(elem, x) {
     var form = $("<form/>");

-    form.submit(function(){return false;});
+    form.submit(function(event){event.preventDefault();});

     var fieldset = $("<fieldset/>");
     form.append(fieldset);
     if ($(x).find("title").length > 0)
     var fieldset = $("<fieldset/>");
     form.append(fieldset);
     if ($(x).find("title").length > 0)


@@ -209,7 +209,7 @@ function displayResult(result) {
     }
 }
 
     }
 }
 

-function runCommand() {
+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" });
     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" });


@@ -217,6 +217,7 @@ function runCommand() {
         sessionid = $(result).find("command").attr("sessionid");
         displayResult(result);
     });
         sessionid = $(result).find("command").attr("sessionid");
         displayResult(result);
     });

+    event.preventDefault();

 }
 
 function getCommandNodes() {
 }
 
 function getCommandNodes() {


@@ -224,7 +225,8 @@ function getCommandNodes() {
     connection.sendIQ(nodesIQ, function(result) {
         $('#output').append("<ul id='items'></ul>");
         $(result).find("item").each(function(index, e) {
     connection.sendIQ(nodesIQ, function(result) {
         $('#output').append("<ul id='items'></ul>");
         $(result).find("item").each(function(index, e) {

-            item = $("<li id='" + $(e).attr("node") + "'>" + $(e).attr("name") + "</li>").bind("click", runCommand);
+            link = $("<a href='#' id='" + $(e).attr("node") + "'>" + $(e).attr("name") + "</a>").click(runCommand)
+            item = $("<li></li>").append(link);

             $("#items").append(item);
         });
     });
             $("#items").append(item);
         });
     });


@@ -254,7 +256,6 @@ function showConnect() {
     jid.show();
     $('label').show();
     $('#output').empty();
     jid.show();
     $('label').show();
     $('#output').empty();

-    return false;

 }
 
 function showDisconnect() {
 }
 
 function showDisconnect() {


@@ -266,7 +267,6 @@ function showDisconnect() {
     pass.hide();
     jid.hide();
     $('#cred label').hide();
     pass.hide();
     jid.hide();
     $('#cred label').hide();

-    return false;

 }
 
 $(document).ready(function () {
 }
 
 $(document).ready(function () {


@@ -281,7 +281,7 @@ $(document).ready(function () {
         $("#log").toggle();
       });
 
         $("#log").toggle();
       });
 

-    $('#cred').bind('submit', function () {
+    $('#cred').bind('submit', function (event) {

         var button = $('#connect').get(0);
         var jid = $('#jid');
         var pass = $('#pass');        
         var button = $('#connect').get(0);
         var jid = $('#jid');
         var pass = $('#pass');        


@@ -296,13 +296,13 @@ $(document).ready(function () {
         } else {
             connection.disconnect();
         }
         } else {
             connection.disconnect();
         }

-        return false;
+       event.preventDefault();

     });
 
     });
 

-    $('#queryForm').bind('submit', function () {
+    $('#queryForm').bind('submit', function (event) {

         queryJID = $('#queryJID').val();
         checkFeatures();
         queryJID = $('#queryJID').val();
         checkFeatures();

-        return false;
+       event.preventDefault();

     });
 });
 
     });
 });