Преглед изворни кода

Fixes in starting .st/.js files.

Herbert Vojčík пре 6 година
родитељ
комит
428c775b0b
3 измењених фајлова са 10 додато и 11 уклоњено
  1. 5 6
      root/src/name.js
  2. 1 1
      root/src/name.st
  3. 4 4
      root/src/test.js

+ 5 - 6
root/src/name.js

@@ -7,13 +7,12 @@ define("{%= namespace %}/{%= name %}", ["amber/boot"
 
 //>>excludeEnd("imports");
 ){
-if(!$boot.nilAsReceiver)$boot.nilAsReceiver=$boot.nil;
-var $core=$boot.api,nil=$boot.nilAsReceiver,$recv=$boot.asReceiver,$globals=$boot.globals;
-if(!$boot.nilAsClass)$boot.nilAsClass=$boot.dnu;
+if(!("nilAsValue" in $boot))$boot.nilAsValue=$boot.nilAsReceiver;
+var $core=$boot.api,nil=$boot.nilAsValue,$nil=$boot.nilAsReceiver,$recv=$boot.asReceiver,$globals=$boot.globals;
 $core.addPackage('{%= name %}');
-$core.packages["{%= name %}"].innerEval = function (expr) { return eval(expr); };
-$core.packages["{%= name %}"].imports = ["amber/jquery/Wrappers-JQuery", "amber/web/Web", "silk/Silk"];
-$core.packages["{%= name %}"].transport = {"type":"amd","amdNamespace":"{%= namespace %}"};
+($core.packageDescriptors||$core.packages)["{%= name %}"].innerEval = function (expr) { return eval(expr); };
+($core.packageDescriptors||$core.packages)["{%= name %}"].imports = ["amber/jquery/Wrappers-JQuery", "amber/web/Web", "silk/Silk"];
+($core.packageDescriptors||$core.packages)["{%= name %}"].transport = {"type":"amd","amdNamespace":"{%= namespace %}"};
 
 $core.addClass('{%= name %}', $globals.Object, [], '{%= name %}');
 $core.addMethod(

+ 1 - 1
root/src/name.st

@@ -1,5 +1,5 @@
 Smalltalk createPackage: '{%= name %}'!
-(Smalltalk packageAt: '{%= name %}') imports: {'amber/jquery/Wrappers-JQuery'. 'amber/web/Web'. 'silk/Silk'}!
+(Smalltalk packageAt: '{%= name %}' ifAbsent: [ self error: 'Package not created: {%= name %}' ]) imports: {'amber/jquery/Wrappers-JQuery'. 'amber/web/Web'. 'silk/Silk'}!
 Object subclass: #{%= name %}
 	instanceVariableNames: ''
 	package: '{%= name %}'!

+ 4 - 4
root/src/test.js

@@ -1,9 +1,9 @@
 define("{%= namespace %}/{%= name %}-Tests", ["amber/boot", "amber_core/SUnit"], function($boot){
-if(!$boot.nilAsReceiver)$boot.nilAsReceiver=$boot.nil;
-var $core=$boot.api,nil=$boot.nilAsReceiver,$recv=$boot.asReceiver,$globals=$boot.globals;
-if(!$boot.nilAsClass)$boot.nilAsClass=$boot.dnu;
+if(!("nilAsValue" in $boot))$boot.nilAsValue=$boot.nilAsReceiver;
+var $core=$boot.api,nil=$boot.nilAsValue,$nil=$boot.nilAsReceiver,$recv=$boot.asReceiver,$globals=$boot.globals;
 $core.addPackage('{%= name %}-Tests');
-$core.packages["{%= name %}-Tests"].transport = {"type":"amd","amdNamespace":"{%= namespace %}"};
+($core.packageDescriptors||$core.packages)["{%= name %}-Tests"].innerEval = function (expr) { return eval(expr); };
+($core.packageDescriptors||$core.packages)["{%= name %}-Tests"].transport = {"type":"amd","amdNamespace":"{%= namespace %}"};
 
 $core.addClass('{%= name %}Test', $globals.TestCase, [], '{%= name %}-Tests');