Home Explore Help
Register Sign In
herby
/
trapped
1
1
Fork 0
Files Issues 1 Pull Requests 0 Wiki
Browse Source

update amber and related changes

Herbert Vojčík 11 years ago
parent
74caa14970
commit
cf1b2f3329
11 changed files with 16 additions and 24 deletions
Split View Show Diff Stats
  1. 3 7
      demo.html
  2. 4 8
      devel.html
  3. 1 1
      lib/js/Trapped-Backend.deploy.js
  4. 1 1
      lib/js/Trapped-Backend.js
  5. 1 1
      lib/js/Trapped-Demo.deploy.js
  6. 1 1
      lib/js/Trapped-Demo.js
  7. 1 1
      lib/js/Trapped-Frontend.deploy.js
  8. 1 1
      lib/js/Trapped-Frontend.js
  9. 1 1
      lib/js/Trapped-Tests.deploy.js
  10. 1 1
      lib/js/Trapped-Tests.js
  11. 1 1
      vendor/amber

+ 3 - 7
demo.html
View File 

@@ -9,19 +9,15 @@
 
 <script type="text/javascript">
 
     var AppEntity;
 
     require.config({
 
-        config: {
 
-            'amber_vm/smalltalk': {
 
-                defaultNamespace: 'gh_herby_trapped'
 
-            }
 
-        },
 
         paths: {
 
-            'gh_herby_trapped': '/lib/js'
 
+            'gh_herby_trapped': 'lib/js'
 
         }
 
     });
 
     require(
 
-            ["amber_vm/smalltalk", "amber_set/full-devel",
 
+            ["amber/devel",
 
                 "gh_herby_trapped/Trapped-Backend", "gh_herby_trapped/Trapped-Frontend", "gh_herby_trapped/Trapped-Demo" ],
 
             function (smalltalk) {
 
+                smalltalk.defaultAMDNamespace = 'gh_herby_trapped';
 
                 smalltalk.initialize();
 
 
                 $(function() {

+ 4 - 8
devel.html
View File 

@@ -7,20 +7,16 @@
 
 <body>
 
 <script type="text/javascript">
 
     require.config({
 
-        config: {
 
-            'amber_vm/smalltalk': {
 
-                defaultNamespace: 'gh_herby_trapped'
 
-            }
 
-        },
 
         paths: {
 
-            'gh_herby_trapped': '/lib/js',
 
-            'gh_herby_trapped/_source': '/lib/st'
 
+            'gh_herby_trapped': 'lib/js',
 
+            'gh_herby_trapped/_source': 'lib/st'
 
         }
 
     });
 
     require(
 
-            ["amber_vm/smalltalk", "amber_set/full-devel",
 
+            ["amber/devel",
 
                 "gh_herby_trapped/Trapped-Backend", "gh_herby_trapped/Trapped-Tests" ],
 
             function (smalltalk) {
 
+                smalltalk.defaultAMDNamespace = 'gh_herby_trapped';
 
                 smalltalk.initialize();
 
 
                 smalltalk.Browser._openOn_(smalltalk.IsolatorTest);

+ 1 - 1
lib/js/Trapped-Backend.deploy.js
View File 

@@ -1,4 +1,4 @@
 
-define("gh_herby_trapped/Trapped-Backend", ["amber_vm/smalltalk", "amber_vm/nil", "amber_vm/_st", "amber/Kernel-Objects", "amber/Kernel-Exceptions", "amber/Kernel-Collections"], function(smalltalk,nil,_st){
 
+define("gh_herby_trapped/Trapped-Backend", ["amber_vm/smalltalk", "amber_vm/nil", "amber_vm/_st", "amber_core/Kernel-Objects", "amber_core/Kernel-Exceptions", "amber_core/Kernel-Collections"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Trapped-Backend');
 
 smalltalk.packages["Trapped-Backend"].transport = {"type":"amd","amdNamespace":"gh_herby_trapped"};

+ 1 - 1
lib/js/Trapped-Backend.js
View File 

@@ -1,4 +1,4 @@
 
-define("gh_herby_trapped/Trapped-Backend", ["amber_vm/smalltalk", "amber_vm/nil", "amber_vm/_st", "amber/Kernel-Objects", "amber/Kernel-Exceptions", "amber/Kernel-Collections"], function(smalltalk,nil,_st){
 
+define("gh_herby_trapped/Trapped-Backend", ["amber_vm/smalltalk", "amber_vm/nil", "amber_vm/_st", "amber_core/Kernel-Objects", "amber_core/Kernel-Exceptions", "amber_core/Kernel-Collections"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Trapped-Backend');
 
 smalltalk.packages["Trapped-Backend"].transport = {"type":"amd","amdNamespace":"gh_herby_trapped"};

+ 1 - 1
lib/js/Trapped-Demo.deploy.js
View File 

@@ -1,4 +1,4 @@
 
-define("gh_herby_trapped/Trapped-Demo", ["amber_vm/smalltalk", "amber_vm/nil", "amber_vm/_st", "gh_herby_trapped/Trapped-Backend", "amber/Kernel-Objects", "amber/Canvas"], function(smalltalk,nil,_st){
 
+define("gh_herby_trapped/Trapped-Demo", ["amber_vm/smalltalk", "amber_vm/nil", "amber_vm/_st", "gh_herby_trapped/Trapped-Backend", "amber_core/Kernel-Objects", "amber_core/Canvas"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Trapped-Demo');
 
 smalltalk.packages["Trapped-Demo"].transport = {"type":"amd","amdNamespace":"gh_herby_trapped"};

+ 1 - 1
lib/js/Trapped-Demo.js
View File 

@@ -1,4 +1,4 @@
 
-define("gh_herby_trapped/Trapped-Demo", ["amber_vm/smalltalk", "amber_vm/nil", "amber_vm/_st", "gh_herby_trapped/Trapped-Backend", "amber/Kernel-Objects", "amber/Canvas"], function(smalltalk,nil,_st){
 
+define("gh_herby_trapped/Trapped-Demo", ["amber_vm/smalltalk", "amber_vm/nil", "amber_vm/_st", "gh_herby_trapped/Trapped-Backend", "amber_core/Kernel-Objects", "amber_core/Canvas"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Trapped-Demo');
 
 smalltalk.packages["Trapped-Demo"].transport = {"type":"amd","amdNamespace":"gh_herby_trapped"};

+ 1 - 1
lib/js/Trapped-Frontend.deploy.js
View File 

@@ -1,4 +1,4 @@
 
-define("gh_herby_trapped/Trapped-Frontend", ["amber_vm/smalltalk", "amber_vm/nil", "amber_vm/_st", "amber/Kernel-Objects", "amber/Canvas", "amber/Kernel-Collections"], function(smalltalk,nil,_st){
 
+define("gh_herby_trapped/Trapped-Frontend", ["amber_vm/smalltalk", "amber_vm/nil", "amber_vm/_st", "amber_core/Kernel-Objects", "amber_core/Canvas", "amber_core/Kernel-Collections"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Trapped-Frontend');
 
 smalltalk.packages["Trapped-Frontend"].transport = {"type":"amd","amdNamespace":"gh_herby_trapped"};

+ 1 - 1
lib/js/Trapped-Frontend.js
View File 

@@ -1,4 +1,4 @@
 
-define("gh_herby_trapped/Trapped-Frontend", ["amber_vm/smalltalk", "amber_vm/nil", "amber_vm/_st", "amber/Kernel-Objects", "amber/Canvas", "amber/Kernel-Collections"], function(smalltalk,nil,_st){
 
+define("gh_herby_trapped/Trapped-Frontend", ["amber_vm/smalltalk", "amber_vm/nil", "amber_vm/_st", "amber_core/Kernel-Objects", "amber_core/Canvas", "amber_core/Kernel-Collections"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Trapped-Frontend');
 
 smalltalk.packages["Trapped-Frontend"].transport = {"type":"amd","amdNamespace":"gh_herby_trapped"};

+ 1 - 1
lib/js/Trapped-Tests.deploy.js
View File 

@@ -1,4 +1,4 @@
 
-define("gh_herby_trapped/Trapped-Tests", ["amber_vm/smalltalk", "amber_vm/nil", "amber_vm/_st", "amber/SUnit"], function(smalltalk,nil,_st){
 
+define("gh_herby_trapped/Trapped-Tests", ["amber_vm/smalltalk", "amber_vm/nil", "amber_vm/_st", "amber_core/SUnit"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Trapped-Tests');
 
 smalltalk.packages["Trapped-Tests"].transport = {"type":"amd","amdNamespace":"gh_herby_trapped"};

+ 1 - 1
lib/js/Trapped-Tests.js
View File 

@@ -1,4 +1,4 @@
 
-define("gh_herby_trapped/Trapped-Tests", ["amber_vm/smalltalk", "amber_vm/nil", "amber_vm/_st", "amber/SUnit"], function(smalltalk,nil,_st){
 
+define("gh_herby_trapped/Trapped-Tests", ["amber_vm/smalltalk", "amber_vm/nil", "amber_vm/_st", "amber_core/SUnit"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Trapped-Tests');
 
 smalltalk.packages["Trapped-Tests"].transport = {"type":"amd","amdNamespace":"gh_herby_trapped"};

+ 1 - 1
vendor/amber
View File 

@@ -1 +1 @@
 
-Subproject commit 11518d8e6a961cd97788b5bfcaaf8bcdf789f3eb
 
+Subproject commit 16438c7892cfae994ff3b9e81b6dc2797e23f559