Author: reebalazs
Date: Sun Dec 30 14:49:34 2007
New Revision: 50201
Modified:
kukit/kukit.js/branch/finish-closures/kukit/errors.js
kukit/kukit.js/branch/finish-closures/kukit/utils.js
kukit/kukit.js/branch/finish-closures/tests/runner.html
kukit/kukit.js/branch/finish-closures/tests/runtests.sh
Log:
Merge in changes from trunk -r48593:50168
the essential fix that was missing was a fix on the
logging improvements, that disabled ecma tests
run from console
Iow: this fixes exmatests run via runtests.sh
Modified: kukit/kukit.js/branch/finish-closures/kukit/errors.js
==============================================================================
--- kukit/kukit.js/branch/finish-closures/kukit/errors.js (original)
+++ kukit/kukit.js/branch/finish-closures/kukit/errors.js Sun Dec 30
14:49:34 2007
@@ -55,9 +55,10 @@
*/
/*
-* class _ErrorAnnotation
+* class ErrorAnnotation
*/
-var _ErrorAnnotation = function() {
+
+var ErrorAnnotation = function() {
this.constructError = function(e, name, message, kw) {
;;; if (typeof(kw) == "undefined") {
@@ -104,7 +105,7 @@
};
var setErrorInfo = function(e, name, message, kw) {
- return new _ErrorAnnotation().constructError(e, name, message, kw);
+ return new ErrorAnnotation().constructError(e, name, message, kw);
};
/* Protects a function */
Modified: kukit/kukit.js/branch/finish-closures/kukit/utils.js
==============================================================================
--- kukit/kukit.js/branch/finish-closures/kukit/utils.js (original)
+++ kukit/kukit.js/branch/finish-closures/kukit/utils.js Sun Dec 30
14:49:34 2007
@@ -96,7 +96,17 @@
;;; // set default level
;;; this.loglevel = 0;
;;; // read the cookie
-;;; var cookie = kukit.readCookie(kukit._COOKIE_LOGLEVEL);
+;;; /// (ignore if we run from test)
+;;; var cookie;
+;;; try {
+;;; // in test, document would throw ReferenceError
+;;; var _dummy = document;
+;;; } catch(e) {
+;;; var _dummy;
+;;; }
+;;; if (_dummy && typeof(document.cookie) != 'undefined') {
+;;; cookie = kukit.readCookie(kukit._COOKIE_LOGLEVEL);
+;;; }
;;; if (cookie) {
;;; // decode it to a numeric level
;;; cookie = cookie.toLowerCase();
Modified: kukit/kukit.js/branch/finish-closures/tests/runner.html
==============================================================================
--- kukit/kukit.js/branch/finish-closures/tests/runner.html (original)
+++ kukit/kukit.js/branch/finish-closures/tests/runner.html Sun Dec 30
14:49:34 2007
@@ -39,18 +39,18 @@
<script tal:define="kss_devel_mode nocall:context/@@kss_devel_mode |
nothing"
tal:condition="python: not kss_devel_mode or
kss_devel_mode.isoff()" type="text/javascript"
tal:attributes="src
string:${context/@@absolute_url}/++resource++kukit.js;"
- src="../kukit/utils.js">
+ src="../kukit.js">
</script>
<script tal:define="kss_devel_mode nocall:context/@@kss_devel_mode |
nothing"
tal:condition="python: kss_devel_mode and
kss_devel_mode.ison()" type="text/javascript"
tal:attributes="src
string:${context/@@absolute_url}/++resource++kukit-devel.js;"
- src="../kukit/errors.js">
+ src="../kukit/utils.js">
</script>
- <script type="text/javascript" src="../kukit/oper.js"
+ <script type="text/javascript" src="../kukit/errors.js"
tal:replace="nothing"> </script>
- <script type="text/javascript" src="../kukit/kukit.js"
+ <script type="text/javascript" src="../kukit/oper.js"
tal:replace="nothing"> </script>
<script type="text/javascript" src="../kukit/tokenizer.js"
tal:replace="nothing"> </script>
Modified: kukit/kukit.js/branch/finish-closures/tests/runtests.sh
==============================================================================
--- kukit/kukit.js/branch/finish-closures/tests/runtests.sh (original)
+++ kukit/kukit.js/branch/finish-closures/tests/runtests.sh Sun Dec 30
14:49:34 2007
@@ -3,10 +3,10 @@
-f unittestUtilities.js \
-f browserstub.js \
-f ../3rd_party/base2-dom-fp.js \
+ -f ../kukit/kukit.js \
-f ../kukit/utils.js \
-f ../kukit/errors.js \
-f ../kukit/oper.js \
- -f ../kukit/kukit.js \
-f ../kukit/tokenizer.js \
-f ../kukit/providerreg.js \
-f ../kukit/resourcedata.js \
_______________________________________________
Kukit-checkins mailing list
[email protected]
http://codespeak.net/mailman/listinfo/kukit-checkins
