Index: sdk/lib/_internal/compiler/implementation/lib/isolate_helper.dart |
=================================================================== |
--- sdk/lib/_internal/compiler/implementation/lib/isolate_helper.dart (revision 17128) |
+++ sdk/lib/_internal/compiler/implementation/lib/isolate_helper.dart (working copy) |
@@ -385,10 +385,10 @@ |
const String _SPAWNED_SIGNAL = "spawned"; |
var globalThis = IsolateNatives.computeGlobalThis(); |
-var globalWindow = JS('', "#['window']", globalThis); |
-var globalWorker = JS('', "#['Worker']", globalThis); |
+var globalWindow = JS('', "#.window", globalThis); |
+var globalWorker = JS('', "#.Worker", globalThis); |
bool globalPostMessageDefined = |
- JS('', "#['postMessage'] !== (void 0)", globalThis); |
+ JS('', "#.postMessage !== (void 0)", globalThis); |
class IsolateNatives { |
@@ -406,9 +406,11 @@ |
// executed. The last one is the currently running script. |
for (var script in scripts) { |
var src = JS('String|Null', '# && #.src', script, script); |
+ // Filter out the test controller script, and the Dart |
+ // bootstrap script. |
if (src != null |
&& !src.endsWith('test_controller.js') |
- && !new RegExp('client.dart\.js').hasMatch(src)) { |
ngeoffray
2013/01/16 10:33:38
The path has now changed. To make things simple, I
|
+ && !src.endsWith('dart.js')) { |
return src; |
} |
} |