Browse Source

Making presentation load.

Herbert Vojčík 10 years ago
parent
commit
3ef3e4b3b5

+ 3 - 3
presentation/Gruntfile.js

@@ -1,5 +1,5 @@
 module.exports = function(grunt) {
-  grunt.loadTasks('../vendor/amber/grunt/tasks/');
+  grunt.loadNpmTasks('../../node_modules/amber-dev');
 
   grunt.registerTask('default', ['amberc:presentation']);
 
@@ -8,12 +8,12 @@ module.exports = function(grunt) {
 
     amberc: {  
       options: {
-        amber_dir: '../vendor/amber',
+        amber_dir: '../bower_components/amber',
         closure_jar: ''
       },
       presentation: {
         src: ['st/Presentation.st'],
-        libraries: ['Canvas'],
+        libraries: ['Web'],
         output_dir: 'js',
         deploy: true,
         amd_namespace: 'amber_examples_presentation'

+ 3 - 3
presentation/index.html

@@ -1,8 +1,8 @@
 <html>
 <head>
 <title>JTalk - Presentation</title>
-<script src="../vendor/amber/support/requirejs/require.min.js" type="text/javascript"></script>
-<script src="../vendor/amber/support/amber.js" type="text/javascript"></script>
+<script src="../bower_components/amber/support/requirejs/require.min.js" type="text/javascript"></script>
+<script src="../bower_components/amber/support/amber.js" type="text/javascript"></script>
 </head>
 <body>
 
@@ -10,7 +10,7 @@
 	require.config({
 		paths: {
 			'amber_examples_presentation': 'js',
-			'amber_examples_presentation\_source': 'st'
+			'amber_examples_presentation/_source': 'st'
 		}
 	});
 	require(['amber/devel','amber_examples_presentation/Presentation'],function(smalltalk) {

File diff suppressed because it is too large
+ 0 - 472
presentation/js/Presentation.deploy.js


File diff suppressed because it is too large
+ 182 - 164
presentation/js/Presentation.js


+ 1 - 1
presentation/st/Presentation.st

@@ -1,4 +1,4 @@
-Smalltalk current createPackage: 'Presentation'!
+Smalltalk createPackage: 'Presentation'!
 Widget subclass: #Presentation
 	instanceVariableNames: 'currentSlide slides'
 	package: 'Presentation'!

Some files were not shown because too many files changed in this diff