From: Florian Zeitz <florob@babelmonkeys.de>
Date: Fri, 12 Nov 2010 23:19:26 +0000 (+0100)
Subject: Add a disconnect button
X-Git-Url: https://git.babelmonkeys.de/?a=commitdiff_plain;h=3cd1748e378f0cfa34f208abddd03fa1798b5364;p=xmppchat.git

Add a disconnect button

* Disconnect button added
* updated strophe.js version
---

diff --git a/index.html b/index.html
index 2beef88..71297ad 100644
--- a/index.html
+++ b/index.html
@@ -31,6 +31,7 @@
   <form id="textForm" onsubmit="return sendMessage(this);" action="#">
     <input type="text" name="text" id ="text" />
     <input type="submit" id="text_submit" value="Send"/>
+    <input type="button" onclick="return doDisconnect(this);" id="disc_submit" value="Disconnect" />
   </form>
 </div>
 
diff --git a/js/main.js b/js/main.js
index e6e88fb..9588826 100644
--- a/js/main.js
+++ b/js/main.js
@@ -242,6 +242,16 @@ function doLogin(aForm) {
 	}
 }
 
+function doDisconnect(aForm) {
+	if (connection) {
+		connection.send($pres({to: room, type: 'unavailable'}).tree());
+		connection.flush();
+		connection.disconnect();
+		connection = null;
+	}
+	return false;
+}
+
 var dragElement = null;
 var mouseX = 0;
 var mouseY = 0;
@@ -268,13 +278,7 @@ function stopDrag(eve) {
 	dragElement = null;
 }
 
-window.onunload = window.onbeforeunload = function() {
-	if (connection) {
-		connection.send($pres({to: room, type: 'unavailable'}).tree());
-		connection.disconnect();
-		connection = null;
-	}
-};
+window.onunload = window.onbeforeunload = doDisconnect;
 
 window.onmousemove = doDrag;
 
diff --git a/js/strophejs b/js/strophejs
index 6d7b886..119805c 160000
--- a/js/strophejs
+++ b/js/strophejs
@@ -1 +1 @@
-Subproject commit 6d7b8863f0f36f73c0b65686956437d26bd93c01
+Subproject commit 119805c4163344fb1147131d6b9bc65702616c34
diff --git a/style.css b/style.css
index 32b7afc..5414813 100644
--- a/style.css
+++ b/style.css
@@ -61,18 +61,22 @@ html, body {
 	padding-right: 0px;
 	margin-left: 0px;
 	margin-right: 0px;
-	position: absolute;
-	right: 0px;
 }
 
 #text {
-	width: 89%;
+	width: 80%;
 	padding-left: 0px;
 	padding-right: 0px;
 	margin-left: 0px;
 	margin-right: 0px;
 }
 
+#disc_submit {
+	width: 7%;
+	position: absolute;
+	right: 0px
+}
+
 .msg {
 	margin: 2px;
 }