Browse Source

Fixes commit path setting when helios runs from within another frame

Nicolas Petton 10 years ago
parent
commit
01ce582f69
4 changed files with 32 additions and 8 deletions
  1. 3 3
      src/Helios-Helpers.js
  2. 1 5
      src/Helios-Helpers.st
  3. 16 0
      src/Kernel-ImportExport.js
  4. 12 0
      src/Kernel-ImportExport.st

+ 3 - 3
src/Helios-Helpers.js

@@ -1074,12 +1074,12 @@ protocol: 'actions',
 fn: function (aString){
 var self=this;
 return smalltalk.withContext(function($ctx1) { 
-_st(_st(require)._basicAt_("config"))._value_(globals.HashedCollection._newFromPairs_(["paths",globals.HashedCollection._newFromPairs_([_st(_st(self._package())._transport())._namespace(),aString])]));
+_st(_st(self._package())._transport())._setPath_(aString);
 self._commitPackage();
 return self}, function($ctx1) {$ctx1.fill(self,"commitToPath:",{aString:aString},globals.HLPackageCommitErrorHelper)})},
 args: ["aString"],
-source: "commitToPath: aString\x0a\x09\x22We only take AMD package transport into account for now\x22\x0a\x09\x0a\x09(require basicAt: 'config') value: #{\x0a\x09\x09'paths' -> #{\x0a\x09\x09\x09self package transport namespace -> aString\x0a\x09\x09}\x0a\x09}.\x0a\x09\x0a\x09self commitPackage",
-messageSends: ["value:", "basicAt:", "namespace", "transport", "package", "commitPackage"],
+source: "commitToPath: aString\x0a\x09\x22We only take AMD package transport into account for now\x22\x0a\x09\x0a\x09self package transport setPath: aString.\x0a\x09\x0a\x09self commitPackage",
+messageSends: ["setPath:", "transport", "package", "commitPackage"],
 referencedClasses: []
 }),
 globals.HLPackageCommitErrorHelper);

+ 1 - 5
src/Helios-Helpers.st

@@ -463,11 +463,7 @@ commitPackage
 commitToPath: aString
 	"We only take AMD package transport into account for now"
 	
-	(require basicAt: 'config') value: #{
-		'paths' -> #{
-			self package transport namespace -> aString
-		}
-	}.
+	self package transport setPath: aString.
 	
 	self commitPackage
 !

+ 16 - 0
src/Kernel-ImportExport.js

@@ -2376,6 +2376,22 @@ referencedClasses: []
 }),
 globals.AmdPackageTransport);
 
+smalltalk.addMethod(
+smalltalk.method({
+selector: "setPath:",
+protocol: 'actions',
+fn: function (aString){
+var self=this;
+return smalltalk.withContext(function($ctx1) { 
+_st(_st(require)._basicAt_("config"))._value_(globals.HashedCollection._newFromPairs_(["paths",globals.HashedCollection._newFromPairs_([self._namespace(),aString])]));
+return self}, function($ctx1) {$ctx1.fill(self,"setPath:",{aString:aString},globals.AmdPackageTransport)})},
+args: ["aString"],
+source: "setPath: aString\x0a\x09\x22Set the path the the receiver's `namespace`\x22\x0a\x09\x0a\x09(require basicAt: 'config') value: #{\x0a\x09\x09'paths' -> #{\x0a\x09\x09\x09self namespace -> aString\x0a\x09\x09}\x0a\x09}.",
+messageSends: ["value:", "basicAt:", "namespace"],
+referencedClasses: []
+}),
+globals.AmdPackageTransport);
+
 smalltalk.addMethod(
 smalltalk.method({
 selector: "setupFromJson:",

+ 12 - 0
src/Kernel-ImportExport.st

@@ -864,6 +864,18 @@ namespace: aString
 	namespace := aString
 ! !
 
+!AmdPackageTransport methodsFor: 'actions'!
+
+setPath: aString
+	"Set the path the the receiver's `namespace`"
+	
+	(require basicAt: 'config') value: #{
+		'paths' -> #{
+			self namespace -> aString
+		}
+	}.
+! !
+
 !AmdPackageTransport methodsFor: 'converting'!
 
 asJSON