summaryrefslogtreecommitdiff
authorFlorian Zeitz <florob@babelmonkeys.de>2010-11-12 23:19:26 (GMT)
committer Florian Zeitz <florob@babelmonkeys.de>2010-11-12 23:19:26 (GMT)
commit3cd1748e378f0cfa34f208abddd03fa1798b5364 (patch)
treeb44037211ccd7a5780d370b3bca05351946f129b
parent6c19bc50128edf5f1675a022a586423533104c3a (diff)
downloadxmppchat-master.zip
xmppchat-master.tar.gz
Add a disconnect button
* Disconnect button added * updated strophe.js version
Diffstat
-rw-r--r--index.html1
-rw-r--r--js/main.js18
m---------js/strophejs0
-rw-r--r--style.css10
4 files changed, 19 insertions, 10 deletions
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
-Subproject 6d7b8863f0f36f73c0b65686956437d26bd93c0
+Subproject 119805c4163344fb1147131d6b9bc65702616c3
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;
}