Explorar o código

Web and Wrappers-JQuery with new namespaces

According to naming conventions in wiki, the new namespaces are
 - amber/web
 - amber/jquery
Herbert Vojčík %!s(int64=9) %!d(string=hai) anos
pai
achega
c8fb70cfb6
Modificáronse 3 ficheiros con 16 adicións e 7 borrados
  1. 11 2
      contrib/local.amd.json
  2. 4 4
      contrib/src/Web.js
  3. 1 1
      contrib/src/Web.st

+ 11 - 2
contrib/local.amd.json

@@ -1,6 +1,15 @@
 {
     "paths": {
-        "amber-contrib-web": "src",
-        "amber-contrib-jquery": "src"
+        "amber/web": "src",
+        "amber/jquery": "src"
+    },
+  "map": {
+    "*": {
+      "00comment": "These are backward compatibility pointers.",
+      "amber-contrib-jquery/Wrappers-JQuery": "amber/jquery/Wrappers-JQuery",
+      "amber-contrib-web/Web": "amber/web/Web",
+      "amber_core/Web": "amber/web/Web",
+      "amber_core/Canvas": "amber/web/Web"
     }
+  }
 }

+ 4 - 4
contrib/src/Web.js

@@ -1,6 +1,6 @@
-define("amber-contrib-web/Web", ["amber/boot"
+define("amber/web/Web", ["amber/boot"
 //>>excludeStart("imports", pragmas.excludeImports);
-, "amber-contrib-jquery/Wrappers-JQuery"
+, "amber/jquery/Wrappers-JQuery"
 //>>excludeEnd("imports");
 , "amber_core/Kernel-Objects", "amber_core/Platform-Services", "amber_core/Kernel-Methods", "amber_core/Kernel-Collections"], function($boot
 //>>excludeStart("imports", pragmas.excludeImports);
@@ -10,8 +10,8 @@ define("amber-contrib-web/Web", ["amber/boot"
 var $core=$boot.api,nil=$boot.nil,$recv=$boot.asReceiver,$globals=$boot.globals;
 $core.addPackage('Web');
 $core.packages["Web"].innerEval = function (expr) { return eval(expr); };
-$core.packages["Web"].imports = ["amber-contrib-jquery/Wrappers-JQuery"];
-$core.packages["Web"].transport = {"type":"amd","amdNamespace":"amber-contrib-web"};
+$core.packages["Web"].imports = ["amber/jquery/Wrappers-JQuery"];
+$core.packages["Web"].transport = {"type":"amd","amdNamespace":"amber/web"};
 
 $core.addClass('HTMLCanvas', $globals.Object, ['root'], 'Web');
 //>>excludeStart("ide", pragmas.excludeIdeData);

+ 1 - 1
contrib/src/Web.st

@@ -1,5 +1,5 @@
 Smalltalk createPackage: 'Web'!
-(Smalltalk packageAt: 'Web') imports: {'amber-contrib-jquery/Wrappers-JQuery'}!
+(Smalltalk packageAt: 'Web') imports: {'amber/jquery/Wrappers-JQuery'}!
 Object subclass: #HTMLCanvas
 	instanceVariableNames: 'root'
 	package: 'Web'!