|
@@ -5250,7 +5250,7 @@ var parent,parentSmalltalkGlobals;
|
|
|
|
|
|
return $core.withContext(function($ctx1) {
|
|
|
|
|
|
-var $1,$2,$3,$5,$4,$6,$7,$8,$receiver;
|
|
|
+var $1,$2,$3,$5,$4,$6,$7,$receiver;
|
|
|
$1=$recv(window)._opener();
|
|
|
if(($receiver = $1) == null || $receiver.a$nil){
|
|
|
parent=$recv(window)._parent();
|
|
@@ -5267,49 +5267,24 @@ return $3;
|
|
|
} else {
|
|
|
$2;
|
|
|
}
|
|
|
-$recv((function(){
|
|
|
-
|
|
|
-return $core.withContext(function($ctx2) {
|
|
|
-
|
|
|
$5=$recv(parent)._at_("requirejs");
|
|
|
|
|
|
-$ctx2.sendIdx["at:"]=2;
|
|
|
+$ctx1.sendIdx["at:"]=2;
|
|
|
|
|
|
$4=$recv($5)._value_("amber/boot");
|
|
|
-
|
|
|
-$ctx2.sendIdx["value:"]=1;
|
|
|
-
|
|
|
parentSmalltalkGlobals=$recv($4)._at_("globals");
|
|
|
|
|
|
-$ctx2.sendIdx["at:"]=1;
|
|
|
-
|
|
|
-return parentSmalltalkGlobals;
|
|
|
-
|
|
|
-}, function($ctx2) {$ctx2.fillBlock({},$ctx1,3)});
|
|
|
-
|
|
|
-}))._on_do_($globals.Error,(function(){
|
|
|
-
|
|
|
-return $core.withContext(function($ctx2) {
|
|
|
-
|
|
|
-$6=$recv(parent)._at_("requirejs");
|
|
|
-
|
|
|
-$ctx2.sendIdx["at:"]=3;
|
|
|
+$ctx1.sendIdx["at:"]=1;
|
|
|
|
|
|
-parentSmalltalkGlobals=$recv($6)._value_("amber_vm/globals");
|
|
|
-return parentSmalltalkGlobals;
|
|
|
-
|
|
|
-}, function($ctx2) {$ctx2.fillBlock({},$ctx1,4)});
|
|
|
-
|
|
|
-}));
|
|
|
-$7=parentSmalltalkGlobals;
|
|
|
-if(($receiver = $7) == null || $receiver.a$nil){
|
|
|
-$8=$recv($globals.Environment)._new();
|
|
|
+$6=parentSmalltalkGlobals;
|
|
|
+if(($receiver = $6) == null || $receiver.a$nil){
|
|
|
+$7=$recv($globals.Environment)._new();
|
|
|
|
|
|
$ctx1.sendIdx["new"]=2;
|
|
|
|
|
|
-return $8;
|
|
|
+return $7;
|
|
|
} else {
|
|
|
-$7;
|
|
|
+$6;
|
|
|
}
|
|
|
$self._handleLossOfEnvironmentWithParent_(parent);
|
|
|
return $recv($recv(parentSmalltalkGlobals)._at_("Environment"))._new();
|
|
@@ -5319,10 +5294,10 @@ return $recv($recv(parentSmalltalkGlobals)._at_("Environment"))._new();
|
|
|
},
|
|
|
|
|
|
args: [],
|
|
|
-source: "defaultEnvironment\x0a\x09\x22If helios is loaded from within a frame, answer the parent window environment\x22\x0a\x09\x0a\x09| parent parentSmalltalkGlobals |\x0a\x09\x0a\x09parent := window opener ifNil: [ window parent ].\x0a\x09parent ifNil: [ ^ Environment new ].\x0a\x09\x0a\x09[ parentSmalltalkGlobals := ((parent at: 'requirejs') value: 'amber/boot') at: 'globals' ]\x0a\x09on: Error do: [ parentSmalltalkGlobals := (parent at: 'requirejs') value: 'amber_vm/globals' ].\x0a\x09parentSmalltalkGlobals ifNil: [ ^ Environment new ].\x0a\x09\x0a\x09self handleLossOfEnvironmentWithParent: parent.\x0a\x09\x0a\x09^ (parentSmalltalkGlobals at: 'Environment') new",
|
|
|
-referencedClasses: ["Environment", "Error"],
|
|
|
+source: "defaultEnvironment\x0a\x09\x22If helios is loaded from within a frame, answer the parent window environment\x22\x0a\x09\x0a\x09| parent parentSmalltalkGlobals |\x0a\x09\x0a\x09parent := window opener ifNil: [ window parent ].\x0a\x09parent ifNil: [ ^ Environment new ].\x0a\x09\x0a\x09parentSmalltalkGlobals := ((parent at: 'requirejs') value: 'amber/boot') at: 'globals'.\x0a\x09parentSmalltalkGlobals ifNil: [ ^ Environment new ].\x0a\x09\x0a\x09self handleLossOfEnvironmentWithParent: parent.\x0a\x09\x0a\x09^ (parentSmalltalkGlobals at: 'Environment') new",
|
|
|
+referencedClasses: ["Environment"],
|
|
|
|
|
|
-messageSends: ["ifNil:", "opener", "parent", "new", "on:do:", "at:", "value:", "handleLossOfEnvironmentWithParent:"]
|
|
|
+messageSends: ["ifNil:", "opener", "parent", "new", "at:", "value:", "handleLossOfEnvironmentWithParent:"]
|
|
|
}),
|
|
|
$globals.HLManager);
|
|
|
|