Helios: Fixed HLManager >> defaultEnvironment

js/Helios-Core.deploy.js

@@ -1202,11 +1202,12 @@ smalltalk.method({
 selector: "defaultEnvironment",
 fn: function (){
 var self=this;
+function $Environment(){return smalltalk.Environment||(typeof Environment=="undefined"?nil:Environment)}
 return smalltalk.withContext(function($ctx1) { 
 var $1,$2,$3;
 $1=_st(window)._parent();
 if(($receiver = $1) == nil || $receiver == undefined){
-$2=_st(self["@environment"])._new();
+$2=_st($Environment())._new();
 return $2;
 } else {
 $1;

js/Helios-Core.js

@@ -1578,11 +1578,12 @@ selector: "defaultEnvironment",
 category: 'defaults',
 fn: function (){
 var self=this;
+function $Environment(){return smalltalk.Environment||(typeof Environment=="undefined"?nil:Environment)}
 return smalltalk.withContext(function($ctx1) { 
 var $1,$2,$3;
 $1=_st(window)._parent();
 if(($receiver = $1) == nil || $receiver == undefined){
-$2=_st(self["@environment"])._new();
+$2=_st($Environment())._new();
 return $2;
 } else {
 $1;
@@ -1591,9 +1592,9 @@ $3=_st(_st(_st(_st(window)._parent())._at_("smalltalk"))._at_("Environment"))._n
 return $3;
 }, function($ctx1) {$ctx1.fill(self,"defaultEnvironment",{},smalltalk.HLManager)})},
 args: [],
-source: "defaultEnvironment\x0a\x09\x22If helios is loaded from within a frame, answer the parent window environment\x22\x0a\x09\x0a\x09window parent ifNil: [ ^ environment new ].\x0a\x09\x0a\x09^ ((window parent at: 'smalltalk')\x0a\x09\x09at: #Environment) new",
+source: "defaultEnvironment\x0a\x09\x22If helios is loaded from within a frame, answer the parent window environment\x22\x0a\x09\x0a\x09window parent ifNil: [ ^ Environment new ].\x0a\x09\x0a\x09^ ((window parent at: 'smalltalk')\x0a\x09\x09at: 'Environment') new",
 messageSends: ["ifNil:", "new", "parent", "at:"],
-referencedClasses: []
+referencedClasses: ["Environment"]
 }),
 smalltalk.HLManager);
 

st/Helios-Core.st

@@ -573,10 +573,10 @@ removeTab: aTab
 defaultEnvironment
 	"If helios is loaded from within a frame, answer the parent window environment"
 	
-	window parent ifNil: [ ^ environment new ].
+	window parent ifNil: [ ^ Environment new ].
 	
 	^ ((window parent at: 'smalltalk')
-		at: #Environment) new
+		at: 'Environment') new
 ! !
 
 !HLManager methodsFor: 'initialization'!