Skip to content
Permalink
Browse files

Merge branch 'master' into develop

  • Loading branch information...
rtsan committed Jan 4, 2016
2 parents e422ff4 + 3a371f2 commit 593ab7c2bf5f504b657f05f7474acd6a3ae0172a
Showing with 35 additions and 10 deletions.
  1. +25 −0 CHANGELOG.md
  2. +3 −3 dev/plugins/ui.enchant.js
  3. +1 −1 dev/src/WebAudioSound.js
  4. +1 −1 package.json
  5. +5 −5 tests/mocha/enchant.js/test_deferred.js
@@ -1,3 +1,28 @@
# v0.8.3

- feature
- remove space key code from PREVENT_DEFAULT_KEY_CODES
- improve documentation translation (@thx tygerpatch)
- add telepathy plugin
- add enchant.ENV.COLOR_DETECTION_LEVEL

- bugfix
- fix map render lag
- Timeline#exec return this (thx @authorNari)
- fix error in WebAudioSound#play (thx @MaciejKus)
- reduce audio context creation
- improve touch detection precision

- plugins
- memory.enchant.js
- avoid JSON.parse bug in android (thx @hshimo)
- widget.enchant.js
- add LazyListView
- ui.enchant.js
- improve touch area (thx @cs8898)
- gl.enchant.js
- allow to change buffer type

# v0.8.2

- feature
@@ -76,10 +76,10 @@ enchant.ui.Pad = enchant.Class.create(enchant.Sprite, {
});
},
_detectInput: function(x, y) {
x -= this.width / 2;
y -= this.height / 2;
x -= this.width * 0.5;
y -= this.height * 0.5;
var input = { left: false, right: false, up: false, down: false };
if (x * x + y * y > 200) {
if (x * x + y * y <= 2500 && x * x + y * y > 200) {
if (x < 0 && y < x * x * 0.1 && y > x * x * -0.1) {
input.left = true;
}
@@ -51,7 +51,7 @@ enchant.WebAudioSound = enchant.Class.create(enchant.EventTarget, {
*/
play: function(dup) {
if (this._state === 1 && !dup) {
this.src.disconnect(this.connectTarget);
this.src.disconnect();
}
if (this._state !== 2) {
this._currentTime = 0;
@@ -1,6 +1,6 @@
{
"name": "enchant.js",
"version": "0.8.2",
"version": "0.8.3",
"repository": {
"type": "git",
"url": "https://github.com/wise9/enchant.js.git"
@@ -19,14 +19,14 @@ describe("Deferred", function(){
result = true;
});
expect(result).to.be.false;
setTimeout(done, 100);
setTimeout(done, 150);
setTimeout(function(){
expect(result).to.be.true;
}, 50);
});

it("should execute chained Deferred", function(done){
setTimeout(done, 100);
setTimeout(done, 150);
var result1 = result2 = false;
Deferred.next(function(){
result1 = true;
@@ -41,7 +41,7 @@ describe("Deferred", function(){
});

it("should pass returned value to chained next Dererred", function(done) {
setTimeout(done, 100);
setTimeout(done, 150);
var val;
Deferred.next(function(){
return 'foo';
@@ -64,7 +64,7 @@ describe("Deferred", function(){
});

it("should handle the error", function(done){
setTimeout(done, 100);
setTimeout(done, 150);
var result1 = result2 = false;
Deferred.next(function(){
throw new Error('fail');
@@ -161,7 +161,7 @@ describe("Deferred", function(){
});

it("should handle the error when execute parallel", function(done){
setTimeout(done, 100);
setTimeout(done, 150);
var result = false, counter = 0;
Deferred.parallel([
Deferred.next(function(){

0 comments on commit 593ab7c

Please sign in to comment.
You can’t perform that action at this time.