[soashable commit] r812 - in trunk/soashable-chatbar: . src/main/javascript src/main/webapp
codesite...@google.com
Date: Mon Aug 4 22:12:25 2008
New Revision: 812
Removed:
trunk/soashable-chatbar/src/main/javascript/Soashable2.js
trunk/soashable-chatbar/src/main/webapp/soashable2.html
Modified:
trunk/soashable-chatbar/pom.xml
trunk/soashable-chatbar/src/main/javascript/soashable.application.js
trunk/soashable-chatbar/src/main/javascript/soashable.init.js
trunk/soashable-chatbar/src/main/webapp/index.html
Log:
comitted the wrong thing last time... oops
Modified: trunk/soashable-chatbar/pom.xml
==============================================================================
--- trunk/soashable-chatbar/pom.xml (original)
+++ trunk/soashable-chatbar/pom.xml Mon Aug 4 22:12:25 2008
@@ -65,7 +65,7 @@
<properties>
<context>/chatbar</context>
</properties>
- <pingURL>http://soashable.com/chatbar</pingURL>
+ <pingURL>http://soashable.com:8180/chatbar</pingURL>
<pingTimeout>20000</pingTimeout>
</deployable>
</deployables>
Modified: trunk/soashable-chatbar/src/main/javascript/soashable.application.js
==============================================================================
---
trunk/soashable-chatbar/src/main/javascript/soashable.application.js (original)
+++
trunk/soashable-chatbar/src/main/javascript/soashable.application.js
Mon Aug 4 22:12:25 2008
@@ -23,7 +23,7 @@
onPageLoad: function() {
;;; Application.logger.info( "onPageLoad" );
-
+
this.tabStrip = new TabStrip($('#chatbar .tabs'));
this.tabStrip.addTab( "status", "Status").status();
@@ -38,12 +38,8 @@
// FIXME none of this transport stuff should be needed if
we plan to resume.
transport: {
useKeys: true,
- clazz: Xmpp4Js.Transport.BOSH,
- endpoint: "http://bosh.soashable.com:7070/http-bind/"
- /*
- clazz: Xmpp4Js.Transport.BOSH,
- endpoint: "/http-bind/"
- */
+ clazz: Xmpp4Js.Transport.Script,
+ endpoint: "http://bosh*.soashable.com:7070/http-bind/"
},
stanzaProvider: stanzaProvider /*,
listeners: {
Modified: trunk/soashable-chatbar/src/main/javascript/soashable.init.js
==============================================================================
--- trunk/soashable-chatbar/src/main/javascript/soashable.init.js (original)
+++ trunk/soashable-chatbar/src/main/javascript/soashable.init.js Mon
Aug 4 22:12:25 2008
@@ -7,4 +7,4 @@
}
window.addEventListener( "load", function() { app.onPageLoad(); },
false );
-window.addEventListener( "onbeforeunload", function() {
app.onPageUnload(); }, false );
\ No newline at end of file
+window.addEventListener( "beforeunload", function() {
app.onPageUnload(); }, false );
\ No newline at end of file
Modified: trunk/soashable-chatbar/src/main/webapp/index.html
==============================================================================
--- trunk/soashable-chatbar/src/main/webapp/index.html (original)
+++ trunk/soashable-chatbar/src/main/webapp/index.html Mon Aug 4
22:12:25 2008
@@ -2,9 +2,6 @@
<head>
<link rel="stylesheet"
href="scripts/lib/jquery-ui/themes/flora/flora.all.css" type="text/css"
media="screen" title="Flora (Default)">
- <script type="text/javascript">var flensed_base_path = "scripts/lib/flXHR/";</script>
- <script type="text/javascript"
src="scripts/lib/flXHR/flXHR.js"> </script>
-
<script type="text/javascript" src="scripts/lib/crypto/crypto.js"></script>
<script type="text/javascript" src="scripts/lib/xml4script/dom-all.js"></script>
<script type="text/javascript" src="scripts/lib/log4js/log4js.js"></script>