Repository: incubator-weex Updated Branches: refs/heads/master a4882e7b2 -> 84b41b710
[WEEX-160] overflow hidden default off Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/84b41b71 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/84b41b71 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/84b41b71 Branch: refs/heads/master Commit: 84b41b710079e3917c96e7c0247b8a3df1578f69 Parents: a4882e7 Author: jianbai.gbj <jianbai....@alibaba-inc.com> Authored: Fri Dec 8 18:18:59 2017 +0800 Committer: jianbai.gbj <jianbai....@alibaba-inc.com> Committed: Fri Dec 8 18:18:59 2017 +0800 ---------------------------------------------------------------------- .../sdk/src/main/java/com/taobao/weex/common/Constants.java | 4 ++++ .../sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java | 8 ++------ 2 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/84b41b71/android/sdk/src/main/java/com/taobao/weex/common/Constants.java ---------------------------------------------------------------------- diff --git a/android/sdk/src/main/java/com/taobao/weex/common/Constants.java b/android/sdk/src/main/java/com/taobao/weex/common/Constants.java index 3991f27..bc1676b 100644 --- a/android/sdk/src/main/java/com/taobao/weex/common/Constants.java +++ b/android/sdk/src/main/java/com/taobao/weex/common/Constants.java @@ -192,6 +192,10 @@ public class Constants { String HAS_FIXED_SIZE = "hasFixedSize"; String KEEP_POSITION_LAYOUT_DELAY = "keepPositionLayoutDelay"; + String OVERFLOW_HIDDEN_HEIGHT = "overflowHiddenHeight"; + String OVERFLOW_HIDDEN_WIDTH = "overflowHiddenWidth"; + + interface Recycler{ String LIST_DATA = "listData"; String LIST_DATA_ITEM ="alias"; http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/84b41b71/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java ---------------------------------------------------------------------- diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java b/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java index 3bcc075..19007c3 100644 --- a/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java +++ b/android/sdk/src/main/java/com/taobao/weex/dom/WXDomObject.java @@ -318,9 +318,7 @@ public class WXDomObject extends CSSNode implements Cloneable,ImmutableDomObject @Override public void setStyleHeight(float height) { - if(getStyles().containsKey(Constants.Name.OVERFLOW) && TextUtils.equals(Constants.Value.HIDDEN, - WXUtils.getString(getStyles().get(Constants.Name.OVERFLOW), null)) - && !getStyles().containsKey(Constants.Name.MAX_HEIGHT)){ + if(getAttrs().containsKey(Name.OVERFLOW_HIDDEN_HEIGHT)){ super.setStyleHeight(height); super.setMaxHeight(height); }else{ @@ -330,9 +328,7 @@ public class WXDomObject extends CSSNode implements Cloneable,ImmutableDomObject @Override public void setStyleWidth(float width) { - if(getStyles().containsKey(Constants.Name.OVERFLOW) && TextUtils.equals(Constants.Value.HIDDEN, - WXUtils.getString(getStyles().get(Constants.Name.OVERFLOW), null)) - && !getStyles().containsKey(Name.MAX_WIDTH)){ + if(getAttrs().containsKey(Name.OVERFLOW_HIDDEN_WIDTH)){ super.setStyleWidth(width); super.setMaxWidth(width); }else{
