You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by cx...@apache.org on 2017/03/24 03:42:27 UTC
[1/8] incubator-weex git commit: + [ios] texture add maxlength ,
because android textarea has this attributes
Repository: incubator-weex
Updated Branches:
refs/heads/0.12-dev d81b16a4c -> 7359e64ef
+ [ios] texture add maxlength ,because android textarea has this attributes
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/7b99f4a3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/7b99f4a3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/7b99f4a3
Branch: refs/heads/0.12-dev
Commit: 7b99f4a3b53089fe43d4731bb143ce9fa21de0f4
Parents: a67604c
Author: kfeagle <su...@163.com>
Authored: Thu Mar 16 10:09:08 2017 +0800
Committer: kfeagle <su...@163.com>
Committed: Thu Mar 16 10:09:08 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Component/WXEditComponent.m | 9 +++++++++
1 file changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7b99f4a3/ios/sdk/WeexSDK/Sources/Component/WXEditComponent.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXEditComponent.m b/ios/sdk/WeexSDK/Sources/Component/WXEditComponent.m
index 7851b41..28efd3c 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXEditComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXEditComponent.m
@@ -607,6 +607,15 @@ WX_EXPORT_METHOD(@selector(getSelectionRange:))
[self fireEvent:@"return" params:@{@"value":[textView text],@"returnKeyType":typeStr} domChanges:@{@"attrs":@{@"value":[textView text]}}];
}
}
+
+ if (_maxLength) {
+ NSUInteger oldLength = [textView.text length];
+ NSUInteger replacementLength = [text length];
+ NSUInteger rangeLength = range.length;
+ NSUInteger newLength = oldLength - rangeLength + replacementLength;
+ return newLength <= [_maxLength integerValue] ;
+ }
+
return YES;
}
[3/8] incubator-weex git commit: + [ios] add macaca test case for
texture maxlength
Posted by cx...@apache.org.
+ [ios] add macaca test case for texture maxlength
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/cf884be8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/cf884be8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/cf884be8
Branch: refs/heads/0.12-dev
Commit: cf884be8ebcc622e4dd1ec19b30688a8744b3158
Parents: 995f4cc
Author: kfeagle <su...@163.com>
Authored: Thu Mar 23 17:08:31 2017 +0800
Committer: kfeagle <su...@163.com>
Committed: Thu Mar 23 17:08:31 2017 +0800
----------------------------------------------------------------------
.../WeexSDK/Sources/Component/WXEditComponent.m | 3 ++
test/pages/components/textarea-maxlength.vue | 44 ++++++++++++++++++++
.../components/textarea-maxlength.test.js | 35 ++++++++++++++++
3 files changed, 82 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/cf884be8/ios/sdk/WeexSDK/Sources/Component/WXEditComponent.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXEditComponent.m b/ios/sdk/WeexSDK/Sources/Component/WXEditComponent.m
index 28efd3c..6bd3390 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXEditComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXEditComponent.m
@@ -348,6 +348,9 @@ WX_EXPORT_METHOD(@selector(getSelectionRange:))
}
if (attributes[@"value"]) {
_value = [WXConvert NSString:attributes[@"value"]]?:@"";
+ if (_maxLength && [_value length] > [_maxLength integerValue]&& [_maxLength integerValue]> 0) {
+ _value = [_value substringToIndex:([_maxLength integerValue])];
+ }
[self setText:_value];
}
if (attributes[@"returnKeyType"]) {
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/cf884be8/test/pages/components/textarea-maxlength.vue
----------------------------------------------------------------------
diff --git a/test/pages/components/textarea-maxlength.vue b/test/pages/components/textarea-maxlength.vue
new file mode 100644
index 0000000..796ea2b
--- /dev/null
+++ b/test/pages/components/textarea-maxlength.vue
@@ -0,0 +1,44 @@
+<template>
+ <div class="wrapper">
+ <text style="font-size:30">test textarea maxlenght</text>
+ <textarea id="textarea" class="textarea" value="" maxlength=4 @input="oninput" @change="onchange" ></textarea>
+ </div>
+</template>
+<script>
+ const modal = weex.requireModule('modal')
+ export default {
+ methods: {
+ oninput (event) {
+ console.log('oninput:', event.value)
+ modal.toast({
+ message: `oninput: ${event.value}`,
+ duration: 0.8
+ })
+ },
+ onchange (event) {
+ console.log('onchange:', event.value)
+ modal.toast({
+ message: `onchange: ${event.value}`,
+ duration: 0.8
+ })
+ },
+ }
+ }
+</script>
+<style>
+ .textarea {
+ font-size: 50px;
+ width: 650px;
+ margin-top: 50px;
+ margin-left: 50px;
+ padding-top: 20px;
+ padding-bottom: 20px;
+ padding-left: 20px;
+ padding-right: 20px;
+ color: #666666;
+ border-width: 2px;
+ border-style: solid;
+ border-color: #41B883;
+ maxlength:10;
+ }
+</style>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/cf884be8/test/scripts/components/textarea-maxlength.test.js
----------------------------------------------------------------------
diff --git a/test/scripts/components/textarea-maxlength.test.js b/test/scripts/components/textarea-maxlength.test.js
new file mode 100644
index 0000000..f40368c
--- /dev/null
+++ b/test/scripts/components/textarea-maxlength.test.js
@@ -0,0 +1,35 @@
+'use strict';
+
+var _ = require('macaca-utils');
+var assert = require('chai').assert
+var wd = require('weex-wd')
+var path = require('path');
+var os = require('os');
+var util = require("../util.js");
+
+describe('textarea maxlength vue test2 ', function () {
+ this.timeout(util.getTimeoutMills());
+ var driver = util.createDriver(wd);
+
+ before(function () {
+ return util.init(driver)
+ .get('wxpage://' + util.getDeviceHost() +'/components/textarea-maxlength.js')
+ .waitForElementByXPath('//div/text[1]',util.getGETActionWaitTimeMills(),1000)
+ });
+
+ after(function () {
+ return util.quit(driver)
+ })
+
+ it('#1 textarea maxlenght', () => {
+ return driver
+ .waitForElementByXPath('//div/textarea')
+ .sendKeys('12345678')
+ .elementByXPath('//div/textarea')
+ .text()
+ .then((text)=>{
+ assert.equal(text,'1234')
+ })
+ })
+
+});
\ No newline at end of file
[2/8] incubator-weex git commit: Merge branch '0.12-dev' of
https://github.com/apache/incubator-weex into
ios-feature-textarea-maxlength-0.12-dev
Posted by cx...@apache.org.
Merge branch '0.12-dev' of https://github.com/apache/incubator-weex into ios-feature-textarea-maxlength-0.12-dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/995f4ccb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/995f4ccb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/995f4ccb
Branch: refs/heads/0.12-dev
Commit: 995f4ccbed49fe5d87ddefc0c0fa426ae5e1e76c
Parents: 7b99f4a 1066ec6
Author: kfeagle <su...@163.com>
Authored: Thu Mar 16 17:03:22 2017 +0800
Committer: kfeagle <su...@163.com>
Committed: Thu Mar 16 17:03:22 2017 +0800
----------------------------------------------------------------------
.../taobao/weex/dom/action/GetComponentRectAction.java | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
[7/8] incubator-weex git commit: + [ios] android macaca support
Posted by cx...@apache.org.
+ [ios] android macaca support
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/7ec3bb72
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/7ec3bb72
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/7ec3bb72
Branch: refs/heads/0.12-dev
Commit: 7ec3bb72d02dc377f495fcbcdce9a2308768618a
Parents: 217bfe8
Author: kfeagle <su...@163.com>
Authored: Fri Mar 24 11:14:21 2017 +0800
Committer: kfeagle <su...@163.com>
Committed: Fri Mar 24 11:14:21 2017 +0800
----------------------------------------------------------------------
test/pages/components/textarea-maxlength.vue | 8 +++++++-
test/scripts/components/textarea-maxlength.test.js | 3 ++-
2 files changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7ec3bb72/test/pages/components/textarea-maxlength.vue
----------------------------------------------------------------------
diff --git a/test/pages/components/textarea-maxlength.vue b/test/pages/components/textarea-maxlength.vue
index f77b559..12bfff3 100644
--- a/test/pages/components/textarea-maxlength.vue
+++ b/test/pages/components/textarea-maxlength.vue
@@ -1,14 +1,20 @@
<template>
<div class="wrapper">
- <text style="font-size:30">test textarea maxlenght</text>
+ <text style="font-size:30">{{value}}</text>
<textarea id="textarea" class="textarea" value="" autofocus="true" maxlength=4 @input="oninput" @change="onchange" ></textarea>
</div>
</template>
<script>
const modal = weex.requireModule('modal')
export default {
+ data () {
+ return {
+ value:'1'
+ }
+ },
methods: {
oninput (event) {
+ this.value = event.value
console.log('oninput:', event.value)
modal.toast({
message: `oninput: ${event.value}`,
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7ec3bb72/test/scripts/components/textarea-maxlength.test.js
----------------------------------------------------------------------
diff --git a/test/scripts/components/textarea-maxlength.test.js b/test/scripts/components/textarea-maxlength.test.js
index f40368c..7cd72a1 100644
--- a/test/scripts/components/textarea-maxlength.test.js
+++ b/test/scripts/components/textarea-maxlength.test.js
@@ -25,7 +25,8 @@ describe('textarea maxlength vue test2 ', function () {
return driver
.waitForElementByXPath('//div/textarea')
.sendKeys('12345678')
- .elementByXPath('//div/textarea')
+ .sleep(2000)
+ .elementByXPath('//div/text[1]')
.text()
.then((text)=>{
assert.equal(text,'1234')
[8/8] incubator-weex git commit: Merge branch
'ios-feature-textarea-maxlength-0.12-dev' of
https://github.com/kfeagle/incubator-weex into 0.12-dev
Posted by cx...@apache.org.
Merge branch 'ios-feature-textarea-maxlength-0.12-dev' of https://github.com/kfeagle/incubator-weex into 0.12-dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/7359e64e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/7359e64e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/7359e64e
Branch: refs/heads/0.12-dev
Commit: 7359e64efee4afa56c7d74ba57cfa6f783ea56f2
Parents: d81b16a 7ec3bb7
Author: cxfeng <cx...@apache.org>
Authored: Fri Mar 24 11:42:09 2017 +0800
Committer: cxfeng <cx...@apache.org>
Committed: Fri Mar 24 11:42:09 2017 +0800
----------------------------------------------------------------------
.../WeexSDK/Sources/Component/WXEditComponent.m | 12 +++++
package.json | 2 +-
test/pages/components/textarea-maxlength.vue | 50 ++++++++++++++++++++
.../components/textarea-maxlength.test.js | 36 ++++++++++++++
4 files changed, 99 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7359e64e/package.json
----------------------------------------------------------------------
[5/8] incubator-weex git commit: + [ios] add 0 limit
Posted by cx...@apache.org.
+ [ios] add 0 limit
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/63291832
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/63291832
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/63291832
Branch: refs/heads/0.12-dev
Commit: 63291832403a1b131440c17348ede734e5460672
Parents: a532a1b
Author: kfeagle <su...@163.com>
Authored: Thu Mar 23 17:49:53 2017 +0800
Committer: kfeagle <su...@163.com>
Committed: Thu Mar 23 17:49:53 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Component/WXEditComponent.m | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/63291832/ios/sdk/WeexSDK/Sources/Component/WXEditComponent.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXEditComponent.m b/ios/sdk/WeexSDK/Sources/Component/WXEditComponent.m
index 6bd3390..2f377ed 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXEditComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXEditComponent.m
@@ -348,7 +348,7 @@ WX_EXPORT_METHOD(@selector(getSelectionRange:))
}
if (attributes[@"value"]) {
_value = [WXConvert NSString:attributes[@"value"]]?:@"";
- if (_maxLength && [_value length] > [_maxLength integerValue]&& [_maxLength integerValue]> 0) {
+ if (_maxLength && [_value length] > [_maxLength integerValue]&& [_maxLength integerValue] >= 0) {
_value = [_value substringToIndex:([_maxLength integerValue])];
}
[self setText:_value];
[4/8] incubator-weex git commit: + [ios] update package ison for iOS
test
Posted by cx...@apache.org.
+ [ios] update package ison for iOS test
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/a532a1b9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/a532a1b9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/a532a1b9
Branch: refs/heads/0.12-dev
Commit: a532a1b9cd2459628fe725fa497bc391debf94b0
Parents: cf884be
Author: kfeagle <su...@163.com>
Authored: Thu Mar 23 17:12:41 2017 +0800
Committer: kfeagle <su...@163.com>
Committed: Thu Mar 23 17:12:41 2017 +0800
----------------------------------------------------------------------
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a532a1b9/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index 69980e8..f8e9df6 100644
--- a/package.json
+++ b/package.json
@@ -143,7 +143,7 @@
"weex-components": "^0.2.0",
"weex-loader": "^0.4.0",
"weex-vdom-tester": "^0.2.0",
- "weex-wd": "^1.0.14",
+ "weex-wd": "^1.0.17",
"wwp": "^0.3.5",
"xml2map": "^1.0.2"
}
[6/8] incubator-weex git commit: + [ios] add autofocus for test case
Posted by cx...@apache.org.
+ [ios] add autofocus for test case
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/217bfe8a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/217bfe8a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/217bfe8a
Branch: refs/heads/0.12-dev
Commit: 217bfe8aba02397ecf131d11e2e910d3b2d0b4f4
Parents: 6329183
Author: kfeagle <su...@163.com>
Authored: Fri Mar 24 09:59:04 2017 +0800
Committer: kfeagle <su...@163.com>
Committed: Fri Mar 24 09:59:04 2017 +0800
----------------------------------------------------------------------
test/pages/components/textarea-maxlength.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/217bfe8a/test/pages/components/textarea-maxlength.vue
----------------------------------------------------------------------
diff --git a/test/pages/components/textarea-maxlength.vue b/test/pages/components/textarea-maxlength.vue
index 796ea2b..f77b559 100644
--- a/test/pages/components/textarea-maxlength.vue
+++ b/test/pages/components/textarea-maxlength.vue
@@ -1,7 +1,7 @@
<template>
<div class="wrapper">
<text style="font-size:30">test textarea maxlenght</text>
- <textarea id="textarea" class="textarea" value="" maxlength=4 @input="oninput" @change="onchange" ></textarea>
+ <textarea id="textarea" class="textarea" value="" autofocus="true" maxlength=4 @input="oninput" @change="onchange" ></textarea>
</div>
</template>
<script>