works with recent scooj release. closes #52
diff --git a/weinre.build/scripts/build-client-html.py b/weinre.build/scripts/build-client-html.py
index fb32e7d..690572a 100644
--- a/weinre.build/scripts/build-client-html.py
+++ b/weinre.build/scripts/build-client-html.py
@@ -67,7 +67,7 @@
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)
diff --git a/weinre.build/scripts/build-css-properties.py b/weinre.build/scripts/build-css-properties.py
index f4e73e5..596e461 100644
--- a/weinre.build/scripts/build-css-properties.py
+++ b/weinre.build/scripts/build-css-properties.py
@@ -36,7 +36,7 @@
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)
diff --git a/weinre.build/scripts/build-target-scripts.py b/weinre.build/scripts/build-target-scripts.py
index 6738363..c74c2e7 100644
--- a/weinre.build/scripts/build-target-scripts.py
+++ b/weinre.build/scripts/build-target-scripts.py
@@ -82,7 +82,7 @@
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)
diff --git a/weinre.build/scripts/collect-all-json-idl.py b/weinre.build/scripts/collect-all-json-idl.py
index dc9467b..c9c6281 100644
--- a/weinre.build/scripts/collect-all-json-idl.py
+++ b/weinre.build/scripts/collect-all-json-idl.py
@@ -52,7 +52,7 @@
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)
diff --git a/weinre.web/client/InspectorBackendStub.js b/weinre.web/client/InspectorBackendStub.js
index 8b6532a..091c2a4 100644
--- a/weinre.web/client/InspectorBackendStub.js
+++ b/weinre.web/client/InspectorBackendStub.js
@@ -6,6 +6,6 @@
*/
(function() {
- var InspectorBackendImpl = require("weinre/client/InspectorBackendImpl")
+ var InspectorBackendImpl = require("weinre/client/InspectorBackendImpl").getClass()
window.InspectorBackend = new InspectorBackendImpl()
})()
diff --git a/weinre.web/client/InspectorFrontendHostStub.js b/weinre.web/client/InspectorFrontendHostStub.js
index e409743..d964918 100644
--- a/weinre.web/client/InspectorFrontendHostStub.js
+++ b/weinre.web/client/InspectorFrontendHostStub.js
@@ -6,6 +6,6 @@
*/
(function() {
- var InspectorFrontEndHostImpl = require("weinre/client/InspectorFrontendHostImpl")
+ var InspectorFrontEndHostImpl = require("weinre/client/InspectorFrontendHostImpl").getClass()
window.InspectorFrontendHost = new InspectorFrontEndHostImpl()
})()
diff --git a/weinre.web/demo/weinre-demo-min.html b/weinre.web/demo/weinre-demo-min.html
index 65e393b..95532ee 100644
--- a/weinre.web/demo/weinre-demo-min.html
+++ b/weinre.web/demo/weinre-demo-min.html
@@ -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>
diff --git a/weinre.web/demo/weinre-demo-pieces.html b/weinre.web/demo/weinre-demo-pieces.html
index c7473b5..f450475 100644
--- a/weinre.web/demo/weinre-demo-pieces.html
+++ b/weinre.web/demo/weinre-demo-pieces.html
@@ -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>
diff --git a/weinre.web/demo/weinre-demo.html b/weinre.web/demo/weinre-demo.html
index 6a57672..5c93023 100644
--- a/weinre.web/demo/weinre-demo.html
+++ b/weinre.web/demo/weinre-demo.html
@@ -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>
diff --git a/weinre.web/interfaces/interfaces.js b/weinre.web/interfaces/interfaces.js
index 206a562..08d60fe 100644
--- a/weinre.web/interfaces/interfaces.js
+++ b/weinre.web/interfaces/interfaces.js
@@ -22,7 +22,7 @@
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 = {
diff --git a/weinre.web/modules/weinre/common/Callback.scoop b/weinre.web/modules/weinre/common/Callback.scoop
index 92ded87..b2edba1 100644
--- a/weinre.web/modules/weinre/common/Callback.scoop
+++ b/weinre.web/modules/weinre/common/Callback.scoop
@@ -62,7 +62,7 @@
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)
diff --git a/weinre.web/modules/weinre/common/IDLTools.scoop b/weinre.web/modules/weinre/common/IDLTools.scoop
index 6e6f856..9dcbe7a 100644
--- a/weinre.web/modules/weinre/common/IDLTools.scoop
+++ b/weinre.web/modules/weinre/common/IDLTools.scoop
@@ -84,7 +84,7 @@
if (!errors.length) return
errors.forEach(function(error){
- require("./Weinre").logError(error)
+ require("./Weinre").getClass().logError(error)
})
//-----------------------------------------------------------------------------
