Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files
Merge branch 'issue/29' into develop
  • Loading branch information
pmuellr committed Feb 28, 2011
2 parents b635d8d + 04f0a03 commit 04bd227b3cd4b1b584e20b14e43654e86fe0b044
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
@@ -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

@@ -114,7 +114,7 @@ method cb_getTargets(targets)
var newestTargetId = this.getNewestTargetId()
if (!newestTargetId) return

Weinre.WeinreClientCommands.connectTarget(Weinre.clientId, newestTargetId)
Weinre.WeinreClientCommands.connectTarget(Weinre.connectorId, newestTargetId)


//-----------------------------------------------------------------------------
@@ -20,7 +20,7 @@ init

//-----------------------------------------------------------------------------
static method setConnectorId(connectorId)
ConnectorId = connectorId
ConnectorId = "" + connectorId

//-----------------------------------------------------------------------------
static method register(callback)
@@ -64,7 +64,7 @@ method _handleXhrResponseGetChannel(xhr)
return
}

Weinre.connectorId = object.channel
Weinre.connectorId = "" + object.channel

this._urlChannel = this._url + "/" + object.channel
this.readyState = WebSocketXhr.OPEN

0 comments on commit 04bd227

Please sign in to comment.