Forráskód Böngészése

Fix PlatformInterface initialization in non-browser env

Herbert Vojčík 10 éve
szülő
commit
f7e5b33beb
3 módosított fájl, 11 hozzáadás és 7 törlés
  1. 3 2
      js/Kernel-Objects.deploy.js
  2. 4 3
      js/Kernel-Objects.js
  3. 4 2
      st/Kernel-Objects.st

+ 3 - 2
js/Kernel-Objects.deploy.js

@@ -3396,16 +3396,17 @@ var $1,$2,$3;
 smalltalk.PlatformInterface.klass.superclass.fn.prototype._initialize.apply(_st(self), []);
 $1=$BrowserInterface();
 if(($receiver = $1) == nil || $receiver == undefined){
-candidate=$1;
+$1;
 } else {
 candidate=_st($BrowserInterface())._new();
-};
+candidate;
 $2=_st(candidate)._isAvailable();
 if(smalltalk.assert($2)){
 self._setWorker_(candidate);
 $3=self;
 return $3;
 };
+};
 return self}, function($ctx1) {$ctx1.fill(self,"initialize",{candidate:candidate},smalltalk.PlatformInterface.klass)})},
 messageSends: ["initialize", "ifNotNil:", "new", "ifTrue:", "setWorker:", "isAvailable"]}),
 smalltalk.PlatformInterface.klass);

+ 4 - 3
js/Kernel-Objects.js

@@ -4630,19 +4630,20 @@ var $1,$2,$3;
 smalltalk.PlatformInterface.klass.superclass.fn.prototype._initialize.apply(_st(self), []);
 $1=$BrowserInterface();
 if(($receiver = $1) == nil || $receiver == undefined){
-candidate=$1;
+$1;
 } else {
 candidate=_st($BrowserInterface())._new();
-};
+candidate;
 $2=_st(candidate)._isAvailable();
 if(smalltalk.assert($2)){
 self._setWorker_(candidate);
 $3=self;
 return $3;
 };
+};
 return self}, function($ctx1) {$ctx1.fill(self,"initialize",{candidate:candidate},smalltalk.PlatformInterface.klass)})},
 args: [],
-source: "initialize\x0a\x09| candidate |\x0a\x09\x0a\x09super initialize.\x0a\x09\x0a\x09candidate := BrowserInterface ifNotNil: [ BrowserInterface new ].\x0a\x09candidate isAvailable ifTrue: [ self setWorker: candidate. ^self ]",
+source: "initialize\x0a\x09| candidate |\x0a\x09\x0a\x09super initialize.\x0a\x09\x0a\x09BrowserInterface ifNotNil: [\x0a\x09\x09candidate := BrowserInterface new.\x0a\x09\x09candidate isAvailable ifTrue: [ self setWorker: candidate. ^self ]\x0a\x09]",
 messageSends: ["initialize", "ifNotNil:", "new", "ifTrue:", "setWorker:", "isAvailable"],
 referencedClasses: ["BrowserInterface"]
 }),

+ 4 - 2
st/Kernel-Objects.st

@@ -1634,8 +1634,10 @@ initialize
 	
 	super initialize.
 	
-	candidate := BrowserInterface ifNotNil: [ BrowserInterface new ].
-	candidate isAvailable ifTrue: [ self setWorker: candidate. ^self ]
+	BrowserInterface ifNotNil: [
+		candidate := BrowserInterface new.
+		candidate isAvailable ifTrue: [ self setWorker: candidate. ^self ]
+	]
 ! !
 
 Object subclass: #Point