فهرست منبع

Remove deprecation.

Herby Vojčík 5 سال پیش
والد
کامیت
9d13a4112c
2فایلهای تغییر یافته به همراه12 افزوده شده و 38 حذف شده
  1. 11 36
      src/Helios-Core.js
  2. 1 2
      src/Helios-Core.st

+ 11 - 36
src/Helios-Core.js

@@ -5250,7 +5250,7 @@ var parent,parentSmalltalkGlobals;
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
-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(){
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-return $core.withContext(function($ctx2) {
-//>>excludeEnd("ctx");
 $5=$recv(parent)._at_("requirejs");
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-$ctx2.sendIdx["at:"]=2;
+$ctx1.sendIdx["at:"]=2;
 //>>excludeEnd("ctx");
 $4=$recv($5)._value_("amber/boot");
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-$ctx2.sendIdx["value:"]=1;
-//>>excludeEnd("ctx");
 parentSmalltalkGlobals=$recv($4)._at_("globals");
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
-$ctx2.sendIdx["at:"]=1;
-//>>excludeEnd("ctx");
-return parentSmalltalkGlobals;
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx2) {$ctx2.fillBlock({},$ctx1,3)});
-//>>excludeEnd("ctx");
-}))._on_do_($globals.Error,(function(){
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-return $core.withContext(function($ctx2) {
-//>>excludeEnd("ctx");
-$6=$recv(parent)._at_("requirejs");
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-$ctx2.sendIdx["at:"]=3;
+$ctx1.sendIdx["at:"]=1;
 //>>excludeEnd("ctx");
-parentSmalltalkGlobals=$recv($6)._value_("amber_vm/globals");
-return parentSmalltalkGlobals;
-//>>excludeStart("ctx", pragmas.excludeDebugContexts);
-}, function($ctx2) {$ctx2.fillBlock({},$ctx1,4)});
-//>>excludeEnd("ctx");
-}));
-$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();
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["new"]=2;
 //>>excludeEnd("ctx");
-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();
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
 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"],
 //>>excludeEnd("ide");
-messageSends: ["ifNil:", "opener", "parent", "new", "on:do:", "at:", "value:", "handleLossOfEnvironmentWithParent:"]
+messageSends: ["ifNil:", "opener", "parent", "new", "at:", "value:", "handleLossOfEnvironmentWithParent:"]
 }),
 $globals.HLManager);
 

+ 1 - 2
src/Helios-Core.st

@@ -1333,8 +1333,7 @@ defaultEnvironment
 	parent := window opener ifNil: [ window parent ].
 	parent ifNil: [ ^ Environment new ].
 	
-	[ parentSmalltalkGlobals := ((parent at: 'requirejs') value: 'amber/boot') at: 'globals' ]
-	on: Error do: [ parentSmalltalkGlobals := (parent at: 'requirejs') value: 'amber_vm/globals' ].
+	parentSmalltalkGlobals := ((parent at: 'requirejs') value: 'amber/boot') at: 'globals'.
 	parentSmalltalkGlobals ifNil: [ ^ Environment new ].
 	
 	self handleLossOfEnvironmentWithParent: parent.