Browse Source

Deprecating old load API directly on Package class.

All jQuery uses are in Canvas package
or go through PackageInterface >> ajax:
Herbert Vojčík 11 years ago
parent
commit
66b588debc
3 changed files with 24 additions and 14 deletions
  1. 7 4
      js/Kernel-Objects.deploy.js
  2. 10 7
      js/Kernel-Objects.js
  3. 7 3
      st/Kernel-Objects.st

+ 7 - 4
js/Kernel-Objects.deploy.js

@@ -3302,9 +3302,10 @@ selector: "load:",
 fn: function (aPackageName){
 var self=this;
 return smalltalk.withContext(function($ctx1) { 
+self._deprecatedAPI();
 self._load_prefix_(aPackageName,_st(self._defaultCommitPathJs()).__comma("/"));
 return self}, function($ctx1) {$ctx1.fill(self,"load:",{aPackageName:aPackageName},smalltalk.Package.klass)})},
-messageSends: ["load:prefix:", ",", "defaultCommitPathJs"]}),
+messageSends: ["deprecatedAPI", "load:prefix:", ",", "defaultCommitPathJs"]}),
 smalltalk.Package.klass);
 
 smalltalk.addMethod(
@@ -3313,13 +3314,15 @@ selector: "load:prefix:",
 fn: function (aPackageName,aPrefix){
 var self=this;
 function $Package(){return smalltalk.Package||(typeof Package=="undefined"?nil:Package)}
+function $PlatformInterface(){return smalltalk.PlatformInterface||(typeof PlatformInterface=="undefined"?nil:PlatformInterface)}
 return smalltalk.withContext(function($ctx1) { 
-_st(jQuery)._getScript_onSuccess_(_st(_st(aPrefix).__comma(aPackageName)).__comma(".js"),(function(){
+self._deprecatedAPI();
+_st($PlatformInterface())._ajax_(smalltalk.HashedCollection._from_(["url".__minus_gt(_st(_st(aPrefix).__comma(aPackageName)).__comma(".js")),"dataType".__minus_gt("script"),"success".__minus_gt((function(){
 return smalltalk.withContext(function($ctx2) {
 return _st(_st($Package())._named_(aPackageName))._setupClasses();
-}, function($ctx2) {$ctx2.fillBlock({},$ctx1)})}));
+}, function($ctx2) {$ctx2.fillBlock({},$ctx1)})}))]));
 return self}, function($ctx1) {$ctx1.fill(self,"load:prefix:",{aPackageName:aPackageName,aPrefix:aPrefix},smalltalk.Package.klass)})},
-messageSends: ["getScript:onSuccess:", ",", "setupClasses", "named:"]}),
+messageSends: ["deprecatedAPI", "ajax:", "->", ",", "setupClasses", "named:"]}),
 smalltalk.Package.klass);
 
 smalltalk.addMethod(

+ 10 - 7
js/Kernel-Objects.js

@@ -4521,11 +4521,12 @@ category: 'loading-storing',
 fn: function (aPackageName){
 var self=this;
 return smalltalk.withContext(function($ctx1) { 
+self._deprecatedAPI();
 self._load_prefix_(aPackageName,_st(self._defaultCommitPathJs()).__comma("/"));
 return self}, function($ctx1) {$ctx1.fill(self,"load:",{aPackageName:aPackageName},smalltalk.Package.klass)})},
 args: ["aPackageName"],
-source: "load: aPackageName\x0a\x09self load: aPackageName prefix: self defaultCommitPathJs, '/'",
-messageSends: ["load:prefix:", ",", "defaultCommitPathJs"],
+source: "load: aPackageName\x0a\x09self deprecatedAPI.\x0a\x09self load: aPackageName prefix: self defaultCommitPathJs, '/'",
+messageSends: ["deprecatedAPI", "load:prefix:", ",", "defaultCommitPathJs"],
 referencedClasses: []
 }),
 smalltalk.Package.klass);
@@ -4537,16 +4538,18 @@ category: 'loading-storing',
 fn: function (aPackageName,aPrefix){
 var self=this;
 function $Package(){return smalltalk.Package||(typeof Package=="undefined"?nil:Package)}
+function $PlatformInterface(){return smalltalk.PlatformInterface||(typeof PlatformInterface=="undefined"?nil:PlatformInterface)}
 return smalltalk.withContext(function($ctx1) { 
-_st(jQuery)._getScript_onSuccess_(_st(_st(aPrefix).__comma(aPackageName)).__comma(".js"),(function(){
+self._deprecatedAPI();
+_st($PlatformInterface())._ajax_(smalltalk.HashedCollection._from_(["url".__minus_gt(_st(_st(aPrefix).__comma(aPackageName)).__comma(".js")),"dataType".__minus_gt("script"),"success".__minus_gt((function(){
 return smalltalk.withContext(function($ctx2) {
 return _st(_st($Package())._named_(aPackageName))._setupClasses();
-}, function($ctx2) {$ctx2.fillBlock({},$ctx1)})}));
+}, function($ctx2) {$ctx2.fillBlock({},$ctx1)})}))]));
 return self}, function($ctx1) {$ctx1.fill(self,"load:prefix:",{aPackageName:aPackageName,aPrefix:aPrefix},smalltalk.Package.klass)})},
 args: ["aPackageName", "aPrefix"],
-source: "load: aPackageName prefix: aPrefix\x0a\x09jQuery\x0a\x09\x09getScript: (aPrefix , aPackageName , '.js')\x0a\x09\x09onSuccess: [\x0a\x09\x09\x09(Package named: aPackageName) setupClasses ]",
-messageSends: ["getScript:onSuccess:", ",", "setupClasses", "named:"],
-referencedClasses: ["Package"]
+source: "load: aPackageName prefix: aPrefix\x0a\x09self deprecatedAPI.\x0a\x09PlatformInterface ajax: #{\x0a\x09\x09'url' -> (aPrefix , aPackageName , '.js').\x0a\x09\x09'dataType' -> 'script'.\x0a\x09\x09'success' -> [\x0a\x09\x09\x09(Package named: aPackageName) setupClasses ]\x0a\x09}",
+messageSends: ["deprecatedAPI", "ajax:", "->", ",", "setupClasses", "named:"],
+referencedClasses: ["Package", "PlatformInterface"]
 }),
 smalltalk.Package.klass);
 

+ 7 - 3
st/Kernel-Objects.st

@@ -1572,14 +1572,18 @@ named: aPackageName ifAbsent: aBlock
 !Package class methodsFor: 'loading-storing'!
 
 load: aPackageName
+	self deprecatedAPI.
 	self load: aPackageName prefix: self defaultCommitPathJs, '/'
 !
 
 load: aPackageName prefix: aPrefix
-	jQuery
-		getScript: (aPrefix , aPackageName , '.js')
-		onSuccess: [
+	self deprecatedAPI.
+	PlatformInterface ajax: #{
+		'url' -> (aPrefix , aPackageName , '.js').
+		'dataType' -> 'script'.
+		'success' -> [
 			(Package named: aPackageName) setupClasses ]
+	}
 ! !
 
 !Package class methodsFor: 'sorting'!