You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by so...@apache.org on 2017/06/22 05:27:22 UTC
[17/50] [abbrv] incubator-weex git commit: * [android] remove some
reference of DomObject on input
* [android] remove some reference of DomObject on input
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/259c1e02
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/259c1e02
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/259c1e02
Branch: refs/heads/dev
Commit: 259c1e02ce37382fdab451c5d6570f1898db39ee
Parents: ccdde2d
Author: moxun.ljf <fu...@foxmail.com>
Authored: Mon Jun 12 16:10:06 2017 +0800
Committer: sospartan <so...@apache.org>
Committed: Thu Jun 15 14:02:32 2017 +0800
----------------------------------------------------------------------
.../ui/component/AbstractEditComponent.java | 33 +++++++-------------
1 file changed, 11 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/259c1e02/android/sdk/src/main/java/com/taobao/weex/ui/component/AbstractEditComponent.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/AbstractEditComponent.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/AbstractEditComponent.java
index 84c42dc..bf8935e 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/AbstractEditComponent.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/AbstractEditComponent.java
@@ -41,7 +41,6 @@ import com.taobao.weex.WXSDKManager;
import com.taobao.weex.annotation.JSMethod;
import com.taobao.weex.bridge.WXBridgeManager;
import com.taobao.weex.common.Constants;
-import com.taobao.weex.dom.ImmutableDomObject;
import com.taobao.weex.dom.WXDomObject;
import com.taobao.weex.dom.WXStyle;
import com.taobao.weex.ui.component.helper.SoftKeyboardDetector;
@@ -155,8 +154,6 @@ public abstract class AbstractEditComponent extends WXComponent<WXEditText> {
}
editText.setTextSize(TypedValue.COMPLEX_UNIT_PX, WXStyle.getFontSize(getDomObject().getStyles(),getInstance().getInstanceViewPortWidth()));
- editText.setText(getDomObject().getAttrs().optString(Constants.Name.VALUE));
- mIgnoreNextOnInputEvent = true;
}
@@ -172,19 +169,13 @@ public abstract class AbstractEditComponent extends WXComponent<WXEditText> {
addFocusChangeListener(new OnFocusChangeListener() {
@Override
public void onFocusChange(boolean hasFocus) {
- ImmutableDomObject domObject = getDomObject();
- if(domObject == null){
- return;
- }
-
if (hasFocus) {
mLastValue = text.getText().toString();
} else {
CharSequence newValue = text.getText();
newValue = newValue == null ? "" : newValue;
if (!newValue.toString().equals(mLastValue)) {
- String event = domObject.getEvents().contains(Constants.Event.CHANGE) ? Constants.Event.CHANGE : null;
- fireEvent(event, newValue.toString());
+ fireEvent(Constants.Event.CHANGE, newValue.toString());
mLastValue = text.getText().toString();
}
}
@@ -194,13 +185,11 @@ public abstract class AbstractEditComponent extends WXComponent<WXEditText> {
addEditorActionListener(new TextView.OnEditorActionListener() {
@Override
public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
- ImmutableDomObject domObject = getDomObject();
- if (domObject != null && actionId == mEditorAction) {
+ if (actionId == mEditorAction) {
CharSequence newValue = text.getText();
newValue = newValue == null ? "" : newValue;
if (!newValue.toString().equals(mLastValue)) {
- String eventName = domObject.getEvents().contains(Constants.Event.CHANGE) ? Constants.Event.CHANGE : null;
- fireEvent(eventName, newValue.toString());
+ fireEvent(Constants.Event.CHANGE, newValue.toString());
mLastValue = text.getText().toString();
}
if (getParent() != null) {
@@ -221,8 +210,7 @@ public abstract class AbstractEditComponent extends WXComponent<WXEditText> {
@Override
public void onTextChanged(CharSequence s, int start, int before, int count) {
- ImmutableDomObject domObject = getDomObject();
- if (mBeforeText.equals(s.toString()) || domObject == null) {
+ if (mBeforeText.equals(s.toString())) {
return;
}
@@ -233,8 +221,7 @@ public abstract class AbstractEditComponent extends WXComponent<WXEditText> {
return;
}
- String event = domObject.getEvents().contains(Constants.Event.INPUT) ? Constants.Event.INPUT : null;
- fireEvent(event, s.toString());
+ fireEvent(Constants.Event.INPUT, s.toString());
}
@Override
@@ -281,8 +268,10 @@ public abstract class AbstractEditComponent extends WXComponent<WXEditText> {
}
public void performOnChange(String value) {
- String event = getDomObject().getEvents().contains(Constants.Event.CHANGE) ? Constants.Event.CHANGE : null;
- fireEvent(event, value);
+ if (getDomObject() != null && getDomObject().getEvents() != null) {
+ String event = getDomObject().getEvents().contains(Constants.Event.CHANGE) ? Constants.Event.CHANGE : null;
+ fireEvent(event, value);
+ }
}
@Override
@@ -447,9 +436,9 @@ public abstract class AbstractEditComponent extends WXComponent<WXEditText> {
return;
}
- view.setText(value);
- view.setSelection(value == null?0:value.length());
mIgnoreNextOnInputEvent = true;
+ view.setText(value);
+ view.setSelection(value == null ? 0 : value.length());
}
@WXComponentProp(name = Constants.Name.COLOR)