Author: ptw
Date: 2008-01-06 11:58:37 -0800 (Sun, 06 Jan 2008)
New Revision: 7747
Modified:
openlaszlo/branches/wafflecone/
openlaszlo/branches/wafflecone/WEB-INF/lps/lfc/debugger/platform/dhtml/kernel.js
Log:
Change 20080106-ptw-U by [EMAIL PROTECTED] on 2008-01-06 14:50:39 EST
in /Users/ptw/OpenLaszlo/wafflecone
for http://svn.openlaszlo.org/openlaszlo/branches/wafflecone
Summary: Merged revisions 7620 via svnmerge from
http://svn.openlaszlo.org/openlaszlo/trunk
QA Reviewer: mamye (pending)
Details:
.......
r7620 | ptw | 2007-12-19 15:15:19 -0500 (Wed, 19 Dec 2007) | 19 lines
Change 20071218-ptw-f by [EMAIL PROTECTED] on 2007-12-18 16:53:38 EST
in /Users/ptw/OpenLaszlo/ringding-2
for http://svn.openlaszlo.org/openlaszlo/trunk
Summary: Deal with rhino
Bugs Fixed:
LPP-5288: 'failing lztest-node-initsequence and lztest-node-options'
Technical Reviewer: [EMAIL PROTECTED] (message://<[EMAIL PROTECTED]>)
QA Reviewer: mamye (pending)
Details:
Ignore errors setting up debug console in rhino
Tests:
ant runlztest
.......
Tests:
megatest sill pass again
Property changes on: openlaszlo/branches/wafflecone
___________________________________________________________________
Name: svnmerge-integrated
-
/openlaszlo/branches/legals:1-5746,5748-5756,5758-5770,5772-5819,5821-5860,5862-5890,5892-6065,6068-6177,6179-6228,6230-6236,6241-6266
/openlaszlo/trunk:1-3892,3894-3952,3954-4393,4395-4461,4463-4467,4469-4471,4473-5085,5087-5171,5173-5203,5205-5209,5211-5331,5333-5334,6484-6485,6487,6490-6492,6494-6495,6497,6500-6502,6504-6505,6507-6520,6531-6532,6534-6538,6540-6547,6549,6551-6558,6560-6567,6569-6581,6583-6586,6588,6590-6607,6610-6611,6613-6622,6624-6629,6632-6636,6638-6639,6641-6642,6646-6648,6653,6656-6663,6665-6669,6671-6683,6685-6686,6688-6706,6708-6715,7237,7489-7491,7494,7497-7498,7500-7521,7523-7527,7529,7531-7538,7540-7545,7547-7549,7551-7560,7563-7570,7572-7575,7717
+
/openlaszlo/branches/legals:1-5746,5748-5756,5758-5770,5772-5819,5821-5860,5862-5890,5892-6065,6068-6177,6179-6228,6230-6236,6241-6266
/openlaszlo/trunk:1-3892,3894-3952,3954-4393,4395-4461,4463-4467,4469-4471,4473-5085,5087-5171,5173-5203,5205-5209,5211-5331,5333-5334,6484-6485,6487,6490-6492,6494-6495,6497,6500-6502,6504-6505,6507-6520,6531-6532,6534-6538,6540-6547,6549,6551-6558,6560-6567,6569-6581,6583-6586,6588,6590-6607,6610-6611,6613-6622,6624-6629,6632-6636,6638-6639,6641-6642,6646-6648,6653,6656-6663,6665-6669,6671-6683,6685-6686,6688-6706,6708-6715,7237,7489-7491,7494,7497-7498,7500-7521,7523-7527,7529,7531-7538,7540-7545,7547-7549,7551-7560,7563-7570,7572-7575,7620,7717
Modified:
openlaszlo/branches/wafflecone/WEB-INF/lps/lfc/debugger/platform/dhtml/kernel.js
===================================================================
---
openlaszlo/branches/wafflecone/WEB-INF/lps/lfc/debugger/platform/dhtml/kernel.js
2008-01-06 18:56:21 UTC (rev 7746)
+++
openlaszlo/branches/wafflecone/WEB-INF/lps/lfc/debugger/platform/dhtml/kernel.js
2008-01-06 19:58:37 UTC (rev 7747)
@@ -23,8 +23,12 @@
*/
Debug.makeDebugWindow = function () {
// The application and debugger are sibling iframes in the
- // embedding.
- this.DebugWindow = window.parent.frames['LaszloDebugger'];
+ // dhtml embedding.
+ try {
+ this.DebugWindow = window.parent.frames['LaszloDebugger'];
+ } catch (e) {
+ // But not in Rhino
+ };
// Name all global singletons
var module = $modules.lz;
_______________________________________________
Laszlo-checkins mailing list
[email protected]
http://www.openlaszlo.org/mailman/listinfo/laszlo-checkins
