Author: ptw
Date: 2007-06-13 12:36:42 -0700 (Wed, 13 Jun 2007)
New Revision: 5402
Modified:
openlaszlo/branches/legals/WEB-INF/lps/lfc/debugger/platform/dhtml/LzDebug.js
openlaszlo/branches/legals/WEB-INF/lps/lfc/debugger/platform/swf/LzDebug.as
openlaszlo/branches/legals/WEB-INF/lps/server/src/org/openlaszlo/compiler/FileResolver.java
Log:
Change 20070613-ptw-F by [EMAIL PROTECTED] on 2007-06-13 15:32:17 EDT
in /Users/ptw/OpenLaszlo/legals
for http://svn.openlaszlo.org/openlaszlo/branches/legals
Summary: Random tweaks
Details:
Tweak debug function name printing to be more legible. Fix
default for dhtmlResourceFlag (accidentally checked in my test
case).
Tests:
IWFM
Modified:
openlaszlo/branches/legals/WEB-INF/lps/lfc/debugger/platform/dhtml/LzDebug.js
===================================================================
---
openlaszlo/branches/legals/WEB-INF/lps/lfc/debugger/platform/dhtml/LzDebug.js
2007-06-13 19:02:31 UTC (rev 5401)
+++
openlaszlo/branches/legals/WEB-INF/lps/lfc/debugger/platform/dhtml/LzDebug.js
2007-06-13 19:36:42 UTC (rev 5402)
@@ -93,7 +93,7 @@
/**
* @access private
*/
-Debug.functionName = function (fn, isGlobal) {
+Debug.functionName = function (fn, mustBeUnique) {
if (fn && (fn instanceof Function)) {
// tip o' the pin to osteele.com
var fstring = fn.toString();
@@ -104,7 +104,7 @@
var n = fn._dbg_name;
}
if (n) {
- if ((! isGlobal) || (fn === global[n])) {
+ if ((! mustBeUnique) || (fn === global[n])) {
return n;
}
}
@@ -211,11 +211,11 @@
// inspected
this.IDForObject(thing, true);
} else if ((t == 'function') || (thing instanceof Function)) {
- var n = this.functionName(thing, pretty);
+ var n = this.functionName(thing, unique);
if (n != null) {
s = n;
} else {
- // not a global function, don't be pretty
+ // not a global function, can't be pretty if you want unique
pretty = (! unique);
s = this.functionName(thing, false);
if (s == null) { s = ''; }
Modified:
openlaszlo/branches/legals/WEB-INF/lps/lfc/debugger/platform/swf/LzDebug.as
===================================================================
--- openlaszlo/branches/legals/WEB-INF/lps/lfc/debugger/platform/swf/LzDebug.as
2007-06-13 19:02:31 UTC (rev 5401)
+++ openlaszlo/branches/legals/WEB-INF/lps/lfc/debugger/platform/swf/LzDebug.as
2007-06-13 19:36:42 UTC (rev 5402)
@@ -215,11 +215,11 @@
/**
* @access private
*/
-Debug.functionName = function (fn, isGlobal) {
+Debug.functionName = function (fn, mustBeUnique) {
if (fn instanceof Function) {
if (fn.hasOwnProperty('_dbg_name') || fn.hasOwnProperty('name')) {
var n = fn.hasOwnProperty('_dbg_name') ? fn._dbg_name : fn.name;
- if ((! isGlobal) || (fn === eval(n))) {
+ if ((! mustBeUnique) || (fn === eval(n))) {
return n;
}
}
@@ -313,13 +313,13 @@
// inspected
this.IDForObject(thing, true);
} else if (t == 'function') {
- var n = this.functionName(thing, pretty);
+ var n = this.functionName(thing, unique);
if (n != null) {
s = n;
} else {
- // not a global function, don't be pretty
+ // not a global function, can't be pretty if you want unique
pretty = (! unique);
- s = this.functionName(thing, pretty);
+ s = this.functionName(thing, false);
if (s == null) { s = ''; }
}
} else if ((t == 'object') || (thing instanceof Object)) {
Modified:
openlaszlo/branches/legals/WEB-INF/lps/server/src/org/openlaszlo/compiler/FileResolver.java
===================================================================
---
openlaszlo/branches/legals/WEB-INF/lps/server/src/org/openlaszlo/compiler/FileResolver.java
2007-06-13 19:02:31 UTC (rev 5401)
+++
openlaszlo/branches/legals/WEB-INF/lps/server/src/org/openlaszlo/compiler/FileResolver.java
2007-06-13 19:36:42 UTC (rev 5402)
@@ -133,7 +133,7 @@
// Determine whether to substitue resource files initially just swf to
png
String pnext = FileUtils.getExtension(pathname);
- boolean dhtmlResourceFlag = true;
+ boolean dhtmlResourceFlag = false;
if (env != null) {
dhtmlResourceFlag = env.isDHTML();
}
_______________________________________________
Laszlo-checkins mailing list
[email protected]
http://www.openlaszlo.org/mailman/listinfo/laszlo-checkins
