From 39dee7236bcaa7e73c5620d51185c68536245100 Mon Sep 17 00:00:00 2001 From: Jimmy Griffith Date: Wed, 15 Jul 2015 21:38:46 -0700 Subject: [PATCH 01/18] branch for jsio builds using the timestep PR --- modules/timestep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/timestep b/modules/timestep index ab875e9..12cc12f 160000 --- a/modules/timestep +++ b/modules/timestep @@ -1 +1 @@ -Subproject commit ab875e9d9fe7c7f0b7fe92cadf9b03be292e564b +Subproject commit 12cc12fd8aaa3cb90abea6289c367e6f25926e48 From 40dc8f3a5e22b219ef6bc14af5d5d20fcb8a0884 Mon Sep 17 00:00:00 2001 From: Jimmy Griffith Date: Mon, 20 Jul 2015 13:14:03 -0700 Subject: [PATCH 02/18] updated timestep for animate changes --- modules/timestep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/timestep b/modules/timestep index 12cc12f..8c488e0 160000 --- a/modules/timestep +++ b/modules/timestep @@ -1 +1 @@ -Subproject commit 12cc12fd8aaa3cb90abea6289c367e6f25926e48 +Subproject commit 8c488e01930ebc5dd2660bed1c30283b481e88b5 From 0d3c1551594bb926ca6a9e2633a5c90b0c308c2a Mon Sep 17 00:00:00 2001 From: Jimmy Griffith Date: Tue, 21 Jul 2015 18:10:14 -0700 Subject: [PATCH 03/18] updated timestep ref --- modules/timestep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/timestep b/modules/timestep index 8c488e0..72069d3 160000 --- a/modules/timestep +++ b/modules/timestep @@ -1 +1 @@ -Subproject commit 8c488e01930ebc5dd2660bed1c30283b481e88b5 +Subproject commit 72069d330e63b68c666394a30759b71b12cb21f0 From 727989ea79ce1b4c9b5671f6587cfa8646ce778e Mon Sep 17 00:00:00 2001 From: Jimmy Griffith Date: Wed, 22 Jul 2015 18:34:55 -0700 Subject: [PATCH 04/18] latest timestep for new-animate-groups PR --- modules/timestep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/timestep b/modules/timestep index 72069d3..ef7a1ef 160000 --- a/modules/timestep +++ b/modules/timestep @@ -1 +1 @@ -Subproject commit 72069d330e63b68c666394a30759b71b12cb21f0 +Subproject commit ef7a1ef286bbbf504f95c0a01ac46dc9c5ac31e1 From dee64fc89e84ce40ee728b08bd31bb9ce5b6dfbe Mon Sep 17 00:00:00 2001 From: Jimmy Griffith Date: Thu, 23 Jul 2015 13:16:08 -0700 Subject: [PATCH 05/18] updated timestep for new-animate-groups --- modules/timestep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/timestep b/modules/timestep index ef7a1ef..4a8e913 160000 --- a/modules/timestep +++ b/modules/timestep @@ -1 +1 @@ -Subproject commit ef7a1ef286bbbf504f95c0a01ac46dc9c5ac31e1 +Subproject commit 4a8e913acca98ad2d3c1ab696b9a2e29ad9c00ea From a9664d37d1cd3c80e84a87b651178278dae07668 Mon Sep 17 00:00:00 2001 From: Jimmy Griffith Date: Thu, 23 Jul 2015 16:48:56 -0700 Subject: [PATCH 06/18] native-android working w new animate and getGroup * timestep and native-android submodule updates * added prototype fns to native timestep Animator for the Finish event --- modules/native-android | 2 +- modules/timestep | 2 +- src/clientapi/native/timestep.js | 11 +++++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/modules/native-android b/modules/native-android index 6e0c763..bd6d41c 160000 --- a/modules/native-android +++ b/modules/native-android @@ -1 +1 @@ -Subproject commit 6e0c76310a0825369e483369ac9a37473621c898 +Subproject commit bd6d41c5989bd2e66d50b945a2ea158e8a652f16 diff --git a/modules/timestep b/modules/timestep index 4a8e913..c3a95b3 160000 --- a/modules/timestep +++ b/modules/timestep @@ -1 +1 @@ -Subproject commit 4a8e913acca98ad2d3c1ab696b9a2e29ad9c00ea +Subproject commit c3a95b3c6d73569f2ebeb26e7f58e0a66091286f diff --git a/src/clientapi/native/timestep.js b/src/clientapi/native/timestep.js index 1f651cf..30f967e 100644 --- a/src/clientapi/native/timestep.js +++ b/src/clientapi/native/timestep.js @@ -42,6 +42,17 @@ function installNativeView() { animate.setViewAnimator(NATIVE.timestep.Animator); merge(NATIVE.timestep.Animator.prototype, { subscribe: function () {}, + once: function (signal, cb) { + if (signal === "Finish") { + this._finishCallback = cb; + } + }, + onAnimationFinish: function () { + if (this._finishCallback) { + this._finishCallback(); + this._finishCallback = null; + } + }, pause: function () {}, resume: function () {}, __finish: function () {}, From 4f2e49d6c24a89057a34c63c7628a9afbf6e8839 Mon Sep 17 00:00:00 2001 From: Jimmy Griffith Date: Thu, 23 Jul 2015 17:39:00 -0700 Subject: [PATCH 07/18] updated native-android and ios for new animate * removed native js_group * onAnimationFinish gets called per Animator --- modules/native-android | 2 +- modules/native-ios | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/native-android b/modules/native-android index bd6d41c..6740e08 160000 --- a/modules/native-android +++ b/modules/native-android @@ -1 +1 @@ -Subproject commit bd6d41c5989bd2e66d50b945a2ea158e8a652f16 +Subproject commit 6740e081a8af0d4a2033fdd5436e4622480f0e84 diff --git a/modules/native-ios b/modules/native-ios index 2f9b874..5c71651 160000 --- a/modules/native-ios +++ b/modules/native-ios @@ -1 +1 @@ -Subproject commit 2f9b874d208c3bbb404f1b2269e5f17328c85d65 +Subproject commit 5c71651d89224d10aecac934b26c8751e5a01155 From 026394b921eae0bc8316d3bd4243d7a637f38fdc Mon Sep 17 00:00:00 2001 From: Jimmy Griffith Date: Thu, 23 Jul 2015 18:33:03 -0700 Subject: [PATCH 08/18] added detailed comments for Group class n timestep --- modules/timestep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/timestep b/modules/timestep index c3a95b3..d0b2101 160000 --- a/modules/timestep +++ b/modules/timestep @@ -1 +1 @@ -Subproject commit c3a95b3c6d73569f2ebeb26e7f58e0a66091286f +Subproject commit d0b210113b6af6beaf312027624270e3edd6111e From e24f391ce284381f29718641f02df5adfffaad36 Mon Sep 17 00:00:00 2001 From: Jimmy Griffith Date: Fri, 24 Jul 2015 16:15:02 -0700 Subject: [PATCH 09/18] Animators always safe PubSubs * including native view Animators --- modules/timestep | 2 +- src/clientapi/native/timestep.js | 25 ++++++------------------- 2 files changed, 7 insertions(+), 20 deletions(-) diff --git a/modules/timestep b/modules/timestep index d0b2101..bb1942d 160000 --- a/modules/timestep +++ b/modules/timestep @@ -1 +1 @@ -Subproject commit d0b210113b6af6beaf312027624270e3edd6111e +Subproject commit bb1942d6146f8447049af94bad75e8f1f78353cf diff --git a/src/clientapi/native/timestep.js b/src/clientapi/native/timestep.js index 30f967e..00c65d9 100644 --- a/src/clientapi/native/timestep.js +++ b/src/clientapi/native/timestep.js @@ -15,6 +15,7 @@ */ import device; +import lib.PubSub as PubSub; var hasNativeViews = GLOBAL.NATIVE && NATIVE.timestep && NATIVE.timestep.View; @@ -40,25 +41,11 @@ function installNativeView() { var animate = device.importUI('animate'); animate.setViewAnimator(NATIVE.timestep.Animator); - merge(NATIVE.timestep.Animator.prototype, { - subscribe: function () {}, - once: function (signal, cb) { - if (signal === "Finish") { - this._finishCallback = cb; - } - }, - onAnimationFinish: function () { - if (this._finishCallback) { - this._finishCallback(); - this._finishCallback = null; - } - }, - pause: function () {}, - resume: function () {}, - __finish: function () {}, - _isRunning: function () {} - }); - + merge(NATIVE.timestep.Animator.prototype, PubSub.prototype); + NATIVE.timestep.Animator.prototype.onAnimationFinish = function () { + this.publish('Finish'); + }; + // add some properties to View and ImageView to defer to native rendering import ui.View as View; View.prototype.__type = VIEW_TYPES.DEFAULT; From 52f96f0540ec964de471e55879041998d575b378 Mon Sep 17 00:00:00 2001 From: Jimmy Griffith Date: Mon, 27 Jul 2015 14:24:21 -0700 Subject: [PATCH 10/18] updated timestep for new-animate-groups --- modules/timestep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/timestep b/modules/timestep index bb1942d..458f455 160000 --- a/modules/timestep +++ b/modules/timestep @@ -1 +1 @@ -Subproject commit bb1942d6146f8447049af94bad75e8f1f78353cf +Subproject commit 458f4557a82db837bf3e0ee7ae87f2f640f10353 From e268061ad3950bed82791c10e207b1b146a517e0 Mon Sep 17 00:00:00 2001 From: Jimmy Griffith Date: Mon, 27 Jul 2015 15:48:07 -0700 Subject: [PATCH 11/18] updated timestep (new-animate-groups) --- modules/timestep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/timestep b/modules/timestep index 458f455..937883f 160000 --- a/modules/timestep +++ b/modules/timestep @@ -1 +1 @@ -Subproject commit 458f4557a82db837bf3e0ee7ae87f2f640f10353 +Subproject commit 937883fb427fd4db4df6b6e3414017725684b0f3 From 0bac73dbd46a1c4e78e4c70e0c0297c400c02162 Mon Sep 17 00:00:00 2001 From: Jimmy Griffith Date: Mon, 27 Jul 2015 21:24:16 -0700 Subject: [PATCH 12/18] new animate add / remove group hooks from native --- modules/native-android | 2 +- modules/native-ios | 2 +- modules/timestep | 2 +- src/clientapi/native/timestep.js | 15 +++++++++++++-- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/modules/native-android b/modules/native-android index 6740e08..a794e59 160000 --- a/modules/native-android +++ b/modules/native-android @@ -1 +1 @@ -Subproject commit 6740e081a8af0d4a2033fdd5436e4622480f0e84 +Subproject commit a794e5995ec7f829b0ac73c55be537414811c7a0 diff --git a/modules/native-ios b/modules/native-ios index 5c71651..5ef5a8a 160000 --- a/modules/native-ios +++ b/modules/native-ios @@ -1 +1 @@ -Subproject commit 5c71651d89224d10aecac934b26c8751e5a01155 +Subproject commit 5ef5a8ab3ebd001eacedddf34f3c005833dd0a52 diff --git a/modules/timestep b/modules/timestep index 937883f..5b8c578 160000 --- a/modules/timestep +++ b/modules/timestep @@ -1 +1 @@ -Subproject commit 937883fb427fd4db4df6b6e3414017725684b0f3 +Subproject commit 5b8c578804585622d5e10fc99c45403d9731aa92 diff --git a/src/clientapi/native/timestep.js b/src/clientapi/native/timestep.js index 00c65d9..68e9b25 100644 --- a/src/clientapi/native/timestep.js +++ b/src/clientapi/native/timestep.js @@ -41,9 +41,20 @@ function installNativeView() { var animate = device.importUI('animate'); animate.setViewAnimator(NATIVE.timestep.Animator); + + // native view animators inherit from PubSub (Emitter) to match JS merge(NATIVE.timestep.Animator.prototype, PubSub.prototype); - NATIVE.timestep.Animator.prototype.onAnimationFinish = function () { - this.publish('Finish'); + + // native view animators need to add themselves to animate groups in JS + NATIVE.timestep.Animator.prototype._addToGroup = function () { + var group = animate.getGroup(this.groupID); + group && group.add(this); + }; + + // native view animators need to remove themselves from animate groups in JS + NATIVE.timestep.Animator.prototype._removeFromGroup = function () { + var group = animate.getGroup(this.groupID); + group && group.remove(this); }; // add some properties to View and ImageView to defer to native rendering From d20b71d51787d059189864dd408715d1e0e3c441 Mon Sep 17 00:00:00 2001 From: Jimmy Griffith Date: Mon, 27 Jul 2015 21:33:29 -0700 Subject: [PATCH 13/18] updated ios, fixed native animate ctor expectation --- modules/native-ios | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/native-ios b/modules/native-ios index 5ef5a8a..fc51538 160000 --- a/modules/native-ios +++ b/modules/native-ios @@ -1 +1 @@ -Subproject commit 5ef5a8ab3ebd001eacedddf34f3c005833dd0a52 +Subproject commit fc51538bdc81756d2b7a9c1d6c64911353e8648b From 08927fa7a9e105423e2dbd7920d92ae0bbbd8286 Mon Sep 17 00:00:00 2001 From: Jimmy Griffith Date: Tue, 28 Jul 2015 13:51:47 -0700 Subject: [PATCH 14/18] use real Animator fns instead of duplicates updated timestep for animate groups fix --- modules/timestep | 2 +- src/clientapi/native/timestep.js | 15 ++++----------- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/modules/timestep b/modules/timestep index 5b8c578..e2693bc 160000 --- a/modules/timestep +++ b/modules/timestep @@ -1 +1 @@ -Subproject commit 5b8c578804585622d5e10fc99c45403d9731aa92 +Subproject commit e2693bcd0299f61a00fc29817b7760ee03596a56 diff --git a/src/clientapi/native/timestep.js b/src/clientapi/native/timestep.js index 68e9b25..f5cea81 100644 --- a/src/clientapi/native/timestep.js +++ b/src/clientapi/native/timestep.js @@ -40,22 +40,15 @@ function installNativeView() { timestep.NativeImageView.install(); var animate = device.importUI('animate'); + var ViewAnimator = animate.getViewAnimator(); + // use accelerated native view animators animate.setViewAnimator(NATIVE.timestep.Animator); - // native view animators inherit from PubSub (Emitter) to match JS merge(NATIVE.timestep.Animator.prototype, PubSub.prototype); - // native view animators need to add themselves to animate groups in JS - NATIVE.timestep.Animator.prototype._addToGroup = function () { - var group = animate.getGroup(this.groupID); - group && group.add(this); - }; - + NATIVE.timestep.Animator.prototype._addToGroup = ViewAnimator.prototype._addToGroup; // native view animators need to remove themselves from animate groups in JS - NATIVE.timestep.Animator.prototype._removeFromGroup = function () { - var group = animate.getGroup(this.groupID); - group && group.remove(this); - }; + NATIVE.timestep.Animator.prototype._removeFromGroup = ViewAnimator.prototype._removeFromGroup; // add some properties to View and ImageView to defer to native rendering import ui.View as View; From 05eda0d635f286a39509cd18868c605c25a79ce5 Mon Sep 17 00:00:00 2001 From: Jimmy Griffith Date: Tue, 28 Jul 2015 14:20:04 -0700 Subject: [PATCH 15/18] global animate functions, updated timestep --- modules/timestep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/timestep b/modules/timestep index e2693bc..9c7069d 160000 --- a/modules/timestep +++ b/modules/timestep @@ -1 +1 @@ -Subproject commit e2693bcd0299f61a00fc29817b7760ee03596a56 +Subproject commit 9c7069d628f70c6a8a1c7decd8a98107b91b3ccc From f6fc6447b036c121d317c85f6c99783932d317cc Mon Sep 17 00:00:00 2001 From: Jimmy Griffith Date: Tue, 28 Jul 2015 16:01:09 -0700 Subject: [PATCH 16/18] clean up after animate refactor --- modules/timestep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/timestep b/modules/timestep index 9c7069d..3e94aca 160000 --- a/modules/timestep +++ b/modules/timestep @@ -1 +1 @@ -Subproject commit 9c7069d628f70c6a8a1c7decd8a98107b91b3ccc +Subproject commit 3e94acabe1f187672206ef48ea700e866f875b7b From 0d717d08f5bb844309c48d456436e21ae811cd7e Mon Sep 17 00:00:00 2001 From: Jimmy Griffith Date: Wed, 29 Jul 2015 20:19:16 -0700 Subject: [PATCH 17/18] native animate fixes to match JS behavior animate commit now resumes paused anims to finish instantly --- modules/native-android | 2 +- modules/timestep | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/native-android b/modules/native-android index a794e59..33d015f 160000 --- a/modules/native-android +++ b/modules/native-android @@ -1 +1 @@ -Subproject commit a794e5995ec7f829b0ac73c55be537414811c7a0 +Subproject commit 33d015fc48944ac8ced445233bce1567a30d5e29 diff --git a/modules/timestep b/modules/timestep index 3e94aca..9379277 160000 --- a/modules/timestep +++ b/modules/timestep @@ -1 +1 @@ -Subproject commit 3e94acabe1f187672206ef48ea700e866f875b7b +Subproject commit 937927781170db00b4b0f87d07428f79daef9fdd From e2dce39c2dee054ce73e858821a8e3589aa48167 Mon Sep 17 00:00:00 2001 From: Jimmy Griffith Date: Wed, 29 Jul 2015 20:21:11 -0700 Subject: [PATCH 18/18] ios native-core submodule update for animate fixes --- modules/native-ios | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/native-ios b/modules/native-ios index fc51538..2ad184e 160000 --- a/modules/native-ios +++ b/modules/native-ios @@ -1 +1 @@ -Subproject commit fc51538bdc81756d2b7a9c1d6c64911353e8648b +Subproject commit 2ad184e4b01274bb0166399b4885758674d0cfb3