You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by pi...@apache.org on 2017/06/18 12:36:37 UTC
[26/50] [abbrv] git commit: [flex-asjs] [refs/heads/tlf] - Improves
for Wipe effect in js, to get tween replays working in FlexJSStore example
Improves for Wipe effect in js, to get tween replays working in FlexJSStore example
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/9e226721
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/9e226721
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/9e226721
Branch: refs/heads/tlf
Commit: 9e2267216d160ed3b56f092f7f73e008b8312b9a
Parents: 1af9cc8
Author: greg-dove <gr...@gmail.com>
Authored: Fri Jun 9 10:10:11 2017 +1200
Committer: greg-dove <gr...@gmail.com>
Committed: Fri Jun 9 10:18:54 2017 +1200
----------------------------------------------------------------------
.../src/main/flex/org/apache/flex/effects/PlatformWiper.as | 2 +-
.../Effects/src/main/flex/org/apache/flex/effects/Wipe.as | 9 +++++++--
2 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9e226721/frameworks/projects/Effects/src/main/flex/org/apache/flex/effects/PlatformWiper.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Effects/src/main/flex/org/apache/flex/effects/PlatformWiper.as b/frameworks/projects/Effects/src/main/flex/org/apache/flex/effects/PlatformWiper.as
index 0e04f47..a9a1a3f 100644
--- a/frameworks/projects/Effects/src/main/flex/org/apache/flex/effects/PlatformWiper.as
+++ b/frameworks/projects/Effects/src/main/flex/org/apache/flex/effects/PlatformWiper.as
@@ -97,7 +97,7 @@ public class PlatformWiper
}
COMPILE::JS
{
- if (value == null)
+ if (_target && value != _target)
{
if (_overflow == null)
delete _target.positioner.style["overflow"];
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9e226721/frameworks/projects/Effects/src/main/flex/org/apache/flex/effects/Wipe.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Effects/src/main/flex/org/apache/flex/effects/Wipe.as b/frameworks/projects/Effects/src/main/flex/org/apache/flex/effects/Wipe.as
index fe83935..bfd3f56 100644
--- a/frameworks/projects/Effects/src/main/flex/org/apache/flex/effects/Wipe.as
+++ b/frameworks/projects/Effects/src/main/flex/org/apache/flex/effects/Wipe.as
@@ -140,15 +140,20 @@ public class Wipe extends Tween implements IDocument
public function onTweenUpdate(value:Number):void
{
- trace(actualTarget, value);
wiper.visibleRect = new Rectangle(0, 0, actualTarget.width, value);
}
public function onTweenEnd(value:Number):void
{
// WipeUp makes something disappear
- if (direction == "up")
+ if (direction == "up") {
actualTarget.visible = false;
+ COMPILE::JS {
+ //reset height in js
+ actualTarget.positioner.style.height = this.startValue+"px";
+ }
+ }
+
wiper.target = null;
}
}