Fixes autoconnect issue. Closes #29
- main problem was that clientId was not set when the autoconnect
logic kicked in, in the situation described in the issue
- changed to use connectorId, which is set at this point
- connectorId was numeric at some points, needed to make a string
- drive by fix for debug.sh to change on the cp dirs to point to the
live output directory
diff --git a/weinre.build/debug.sh b/weinre.build/debug.sh
index b97257d..c63b146 100755
--- a/weinre.build/debug.sh
+++ b/weinre.build/debug.sh
@@ -1,7 +1,7 @@
#!/bin/sh
CWD=`dirname $0`
WEINRE=`dirname $CWD`
-CP=$WEINRE/weinre.server/bin:$WEINRE/weinre.build/bin:$WEINRE/weinre.build/vendor/cli/commons-cli.jar:$WEINRE/weinre.build/vendor/jetty/jetty.jar:$WEINRE/weinre.build/vendor/json4j/json4j.jar:$WEINRE/weinre.build/vendor/jetty/servlet-api.jar
+CP=$WEINRE/weinre.server/bin:$WEINRE/weinre.build/out:$WEINRE/weinre.build/vendor/cli/commons-cli.jar:$WEINRE/weinre.build/vendor/jetty/jetty.jar:$WEINRE/weinre.build/vendor/json4j/json4j.jar:$WEINRE/weinre.build/vendor/jetty/servlet-api.jar
PORT=8096
DEBUG=jdwp=transport=dt_socket,server=y,suspend=n,address=localhost:$PORT
diff --git a/weinre.web/modules/weinre/client/RemotePanel.scoop b/weinre.web/modules/weinre/client/RemotePanel.scoop
index b316f0f..2c612ef 100644
--- a/weinre.web/modules/weinre/client/RemotePanel.scoop
+++ b/weinre.web/modules/weinre/client/RemotePanel.scoop
@@ -114,7 +114,7 @@
var newestTargetId = this.getNewestTargetId()
if (!newestTargetId) return
- Weinre.WeinreClientCommands.connectTarget(Weinre.clientId, newestTargetId)
+ Weinre.WeinreClientCommands.connectTarget(Weinre.connectorId, newestTargetId)
//-----------------------------------------------------------------------------
diff --git a/weinre.web/modules/weinre/common/Callback.scoop b/weinre.web/modules/weinre/common/Callback.scoop
index 2728a90..349bfdb 100644
--- a/weinre.web/modules/weinre/common/Callback.scoop
+++ b/weinre.web/modules/weinre/common/Callback.scoop
@@ -20,7 +20,7 @@
//-----------------------------------------------------------------------------
static method setConnectorId(connectorId)
- ConnectorId = connectorId
+ ConnectorId = "" + connectorId
//-----------------------------------------------------------------------------
static method register(callback)
diff --git a/weinre.web/modules/weinre/common/WebSocketXhr.scoop b/weinre.web/modules/weinre/common/WebSocketXhr.scoop
index ce6b6c3..f017577 100644
--- a/weinre.web/modules/weinre/common/WebSocketXhr.scoop
+++ b/weinre.web/modules/weinre/common/WebSocketXhr.scoop
@@ -64,7 +64,7 @@
return
}
- Weinre.connectorId = object.channel
+ Weinre.connectorId = "" + object.channel
this._urlChannel = this._url + "/" + object.channel
this.readyState = WebSocketXhr.OPEN
