Home Explore Help
Register Sign In
amber
/
prof-stef
2
1
Fork 0
Files Issues 3 Pull Requests 0 Wiki
Browse Source

Making hello build. It does not load, mysteriously.

Herbert Vojčík 11 years ago
parent
29c51ad2b0
commit
a1a6783fc3
4 changed files with 40 additions and 11 deletions
Unified View Show Diff Stats
  1. 24 0
      hello/Gruntfile.js
  2. 3 3
      hello/index.html
  3. 12 7
      hello/js/HelloApp.js
  4. 1 1
      hello/st/HelloApp.st

+ 24 - 0
hello/Gruntfile.js
View File 

@@ -0,0 +1,24 @@
 
+module.exports = function(grunt) {
 
+  grunt.loadNpmTasks('../../node_modules/amber-dev');
 
+
 
+  grunt.registerTask('default', ['amberc:hello']);
 
+
 
+  grunt.initConfig({
 
+    pkg: grunt.file.readJSON('../package.json'),
 
+
 
+    amberc: {  
+      options: {
 
+        amber_dir: '../bower_components/amber',
 
+        closure_jar: ''
 
+      },
 
+      hello: {
 
+        src: ['st/HelloApp.st'],
 
+        libraries: ['Web'],
 
+        output_dir: 'js',
 
+        deploy: true,
 
+        amd_namespace: 'amber_examples_hello'
 
+      }
 
+    }
 
+  });
 
+
 
+}

+ 3 - 3
hello/index.html
View File 

@@ -2,8 +2,8 @@
 
 <html>
 
 <html>
 
   <head>
 
   <head>
 
     <title>My First Amber Project</title>
 
     <title>My First Amber Project</title>
 
-    <script src="../vendor/amber/support/amber.js"></script>
 
-    <script src="../vendor/amber/support/requirejs/require.min.js"></script>
 
+    <script src="../bower_components/amber/support/amber.js"></script>
 
+    <script src="../bower_components/amber/support/requirejs/require.min.js"></script>
 
     <script type="text/javascript">
 
     <script type="text/javascript">
 
       require.config({ paths: {
 
       require.config({ paths: {
 
         'com_example_hello': 'js', //mapping compiled .js files
 
         'com_example_hello': 'js', //mapping compiled .js files
 
@@ -19,7 +19,7 @@
 
   <body>
 
   <body>
 
     <article>
 
     <article>
 
       <h1>My First Amber Project</h1>
 
       <h1>My First Amber Project</h1>
 
-      <button onclick="require('amber_vm/smalltalk').Browser._open()">class browser</button>
 
+      <button onclick="require('amber/helpers').globals.Browser._open()">class browser</button>
 
       <button id="sayHello">say hello</button>
 
       <button id="sayHello">say hello</button>
 
     </article>
 
     </article>
 
   </body>
 
   </body>

+ 12 - 7
hello/js/HelloApp.js
View File 

@@ -1,29 +1,34 @@
 
-define("com_example_hello/HelloApp", ["amber_vm/smalltalk", "amber_vm/nil", "amber_vm/_st", "amber_core/Kernel-Objects"], function(smalltalk,nil,_st){
 
+define("amber_examples_hello/HelloApp", ["amber/boot", "amber_core/Kernel-Objects"], function($boot){
 
+var smalltalk=$boot.vm,nil=$boot.nil,_st=$boot.asReceiver,globals=$boot.globals;
 
 smalltalk.addPackage('HelloApp');
 
 smalltalk.addPackage('HelloApp');
 
-smalltalk.packages["HelloApp"].transport = {"type":"amd","amdNamespace":"com_example_hello"};
 
+smalltalk.packages["HelloApp"].transport = {"type":"amd","amdNamespace":"amber_examples_hello"};
 
 
 
-smalltalk.addClass('Hello', smalltalk.Object, [], 'HelloApp');
 
+smalltalk.addClass('Hello', globals.Object, [], 'HelloApp');
 
 smalltalk.addMethod(
 
 smalltalk.addMethod(
 
 smalltalk.method({
 
 smalltalk.method({
 
 selector: "begin",
 
 selector: "begin",
 
-category: 'not yet classified',
 
+protocol: 'not yet classified',
 
 fn: function (){
 
 fn: function (){
 
 var self=this;
 
 var self=this;
 
 var msg,button;
 
 var msg,button;
 
 return smalltalk.withContext(function($ctx1) { 
 return smalltalk.withContext(function($ctx1) { 
+var $1,$2;
 
 msg="Hello world!";
 
 msg="Hello world!";
 
 button="#sayHello"._asJQuery();
 
 button="#sayHello"._asJQuery();
 
 _st(button)._click_((function(){
 
 _st(button)._click_((function(){
 
 return smalltalk.withContext(function($ctx2) {
 
 return smalltalk.withContext(function($ctx2) {
 
-return _st(button)._after_(_st("<p>".__comma(msg)).__comma("</p>"));
 
+$1=button;
 
+$2=_st("<p>".__comma(msg)).__comma("</p>");
 
+$ctx2.sendIdx[","]=1;
 
+return _st($1)._after_($2);
 
 }, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)})}));
 
 }, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)})}));
 
-return self}, function($ctx1) {$ctx1.fill(self,"begin",{msg:msg,button:button},smalltalk.Hello)})},
 
+return self}, function($ctx1) {$ctx1.fill(self,"begin",{msg:msg,button:button},globals.Hello)})},
 
 args: [],
 
 args: [],
 
 source: "begin\x0a\x22Makes me say hello to the user.\x22\x0a\x0a| msg button |\x0amsg := 'Hello world!'.\x0abutton := '#sayHello' asJQuery.\x0abutton click: [button after: '<p>' , msg , '</p>'].",
 
 source: "begin\x0a\x22Makes me say hello to the user.\x22\x0a\x0a| msg button |\x0amsg := 'Hello world!'.\x0abutton := '#sayHello' asJQuery.\x0abutton click: [button after: '<p>' , msg , '</p>'].",
 
 messageSends: ["asJQuery", "click:", "after:", ","],
 
 messageSends: ["asJQuery", "click:", "after:", ","],
 
 referencedClasses: []
 
 referencedClasses: []
 
 }),
 
 }),
 
-smalltalk.Hello);
 
+globals.Hello);
 
 
 
 
 
 });
 
 });

+ 1 - 1
hello/st/HelloApp.st
View File 

@@ -1,4 +1,4 @@
 
-Smalltalk current createPackage: 'HelloApp'!
 
+Smalltalk createPackage: 'HelloApp'!
 
 Object subclass: #Hello
 
 Object subclass: #Hello
 
 	instanceVariableNames: ''
 
 	instanceVariableNames: ''
 
 	package: 'HelloApp'!
 
 	package: 'HelloApp'!