Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files
Merge branch 'issue/52' into develop
  • Loading branch information
pmuellr committed May 3, 2011
2 parents 1ed3bdc + 3a7e853 commit 358a20d7e3ee257da372b1ee234409746171e509
Showing 12 changed files with 13 additions and 13 deletions.
@@ -67,7 +67,7 @@ def createIndexFile(iFileName, oFileName, moduleDir):
newLines.append("<!-- ========== weinre additions: starting ========== -->\n")
newLines.append('<link rel="stylesheet" type="text/css" href="weinre/client.css">\n')
newLines.append('<script type="text/javascript" src="../interfaces/all-json-idls-min.js"></script>\n')
newLines.append('<script type="text/javascript">require("weinre/client/Client").main()</script>\n')
newLines.append('<script type="text/javascript">require("weinre/client/Client").getClass().main()</script>\n')
newLines.append("<!-- ========== weinre additions: done ========== -->\n")
newLines.append(line)

@@ -36,7 +36,7 @@ def main():
properties.sort()

jsonString = json.dumps(properties, indent=4)
jsString = 'require("weinre/common/Weinre").addCSSProperties(%s)' % jsonString
jsString = 'require("weinre/common/Weinre").getClass().addCSSProperties(%s)' % jsonString

oFile = open(oFileName, "w")
oFile.write(jsString)
@@ -82,7 +82,7 @@ def writeMergedFile(oFileName, scripts, scriptNames, srcs):
lines.append(";")
lines.append("")

lines.append("require('weinre/target/Target').main()")
lines.append("require('weinre/target/Target').getClass().main()")
lines.append("})();")
targetScript = "\n".join(lines)

@@ -52,7 +52,7 @@ def main():
else:
jsonString = json.dumps(result, indent=4)

jsString = "require('weinre/common/Weinre').addIDLs(%s)" % jsonString
jsString = "require('weinre/common/Weinre').getClass().addIDLs(%s)" % jsonString

oFile = open(oFileName, "w")
oFile.write(jsString)
@@ -6,6 +6,6 @@
*/

(function() {
var InspectorBackendImpl = require("weinre/client/InspectorBackendImpl")
var InspectorBackendImpl = require("weinre/client/InspectorBackendImpl").getClass()
window.InspectorBackend = new InspectorBackendImpl()
})()
@@ -6,6 +6,6 @@
*/

(function() {
var InspectorFrontEndHostImpl = require("weinre/client/InspectorFrontendHostImpl")
var InspectorFrontEndHostImpl = require("weinre/client/InspectorFrontendHostImpl").getClass()
window.InspectorFrontendHost = new InspectorFrontEndHostImpl()
})()
@@ -14,7 +14,7 @@
<script src="/target/target-script-min.js"></script>

<script type="text/javascript">
require("weinre/common/Weinre").showNotImplemented()
require("weinre/common/Weinre").getClass().showNotImplemented()
</script>

</head>
@@ -46,8 +46,8 @@
<script src="/interfaces/all-json-idls-min.js"></script>

<script type="text/javascript">
require("weinre/common/Weinre").showNotImplemented()
require('weinre/target/Target').main()
require("weinre/common/Weinre").getClass().showNotImplemented()
require('weinre/target/Target').getClass().main()
</script>
</head>

@@ -14,7 +14,7 @@
<script src="/target/target-script.js"></script>

<script type="text/javascript">
require("weinre/common/Weinre").showNotImplemented()
require("weinre/common/Weinre").getClass().showNotImplemented()
</script>
</head>

@@ -22,7 +22,7 @@ var e_showJava

var NativeTypes = "int any number boolean string void".split(" ")

var IDLTools = require("weinre/common/IDLTools")
var IDLTools = require("weinre/common/IDLTools").getClass()

if (!window.localStorage) {
window.localStorage = {
@@ -62,7 +62,7 @@ static method invoke(index, args)
catch (e) {
var funcName = func.name
if (!funcName) funcName = "<unnamed>"
require("./Weinre").logError(arguments.callee.signature + " exception invoking callback: " + funcName + "(" + args.join(",") + "): " + e)
require("./Weinre").getClass().logError(arguments.callee.signature + " exception invoking callback: " + funcName + "(" + args.join(",") + "): " + e)
}
finally {
Callback.deregister(index)
@@ -84,7 +84,7 @@ static method validateAgainstIDL(klass, interfaceName)
if (!errors.length) return

errors.forEach(function(error){
require("./Weinre").logError(error)
require("./Weinre").getClass().logError(error)
})

//-----------------------------------------------------------------------------

0 comments on commit 358a20d

Please sign in to comment.