Bläddra i källkod

Merge branch 'master' into sandbox

Conflicts:
	devel.html
Herbert Vojčík 12 år sedan
förälder
incheckning
63c07b6edd
4 ändrade filer med 18 tillägg och 5 borttagningar
  1. 5 5
      devel.html
  2. 4 0
      js/Trapped.deploy.js
  3. 4 0
      js/Trapped.js
  4. 5 0
      st/Trapped.st

+ 5 - 5
devel.html

@@ -4,16 +4,16 @@
 <script src="/vendor/amber/js/amber.js"></script>
 </head>
 <body>
-<script type="text/javascript">
-    loadAmber({
-        files: ['Sample.js'],
-        packageHome: './',
+<script type="text/javascript"> 
+	loadAmber({
+		files: ['Trapped.js', 'Sample.js'],
+		packageHome: './',
         ready: function () {
             smalltalk.Browser._openOn_(smalltalk.Application);
             smalltalk.Trapped._start();
             //smalltalk.Application._open();
         }
-    });
+	});
 </script>
 <div trapped-app="Application">
 </div>

+ 4 - 0
js/Trapped.deploy.js

@@ -0,0 +1,4 @@
+smalltalk.addPackage('Trapped', {});
+smalltalk.addClass('Trapped', smalltalk.Object, [], 'Trapped');
+
+

+ 4 - 0
js/Trapped.js

@@ -0,0 +1,4 @@
+smalltalk.addPackage('Trapped', {});
+smalltalk.addClass('Trapped', smalltalk.Object, [], 'Trapped');
+
+

+ 5 - 0
st/Trapped.st

@@ -0,0 +1,5 @@
+Smalltalk current createPackage: 'Trapped' properties: #{}!
+Object subclass: #Trapped
+	instanceVariableNames: ''
+	package: 'Trapped'!
+