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/03/06 02:55:32 UTC
[1/2] incubator-weex git commit: * [android] fix NPE in
input/textarea component
Repository: incubator-weex
Updated Branches:
refs/heads/0.11-dev 33ba60a47 -> 0666504b7
* [android] fix NPE in input/textarea component
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/a1175933
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/a1175933
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/a1175933
Branch: refs/heads/0.11-dev
Commit: a1175933edf05cfa8531c8edd9ee02a6f3d53abb
Parents: a910602
Author: sospartan <so...@gmail.com>
Authored: Fri Mar 3 14:18:27 2017 +0800
Committer: sospartan <so...@gmail.com>
Committed: Fri Mar 3 14:18:27 2017 +0800
----------------------------------------------------------------------
.../weex/ui/component/AbstractEditComponent.java | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a1175933/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 21063d9..d2fb083 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
@@ -227,6 +227,7 @@ 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.WXTimeInputHelper;
@@ -343,13 +344,18 @@ 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 = getDomObject().getEvents().contains(Constants.Event.CHANGE) ? Constants.Event.CHANGE : null;
+ String event = domObject.getEvents().contains(Constants.Event.CHANGE) ? Constants.Event.CHANGE : null;
fireEvent(event, newValue.toString());
mLastValue = text.getText().toString();
}
@@ -360,11 +366,12 @@ public abstract class AbstractEditComponent extends WXComponent<WXEditText> {
addEditorActionListener(new TextView.OnEditorActionListener() {
@Override
public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
- if (actionId == mEditorAction) {
+ ImmutableDomObject domObject = getDomObject();
+ if (domObject != null && actionId == mEditorAction) {
CharSequence newValue = text.getText();
newValue = newValue == null ? "" : newValue;
if (!newValue.toString().equals(mLastValue)) {
- String eventName = getDomObject().getEvents().contains(Constants.Event.CHANGE) ? Constants.Event.CHANGE : null;
+ String eventName = domObject.getEvents().contains(Constants.Event.CHANGE) ? Constants.Event.CHANGE : null;
fireEvent(eventName, newValue.toString());
mLastValue = text.getText().toString();
}
@@ -386,11 +393,12 @@ public abstract class AbstractEditComponent extends WXComponent<WXEditText> {
@Override
public void onTextChanged(CharSequence s, int start, int before, int count) {
- if (mBeforeText.equals(s.toString())) {
+ ImmutableDomObject domObject = getDomObject();
+ if (mBeforeText.equals(s.toString()) || domObject == null) {
return;
}
- String event = getDomObject().getEvents().contains(Constants.Event.INPUT) ? Constants.Event.INPUT : null;
+ String event = domObject.getEvents().contains(Constants.Event.INPUT) ? Constants.Event.INPUT : null;
fireEvent(event, s.toString());
mBeforeText = s.toString();
[2/2] incubator-weex git commit: Merge branch '0.11-dev' of
https://git-wip-us.apache.org/repos/asf/incubator-weex;
branch '0.11-dev-fixinputnpe' of github.com:sospartan/incubator-weex into
0.11-dev This closes #24
Posted by so...@apache.org.
Merge branch '0.11-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex; branch '0.11-dev-fixinputnpe' of github.com:sospartan/incubator-weex into 0.11-dev
This closes #24
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/0666504b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/0666504b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/0666504b
Branch: refs/heads/0.11-dev
Commit: 0666504b790476ba64270c324676132570f3ca29
Parents: 33ba60a a117593
Author: sospartan <so...@gmail.com>
Authored: Mon Mar 6 10:55:13 2017 +0800
Committer: sospartan <so...@gmail.com>
Committed: Mon Mar 6 10:55:13 2017 +0800
----------------------------------------------------------------------
.../weex/ui/component/AbstractEditComponent.java | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
----------------------------------------------------------------------