flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [10/12] git commit: [flex-asjs] [refs/heads/develop] - fix wipe
Date Mon, 12 Jan 2015 18:51:02 GMT
fix wipe


Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/637fdc36
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/637fdc36
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/637fdc36

Branch: refs/heads/develop
Commit: 637fdc3696a3e21c80dc5b78b1f9feab40759b78
Parents: 26e15fc
Author: Alex Harui <aharui@apache.org>
Authored: Mon Jan 12 10:47:56 2015 -0800
Committer: Alex Harui <aharui@apache.org>
Committed: Mon Jan 12 10:47:56 2015 -0800

----------------------------------------------------------------------
 .../org/apache/flex/effects/PlatformWiper.js    | 24 +++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/637fdc36/frameworks/js/FlexJS/src/org/apache/flex/effects/PlatformWiper.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/effects/PlatformWiper.js b/frameworks/js/FlexJS/src/org/apache/flex/effects/PlatformWiper.js
index 3b37c73..9f0e9b9 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/effects/PlatformWiper.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/effects/PlatformWiper.js
@@ -29,6 +29,13 @@ org.apache.flex.effects.PlatformWiper = function() {
    */
   this.target_ = null;
 
+
+  /**
+   * @private
+   * @type {Object}
+   */
+  this.overflow_ = null;
+
 };
 
 
@@ -49,9 +56,16 @@ org.apache.flex.effects.PlatformWiper.prototype.FLEXJS_CLASS_INFO =
  */
 org.apache.flex.effects.PlatformWiper.prototype.set_target =
     function(target) {
-  if (target == null)
-      delete this.target_.positioner.style.clip;
+  if (target == null) {
+    if (this.overflow_ == null)
+      delete this.target_.positioner.style.overflow;
+    else
+      this.target_.positioner.style.overflow = this.overflow_;
+  }
   this.target_ = target;
+  if (target != null) {
+    this.overflow_ = this.target_.positioner.style.overflow;
+  }
 };
 
 
@@ -62,10 +76,14 @@ org.apache.flex.effects.PlatformWiper.prototype.set_target =
  */
 org.apache.flex.effects.PlatformWiper.prototype.set_visibleRect =
     function(rect) {
+  /*
   var styleString = 'rect(';
   styleString += rect.top.toString() + 'px,';
   styleString += rect.width.toString() + 'px,';
   styleString += rect.height.toString() + 'px,';
-  styleString += rect.left.toString() + 'px,)';
+  styleString += rect.left.toString() + 'px)';
   this.target_.positioner.style.clip = styleString;
+  */
+  this.target_.positioner.style.height = rect.height.toString() + 'px';
+  this.target_.positioner.style.overflow = 'hidden';
 };


Mime
View raw message