Mercurial > hg > serpentron
changeset 17:4943c163d0b4
Amber 0.18.5.
author | Mikhail Kryshen <mikhail@kryshen.net> |
---|---|
date | Thu, 13 Apr 2017 15:44:35 +0300 |
parents | f9175ceade33 |
children | 392c2a5ebab4 |
files | Gruntfile.js bower.json package.json src/Serpentron.st |
diffstat | 4 files changed, 17 insertions(+), 18 deletions(-) [+] |
line diff
1.1 --- a/Gruntfile.js Tue Apr 12 23:43:26 2016 +0300 1.2 +++ b/Gruntfile.js Thu Apr 13 15:44:35 2017 +0300 1.3 @@ -1,15 +1,15 @@ 1.4 'use strict'; 1.5 1.6 module.exports = function (grunt) { 1.7 - var path = require('path'), 1.8 - helpers = require('amber-dev').helpers; 1.9 - 1.10 // These plugins provide necessary tasks. 1.11 grunt.loadNpmTasks('grunt-contrib-clean'); 1.12 grunt.loadNpmTasks('grunt-contrib-requirejs'); 1.13 grunt.loadNpmTasks('grunt-execute'); 1.14 grunt.loadNpmTasks('amber-dev'); 1.15 1.16 + var path = require('path'), 1.17 + helpers = require('amber-dev').helpers; 1.18 + 1.19 // Default task. 1.20 grunt.registerTask('default', ['amdconfig:app', 'amberc:all']); 1.21 grunt.registerTask('test', ['amdconfig:app', 'requirejs:test_runner', 'execute:test_runner', 'clean:test_runner']); 1.22 @@ -37,7 +37,7 @@ 1.23 'src/Serpentron-Tests.st' // list all tests in dependency order 1.24 ], 1.25 amd_namespace: 'amber-serpentron', 1.26 - libraries: ['amber_core/SUnit', 'silk/Silk'] 1.27 + libraries: ['amber_core/SUnit', 'amber/web/Web', 'silk/Silk'] 1.28 } 1.29 }, 1.30 1.31 @@ -59,7 +59,7 @@ 1.32 excludeIdeData: true, 1.33 excludeDebugContexts: true 1.34 }, 1.35 - include: ['config', 'config-browser', 'node_modules/requirejs/require', 'app'], 1.36 + include: ['config', 'config-browser', 'node_modules/requirejs/require', 'app', 'amber/lazypack'], 1.37 optimize: "uglify2", 1.38 out: "the.js" 1.39 } 1.40 @@ -93,7 +93,7 @@ 1.41 pragmas: { 1.42 excludeIdeData: true 1.43 }, 1.44 - include: ['config-node', 'app'], 1.45 + include: ['config-node', 'app', 'amber/lazypack'], 1.46 insertRequire: ['app'], 1.47 optimize: "none", 1.48 wrap: helpers.nodeWrapperWithShebang,
2.1 --- a/bower.json Tue Apr 12 23:43:26 2016 +0300 2.2 +++ b/bower.json Thu Apr 13 15:44:35 2017 +0300 2.3 @@ -26,14 +26,14 @@ 2.4 ], 2.5 "private": false, 2.6 "dependencies": { 2.7 - "amber": "^0.15.1", 2.8 - "amber-compat-es2015": "^0.1.0", 2.9 - "domite": "^0.4.0", 2.10 - "silk": "^0.2.0" 2.11 + "amber": "^0.18.3", 2.12 + "amber-compat-es2015": "^0.1.5", 2.13 + "domite": "^0.6.0", 2.14 + "silk": "^0.2.3" 2.15 }, 2.16 "devDependencies": { 2.17 - "amber-contrib-legacy": "^0.3.0", 2.18 + "amber-contrib-legacy": "^0.4.2", 2.19 "amber-ide-starter-dialog": "^0.1.0", 2.20 - "helios": "^0.6.0" 2.21 + "helios": "^0.7.1" 2.22 } 2.23 }
3.1 --- a/package.json Tue Apr 12 23:43:26 2016 +0300 3.2 +++ b/package.json Thu Apr 13 15:44:35 2017 +0300 3.3 @@ -28,7 +28,7 @@ 3.4 "test": "grunt test" 3.5 }, 3.6 "devDependencies": { 3.7 - "amber-dev": "^0.8.2", 3.8 + "amber-dev": "^0.8.7", 3.9 "grunt": "^0.4.5", 3.10 "grunt-contrib-clean": "^0.7.0", 3.11 "grunt-contrib-requirejs": "^0.4.4", 3.12 @@ -39,4 +39,4 @@ 3.13 "Amber", 3.14 "Smalltalk" 3.15 ] 3.16 -} 3.17 +} 3.18 \ No newline at end of file
4.1 --- a/src/Serpentron.st Tue Apr 12 23:43:26 2016 +0300 4.2 +++ b/src/Serpentron.st Thu Apr 13 15:44:35 2017 +0300 4.3 @@ -385,12 +385,12 @@ 4.4 "No reason to polyfill requestAnimationFrame 4.5 or use vendor prefixes as browsers that do not have it 4.6 will likely have other incompatibilities." 4.7 - < return window.requestAnimationFrame && true || false > 4.8 + <inlineJS: 'return window.requestAnimationFrame && true || false'> 4.9 ! 4.10 4.11 toggleFullscreen 4.12 "Sample code from https://developer.mozilla.org/en-US/docs/Web/API/Fullscreen_API" 4.13 - < 4.14 + <inlineJS: ' 4.15 if (!!document.fullscreenElement && 4.16 !!document.mozFullScreenElement && !!document.webkitFullscreenElement && !!document.msFullscreenElement ) { 4.17 if (document.documentElement.requestFullscreen) { 4.18 @@ -412,8 +412,7 @@ 4.19 } else if (document.webkitExitFullscreen) { 4.20 document.webkitExitFullscreen(); 4.21 } 4.22 - } 4.23 - > 4.24 + }'> 4.25 ! ! 4.26 4.27 !Serpentron class methodsFor: 'starting'!