date:20170418

incubator-weex git commit: * [ios] set usingCoretext false default

2017-04-18 Thread cxfeng

Repository: incubator-weex
Updated Branches:
  refs/heads/0.12-dev 82f9a325f -> a6b0767eb


* [ios] set usingCoretext false default


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/a6b0767e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/a6b0767e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/a6b0767e

Branch: refs/heads/0.12-dev
Commit: a6b0767eb0135e455264f1f41d1aa0ef5704008d
Parents: 82f9a32
Author: acton393 
Authored: Wed Apr 19 11:44:52 2017 +0800
Committer: acton393 
Committed: Wed Apr 19 11:44:52 2017 +0800

--
 ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m | 2 +-
 ios/sdk/WeexSDK/Sources/WeexSDK.h   | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a6b0767e/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m
--
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m 
b/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m
index 005ca1a..09b255d 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m
@@ -80,7 +80,7 @@
 
 @end
 
-static BOOL textRenderUsingCoreText = YES;
+static BOOL textRenderUsingCoreText = NO;
 
 NSString *const WXTextTruncationToken = @"\u2026";
 CGFloat WXTextDefaultLineThroughWidth = 1.2;

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a6b0767e/ios/sdk/WeexSDK/Sources/WeexSDK.h
--
diff --git a/ios/sdk/WeexSDK/Sources/WeexSDK.h 
b/ios/sdk/WeexSDK/Sources/WeexSDK.h
index d8ac443..72b86f4 100644
--- a/ios/sdk/WeexSDK/Sources/WeexSDK.h
+++ b/ios/sdk/WeexSDK/Sources/WeexSDK.h
@@ -48,7 +48,6 @@
 #import "WXDefine.h"
 #import "WXDebugTool.h"
 #import "WXConvert.h"
-#import "WXConfigProtocol.h"
 #import "WXComponentManager.h"
 #import "WXComponent.h"
 #import "WXBridgeProtocol.h"

[1/2] incubator-weex git commit: * [test] Add watch ability for macaca

2017-04-18 Thread kyork

Repository: incubator-weex
Updated Branches:
  refs/heads/0.12-dev 9d6648840 -> 82f9a325f


* [test] Add watch ability for macaca


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/4c175a68
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/4c175a68
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/4c175a68

Branch: refs/heads/0.12-dev
Commit: 4c175a680537c9e75ba554c09902f4acb0e0d6fa
Parents: 8ce111a
Author: YorkShen 
Authored: Wed Apr 12 11:32:10 2017 +0800
Committer: YorkShen 
Committed: Tue Apr 18 16:14:16 2017 +0800

--
 package.json  | 4 ++--
 test/serve.sh | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/4c175a68/package.json
--
diff --git a/package.json b/package.json
index 156eaee..3887a64 100644
--- a/package.json
+++ b/package.json
@@ -47,8 +47,8 @@
 "build:examples:native": "webpack --config 
build/webpack.examples.config.js",
 "build:examples:web": "webpack --config 
build/webpack.examples.web.config.js",
 "build:test": "webpack --config build/webpack.test.config.js",
-"build:ci:web": "webpack --config build/webpack.ci.web.config.js",
-"build:ci:native": "webpack --config build/webpack.ci.config.js",
+"build:ci:web": "webpack --watch --config build/webpack.ci.web.config.js",
+"build:ci:native": "webpack --watch --config build/webpack.ci.config.js",
 "build:ci": "npm run build:ci:native && npm run build:ci:web",
 "build": "npm run build:native && npm run build:browser && npm run 
build:vue && npm run build:examples && npm run build:test",
 "dist:vue": "npm run build:vue && bash ./bin/dist-vue.sh",

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/4c175a68/test/serve.sh
--
diff --git a/test/serve.sh b/test/serve.sh
index b23dbfd..1b3f18a 100755
--- a/test/serve.sh
+++ b/test/serve.sh
@@ -1,4 +1,4 @@
 #!/bin/bash -eu
 npm run build:vue
-npm run build:ci
+npm run build:ci &
 npm run serve:ui-test 
\ No newline at end of file

[2/2] incubator-weex git commit: Merge branch 'test-macaca' of https://github.com/YorkShen/incubator-weex into 0.12-dev

2017-04-18 Thread kyork

Merge branch 'test-macaca' of https://github.com/YorkShen/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/82f9a325
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/82f9a325
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/82f9a325

Branch: refs/heads/0.12-dev
Commit: 82f9a325f7978ed3ca0dbe0bb24eeae5efa9620e
Parents: 9d66488 4c175a6
Author: YorkShen 
Authored: Wed Apr 19 10:20:11 2017 +0800
Committer: YorkShen 
Committed: Wed Apr 19 10:20:11 2017 +0800

--
 package.json  | 4 ++--
 test/serve.sh | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
--

[1/4] incubator-weex git commit: * [test] update case about line-height

2017-04-18 Thread kyork

Repository: incubator-weex
Updated Branches:
  refs/heads/0.12-dev 90c358303 -> 9d6648840


* [test] update case about line-height


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/9d664884
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/9d664884
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/9d664884

Branch: refs/heads/0.12-dev
Commit: 9d6648840946f172d7a1eb4edfc8ea5256209711
Parents: 347180c
Author: YorkShen 
Authored: Tue Apr 18 18:53:15 2017 +0800
Committer: YorkShen 
Committed: Tue Apr 18 19:48:52 2017 +0800

--
 test/scripts/components/text.test.js | 174 +++---
 1 file changed, 86 insertions(+), 88 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9d664884/test/scripts/components/text.test.js
--
diff --git a/test/scripts/components/text.test.js 
b/test/scripts/components/text.test.js
index 2924c7c..d280eda 100644
--- a/test/scripts/components/text.test.js
+++ b/test/scripts/components/text.test.js
@@ -14,120 +14,118 @@ describe('weex text', function () {
   before(function () {
 return util.init(driver)
   .get(util.getPage('/components/text-layout.js'))
-  .waitForElementById("lines", util.getGETActionWaitTimeMills(),1000)
+  .waitForElementById("lines", util.getGETActionWaitTimeMills(), 1000)
   });
 
   after(function () {
-  // return util.quit(driver);
+// return util.quit(driver);
   })
 
 
-  let scaleFactor = 0 
+  let scaleFactor = 0
   let screenWidth = 0
-  it ('#1 Window size', () =>{
+  it('#1 Window size', () => {
 return driver
-.getWindowSize()
-.then(size=>{
-  screenWidth =  size.width
-  scaleFactor = screenWidth/ 750
-})
+  .getWindowSize()
+  .then(size => {
+screenWidth = size.width
+scaleFactor = screenWidth / 750
+  })
   })
 
   it('#2 Text Content', () => {
 return driver
-.elementById('text-only')
-.text()
-.then((text)=>{
-  assert.equal(text,'Hello World')
-})
+  .elementById('text-only')
+  .text()
+  .then((text) => {
+assert.equal(text, 'Hello World')
+  })
   })
 
-  it ('#3 Line Height', () =>{
+  it('#3 Line Height', () => {
 return driver
-.elementById('lines')
-.getRect()
-.then(rect => {
-   console.log(rect)
-   console.log(screenWidth)
-   assert.equal(rect.width, screenWidth)
-   assert.closeTo(rect.height, 32 * scaleFactor*2, 2)
-   scroll(rect.height)
-})
+  .elementById('lines')
+  .getRect()
+  .then(rect => {
+assert.equal(rect.width, screenWidth)
+assert.closeTo(rect.height, 32 * scaleFactor * 2, 2)
+scroll(rect.height)
+  })
   })
 
-   it ('#4 Font Size', () =>{
+  it('#4 Font Size', () => {
 return driver
-.elementById('font')
-.getRect()
-.then(rect => {
-   assert.equal(rect.width, screenWidth)
-   assert.isAtLeast(rect.height, Math.floor(2 * 48 * scaleFactor))
-   scroll(rect.height)
-})
+  .elementById('font')
+  .getRect()
+  .then(rect => {
+assert.equal(rect.width, screenWidth)
+assert.isAtLeast(rect.height, Math.floor(2 * 48 * scaleFactor))
+scroll(rect.height)
+  })
   })
 
-   it ('#5 Fixed-Size', () =>{
+  it('#5 Fixed-Size', () => {
 return driver
-.elementById('fixed-size')
-.getRect()
-.then(rect => {
-   assert.equal(rect.width, Math.floor(300 * scaleFactor))
-   assert.equal(rect.height, Math.floor(100 * scaleFactor))
-   scroll(rect.height)
-})
+  .elementById('fixed-size')
+  .getRect()
+  .then(rect => {
+assert.equal(rect.width, Math.floor(300 * scaleFactor))
+assert.equal(rect.height, Math.floor(100 * scaleFactor))
+scroll(rect.height)
+  })
   })
 
-   it ('#6 flex:1; align-Items: stretch; flex-direction:row', () =>{
+  it('#6 flex:1; align-Items: stretch; flex-direction:row', () => {
 return driver
-.elementById('flexgrow-alignitems')
-.getRect()
-.then(rect => {
-   assert.equal(rect.width, Math.floor(500 * scaleFactor))
-   assert.equal(rect.height, Math.floor(300 * scaleFactor))
-   scroll(rect.height)
-})
-   })
-  
-   it ('#7 flex:1; align-Items: center; flex-direction:row', () =>{
+  .elementById('flexgrow-alignitems')
+  .getRect()
+  .then(rect => {
+assert.equal(rect.width, Math.floor(500 * scaleFactor))
+assert.equal(rect.height, Math.floor(300 * scaleFactor))
+scroll(rect.height)
+  })
+  })
+
+  it('#7 flex:1; align-Items: center; flex-direction:row', () => {
 return driver
-

[2/4] incubator-weex git commit: * [android] Add log to see CI fails

2017-04-18 Thread kyork

* [android] Add log to see CI fails


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/758ee8e2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/758ee8e2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/758ee8e2

Branch: refs/heads/0.12-dev
Commit: 758ee8e25b4670d5366f26a10c96e43c329e7e63
Parents: 4720025
Author: YorkShen 
Authored: Tue Apr 18 16:52:28 2017 +0800
Committer: YorkShen 
Committed: Tue Apr 18 19:48:52 2017 +0800

--
 test/scripts/components/text.test.js | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/758ee8e2/test/scripts/components/text.test.js
--
diff --git a/test/scripts/components/text.test.js 
b/test/scripts/components/text.test.js
index 3c7c347..36ea91c 100644
--- a/test/scripts/components/text.test.js
+++ b/test/scripts/components/text.test.js
@@ -47,6 +47,8 @@ describe('weex text', function () {
 .elementById('lines')
 .getRect()
 .then(rect => {
+   console.log(rect)
+   console.log(screenWidth)
assert.equal(rect.width, screenWidth)
assert.equal(rect.height, Math.floor(2 * 32 * scaleFactor))
scroll(rect.height)

[4/4] incubator-weex git commit: * [test] add Macaca test case for text The test case mainly focus on the layout of text.

2017-04-18 Thread kyork

* [test] add Macaca test case for text
The test case mainly focus on the layout of text.


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/47200259
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/47200259
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/47200259

Branch: refs/heads/0.12-dev
Commit: 47200259b356c88ddb8fe6925522fb66a5089139
Parents: 90c3583
Author: YorkShen 
Authored: Wed Apr 12 11:33:11 2017 +0800
Committer: YorkShen 
Committed: Tue Apr 18 19:48:52 2017 +0800

--
 test/pages/components/text-layout.vue |  30 +++
 test/scripts/components/text.test.js  | 131 +
 2 files changed, 161 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/47200259/test/pages/components/text-layout.vue
--
diff --git a/test/pages/components/text-layout.vue 
b/test/pages/components/text-layout.vue
new file mode 100644
index 000..e73e64c
--- /dev/null
+++ b/test/pages/components/text-layout.vue
@@ -0,0 +1,30 @@
+
+  
+Hello World
+æ°¸åä¹å¹´ï¼å²å¨ç¸ä¸ï¼æ®æ¥ä¹åï¼ä¼äºä¼ç¨½å±±é´ä¹å

°äºã\n\tç¾¤è´¤æ¯è³ï¼å°é¿å¸éãæ¤å°æå´å±±å³»é¢ï¼èæè©ç«¹ï¼åææ¸
æµæ¿æ¹ï¼æå¸¦å·¦å³ãå¼ä»¥ä¸ºæµè§æ²æ°´ï¼ååå¶æ¬¡ã\n\tLet us 
not seek to satisfy our thirst for freedom. \n\tAgain and again, we must rise 
to the majestic heights of meeting physical force with soul force.
+å
¶å½¢ä¹ï¼ç¿©è¥æé¸¿ï¼å©è¥æ¸¸é¾ï¼è£æç§èï¼åèæ¥æ¾ãé«£é«´å
®è¥è½»äºä¹è½æï¼é£é£å
®è¥æµé£ä¹åéªãè¿èæä¹ï¼çè¥å¤ªé³åæéãè¿«èå¯ä¹ï¼ç¼è¥èèåºæ¸æ³¢ãç§¾çº¤å¾è¡·ï¼ä¿®çååº¦ãè©è¥åæï¼è
°å¦çº¦ç´ ãå»¶é¢ç§é¡¹ï¼çè´¨åé²ï¼è³æ³½æ å ï¼é
åå¼å¾¡ãäºé«»å³¨å³¨ï¼ä¿®çèå¨ï¼ä¸¹åå¤æï¼çé½¿å
é²ãæç¸åçï¼é¥è¾æ¿æï¼çå§¿è³é¸ï¼ä»ªéä½é²ãææ
ç»°æï¼åªäºè¯è¨ãå¥ææ·ä¸ï¼éª¨ååºå¾ãæ«ç½è¡£ä¹çç²²å
®ï¼ç¥ç¶ç¢§ä¹åçãæ´éç¿ ä¹é¦é¥°ï¼ç¼æç 
ä»¥èèº¯ãè·µè¿æ¸¸ä¹æå±¥ï¼æ³é¾ç»¡ä¹è½»è£¾ãå¾®å¹½å°ä¹è³è¼å
®ï¼æ¥è¸è¹°äºå±±é
ãäºæ¯å¿½ççºµä½ï¼ä»¥é¨ä»¥å¬ãå·¦åéæï¼å³è«æ¡æãæçè
äºç¥æµå®ï¼éæ¹æ¿ä¹çèã
+å£¬æä¹ç§ï¼ä¸ææ¢æï¼èåä¸å®¢æ³èæ¸¸äºèµ¤å£ä¹ä¸ãæ¸
é£å¾æ¥ï¼æ°´æ³¢ä¸å´ãä¸¾éå±å®¢ï¼è¯µææä¹è¯ï¼æçªçªä¹ç« 
ãå°çï¼æåºäºä¸å±±ä¹ä¸ï¼å¾å¾äºæçä¹é´ãç½é²æ¨ªæ±ï¼æ°´å
æ¥å¤©ãçºµä¸èä¹æå¦ï¼åä¸é¡·ä¹è«ç¶ãæµ©æµ©ä¹å¦å¯èå¾¡é£ï¼èä¸ç¥å
¶ææ¢ï¼é£é£ä¹å¦éä¸ç¬ç«,ç¾½åèç»ä»ã
+
+  Hello 
+
+
+
+  World
+
+
+
+  Hello 
+
+
+
+  World
+
+  
+
+
+
+.wrapper{
+width: 750px;
+background-color: yellow;
+}
+
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/47200259/test/scripts/components/text.test.js
--
diff --git a/test/scripts/components/text.test.js 
b/test/scripts/components/text.test.js
new file mode 100644
index 000..3c7c347
--- /dev/null
+++ b/test/scripts/components/text.test.js
@@ -0,0 +1,131 @@
+'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('weex text', function () {
+  this.timeout(util.getTimeoutMills());
+  var driver = util.createDriver(wd);
+
+  before(function () {
+return util.init(driver)
+  .get(util.getPage('/components/text-layout.js'))
+  .waitForElementById("lines", util.getGETActionWaitTimeMills(),1000)
+  });
+
+  after(function () {
+  // return util.quit(driver);
+  })
+
+
+  let scaleFactor = 0 
+  let screenWidth = 0
+  it ('#1 Window size', () =>{
+return driver
+.getWindowSize()
+.then(size=>{
+  screenWidth =  size.width
+  scaleFactor = screenWidth/ 750
+})
+  })
+
+  it('#2 Text Content', () => {
+return driver
+.elementById('text-only')
+.text()
+.then((text)=>{
+  assert.equal(text,'Hello World')
+})
+  })
+
+  it ('#3 Line Height', () =>{
+return driver
+.elementById('lines')
+.getRect()
+.then(rect => {
+   assert.equal(rect.width, screenWidth)
+   assert.equal(rect.height, Math.floor(2 * 32 * scaleFactor))
+   scroll(rect.height)
+})
+  })
+
+   it ('#4 Font Size', () =>{
+return driver
+.elementById('font')
+.getRect()
+.then(rect => {
+   assert.equal(rect.width, screenWidth)
+

[3/5] incubator-weex git commit: * [ios] remove unused line

2017-04-18 Thread bobning

* [ios] remove unused line


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/5985968f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/5985968f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/5985968f

Branch: refs/heads/0.12-dev
Commit: 5985968fb4392f8a469da732343dea1d41400a6a
Parents: bc2d964
Author: acton393 
Authored: Tue Apr 18 10:12:36 2017 +0800
Committer: acton393 
Committed: Tue Apr 18 10:12:36 2017 +0800

--
 ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5985968f/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m
--
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m 
b/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m
index c4c8cd3..fed8dd5 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m
@@ -726,7 +726,6 @@ do {\
 CTLineTruncationType truncationType = kCTLineTruncationEnd;
 NSAttributedString *attributedString = [self buildCTAttributeString];
 NSAttributedString * lastLineText = [attributedString 
attributedSubstringFromRange: 
WXNSRangeFromCFRange(CTLineGetStringRange(lastLine))];
-//NSMutableAttributedString *.mutableCopy;
 NSMutableAttributedString *mutableLastLineText = 
lastLineText.mutableCopy;
 [mutableLastLineText appendAttributedString:truncationToken];
 CTLineRef ctLastLineExtend = 
CTLineCreateWithAttributedString((__bridge 
CFAttributedStringRef)mutableLastLineText);
@@ -819,7 +818,7 @@ do {\
 actualLineCount ++;
 }
 
-totalHeight = totalHeight + actualLineCount*leading;
+totalHeight = totalHeight + actualLineCount * leading;
 CFRelease(frameRef);
 
 return CGSizeMake(suggestSize.width, totalHeight);

[4/5] incubator-weex git commit: Merge remote-tracking branch 'upstream/0.12-dev' into iOS-0.12-dev-text-refactor

2017-04-18 Thread bobning

Merge remote-tracking branch 'upstream/0.12-dev' into iOS-0.12-dev-text-refactor


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/1fd7c08f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/1fd7c08f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/1fd7c08f

Branch: refs/heads/0.12-dev
Commit: 1fd7c08f61e6932f3641d1adcfaab5257be2d90d
Parents: 5985968 24ef3af
Author: acton393 
Authored: Tue Apr 18 17:58:28 2017 +0800
Committer: acton393 
Committed: Tue Apr 18 17:58:28 2017 +0800

--
 .travis.yml | 42 +--
 NOTICE  | 75 
 WeexSDK.podspec | 45 
 android/run-ci.sh   |  2 +-
 .../com/taobao/weex/ui/component/WXEmbed.java   |  2 +-
 examples/component/input-demo.we| 14 ++--
 examples/index.we   |  5 +-
 examples/vue/components/input.vue   | 14 ++--
 examples/vue/index.vue  |  3 +
 examples/vue/market/gcanvas.vue | 40 +++
 ios/playground/Podfile  |  5 +-
 .../WeexDemo.xcodeproj/project.pbxproj  |  4 +-
 ios/sdk/WeexSDK.podspec | 47 
 .../WeexSDK/Sources/Bridge/WXBridgeContext.m|  2 +-
 ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m |  2 +-
 .../Sources/Component/WXSliderComponent.m   | 53 +++---
 .../Sources/Controller/WXBaseViewController.h   |  2 +-
 .../Sources/Controller/WXBaseViewController.m   | 16 -
 .../Sources/Controller/WXRootViewController.m   | 17 -
 ios/sdk/WeexSDK/Sources/Utility/WXUtility.m |  1 +
 .../Sources/View/WXComponent+ViewManagement.m   |  4 +-
 ios/sdk/WeexSDK/Sources/WeexSDK.h   | 33 -
 ios/sdk/WeexSDKTests/WXRootViewTests.m  |  4 +-
 ios/sdk/buildScripts.sh | 25 +--
 package.json|  4 +-
 test/ci-funcs.sh| 75 +++-
 test/run.sh | 41 ++-
 test/scripts/components/image-onload.test.js|  2 +-
 test/scripts/components/recycler.test.js|  2 +-
 29 files changed, 333 insertions(+), 248 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1fd7c08f/WeexSDK.podspec
--
diff --cc WeexSDK.podspec
index 000,8279ec3..ae1b6a9
mode 00,100644..100644
--- a/WeexSDK.podspec
+++ b/WeexSDK.podspec
@@@ -1,0 -1,45 +1,45 @@@
+ # coding: utf-8
+ Pod::Spec.new do |s|
+ 
+   s.name = "WeexSDK"
+ 
 -  s.version  = "0.11.0"
++  s.version  = "0.12.0"
+ 
+   s.summary  = "WeexSDK Source ."
+ 
+   s.description  = <<-DESC
+A framework for building Mobile cross-platform UI
+DESC
+ 
+   s.homepage = "https://github.com/alibaba/weex;
+   s.license = {
+ :type => 'Copyright',
+ :text => <<-LICENSE
+Alibaba-INC copyright
+ LICENSE
+   }
+   s.authors  = { "cxfeng1"  => "cxfe...@gmail.com",
+  "boboning" => "ningli...@163.com",
+  "yangshengtao" => "yangshengtao1...@163.com",
+  "kfeagle"  => "sunjjb...@163.com",
+  "acton393" => "zhangxing610...@gmail.com"
+}
+   s.platform = :ios
+   s.ios.deployment_target = '7.0'
+   s.source =  { :path => '.' }
+   s.source_files = 'ios/sdk/WeexSDK/Sources/**/*.{h,m,mm,c}'
+   s.resources = 'ios/sdk/WeexSDK/Resources/main.js', 
'ios/sdk/WeexSDK/Resources/wx_load_er...@3x.png'
+ 
+   s.requires_arc = true
+   s.prefix_header_file = 'ios/sdk/WeexSDK/Sources/Supporting 
Files/WeexSDK-Prefix.pch'
+ 
+ #  s.xcconfig = { "GCC_PREPROCESSOR_DEFINITIONS" => '$(inherited) DEBUG=1' }
+ 
+   s.xcconfig = { "OTHER_LINK_FLAG" => '$(inherited) -ObjC'}
+ 
+   s.frameworks = 
'CoreMedia','MediaPlayer','AVFoundation','AVKit','JavaScriptCore', 'GLKit'
+ 
+   s.dependency 'SocketRocket'
+   s.libraries = "stdc++"
+ 
+ end

[1/5] incubator-weex git commit: * [ios] draw ellipse and support letter-spacing

2017-04-18 Thread bobning

Repository: incubator-weex
Updated Branches:
  refs/heads/0.12-dev 24ef3af94 -> 90c358303


* [ios] draw ellipse  and support letter-spacing


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/242b1ec0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/242b1ec0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/242b1ec0

Branch: refs/heads/0.12-dev
Commit: 242b1ec04c0153dffc472635a5ea507b98a133fc
Parents: 5ea9966
Author: acton393 
Authored: Mon Apr 17 20:46:42 2017 +0800
Committer: acton393 
Committed: Mon Apr 17 20:46:42 2017 +0800

--
 .../WeexSDK/Sources/Component/WXTextComponent.h |   1 +
 .../WeexSDK/Sources/Component/WXTextComponent.m | 259 +++
 2 files changed, 212 insertions(+), 48 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/242b1ec0/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.h
--
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.h 
b/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.h
index 627b774..e993366 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.h
+++ b/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.h
@@ -22,4 +22,5 @@
 @interface WXTextComponent : WXComponent
 
 + (void)setRenderUsingCoreText:(BOOL)usingCoreText;
+- (BOOL)useCoreText;
 @end

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/242b1ec0/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m
--
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m 
b/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m
index f9906ad..c4c8cd3 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m
@@ -80,10 +80,13 @@
 
 @end
 
-static BOOL textRenderUsingCoreText = NO;
+static BOOL textRenderUsingCoreText = YES;
+
+NSString *const WXTextTruncationToken = @"\u2026";
+CGFloat WXTextDefaultLineThroughWidth = 1.2;
 
 @interface WXTextComponent()
-@property (nonatomic, assign)BOOL useCoreTextAttr;
+@property (nonatomic, assign) NSString *useCoreTextAttr;
 @end
 
 @implementation WXTextComponent
@@ -104,6 +107,8 @@ static BOOL textRenderUsingCoreText = NO;
 WXTextDecoration _textDecoration;
 NSString *_textOverflow;
 CGFloat _lineHeight;
+CGFloat _letterSpacing;
+BOOL _truncationLine; // support trunk tail
 }
 
 + (void)setRenderUsingCoreText:(BOOL)usingCoreText
@@ -127,9 +132,9 @@ static BOOL textRenderUsingCoreText = NO;
 if (self) {
 // just for coretext and textkit render replacement
 if ([attributes objectForKey:@"coretext"]) {
-_useCoreTextAttr = [WXConvert BOOL:attributes[@"coretext"]];
+_useCoreTextAttr = [WXConvert NSString:attributes[@"coretext"]];
 } else {
-_useCoreTextAttr = NO;
+_useCoreTextAttr = nil;
 }
 
 [self fillCSSStyles:styles];
@@ -141,9 +146,12 @@ static BOOL textRenderUsingCoreText = NO;
 
 - (BOOL)useCoreText
 {
-if (_useCoreTextAttr) {
+if ([_useCoreTextAttr isEqualToString:@"yes"]) {
 return YES;
 }
+if ([_useCoreTextAttr isEqualToString:@"false"]) {
+return NO;
+}
 if ([WXTextComponent textRenderUsingCoreText]) {
 return YES;
 }
@@ -191,6 +199,7 @@ do {\
 WX_STYLE_FILL_TEXT(textDecoration, textDecoration, WXTextDecoration, YES)
 WX_STYLE_FILL_TEXT(textOverflow, textOverflow, NSString, NO)
 WX_STYLE_FILL_TEXT_PIXEL(lineHeight, lineHeight, YES)
+WX_STYLE_FILL_TEXT_PIXEL(letterSpacing, letterSpacing, YES)
 
 UIEdgeInsets padding = {
 WXFloorPixelValue(self.cssNode->style.padding[CSS_TOP] + 
self.cssNode->style.border[CSS_TOP]),
@@ -229,7 +238,13 @@ do {\
 
 - (void)viewDidLoad
 {
-((WXText *)self.view).textStorage = _textStorage;
+BOOL useCoreText = NO;
+if ([self.view.wx_component 
isKindOfClass:NSClassFromString(@"WXTextComponent")] && [self.view.wx_component 
respondsToSelector:@selector(useCoreText)]) {
+useCoreText = [(WXTextComponent*)self.view.wx_component useCoreText];
+}
+if (!useCoreText) {
+((WXText *)self.view).textStorage = _textStorage;
+}
 [self setNeedsDisplay];
 }
 
@@ -363,11 +378,11 @@ do {\
 }
 
 // set default lineBreakMode
-// TODO:default clip
 paragraphStyle.lineBreakMode = NSLineBreakByCharWrapping;
+_truncationLine = NO;
 if (_textOverflow && [_textOverflow length] > 0) {
 if (_lines && [_textOverflow isEqualToString:@"ellipsis"])
-paragraphStyle.lineBreakMode = NSLineBreakByTruncatingTail;
+

[7/8] incubator-weex git commit: Revert "* [ios] add config for componentWithName"

2017-04-18 Thread bobning

Revert "* [ios] add config for componentWithName"

This reverts commit b2d38557969853b34e4b803ea2aba7a02500d4b3.


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/aaa189f8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/aaa189f8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/aaa189f8

Branch: refs/heads/0.12-dev
Commit: aaa189f8181d27afd993fa39c53362f7d954ed77
Parents: f446000
Author: acton393 
Authored: Tue Apr 18 17:43:53 2017 +0800
Committer: acton393 
Committed: Tue Apr 18 17:43:53 2017 +0800

--
 .../Sources/Handler/WXConfigDefaultImpl.h   | 26 --
 .../Sources/Handler/WXConfigDefaultImpl.m   | 54 
 .../Sources/Manager/WXComponentFactory.m|  7 ---
 .../WeexSDK/Sources/Protocol/WXConfigProtocol.h | 27 --
 4 files changed, 114 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/aaa189f8/ios/sdk/WeexSDK/Sources/Handler/WXConfigDefaultImpl.h
--
diff --git a/ios/sdk/WeexSDK/Sources/Handler/WXConfigDefaultImpl.h 
b/ios/sdk/WeexSDK/Sources/Handler/WXConfigDefaultImpl.h
deleted file mode 100644
index ccd7280..000
--- a/ios/sdk/WeexSDK/Sources/Handler/WXConfigDefaultImpl.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#import 
-
-#import "WXConfigProtocol.h"
-
-@interface WXConfigDefaultImpl : NSObject
-
-@end

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/aaa189f8/ios/sdk/WeexSDK/Sources/Handler/WXConfigDefaultImpl.m
--
diff --git a/ios/sdk/WeexSDK/Sources/Handler/WXConfigDefaultImpl.m 
b/ios/sdk/WeexSDK/Sources/Handler/WXConfigDefaultImpl.m
deleted file mode 100644
index 1d2ebf5..000
--- a/ios/sdk/WeexSDK/Sources/Handler/WXConfigDefaultImpl.m
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#import "WXConfigDefaultImpl.h"
-#import "WXThreadSafeMutableDictionary.h"
-#import "WXUtility.h"
-
-@interface WXConfigDefaultImpl()
-@property(nonatomic, strong) WXThreadSafeMutableDictionary* configDic;
-@end
-@implementation WXConfigDefaultImpl
-
-- (instancetype)init
-{
-if (self = [super init]) {
-_configDic = [WXThreadSafeMutableDictionary new];
-}
-
-return self;
-}
-
-- (void)setClassWithName:(Class)className name:(NSString *)name
-{
-if (![WXUtility isBlankString:name] && className) {
-[_configDic setObject:className forKey:name];
-}
-}
-
-- (Class)classWithName:(NSString *)name
-{
-if (![WXUtility isBlankString:name]) {
-return [_configDic objectForKey:name];
-}
-
-return nil;
-}
-
-@end

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/aaa189f8/ios/sdk/WeexSDK/Sources/Manager/WXComponentFactory.m
--
diff --git a/ios/sdk/WeexSDK/Sources/Manager/WXComponentFactory.m 
b/ios/sdk/WeexSDK/Sources/Manager/WXComponentFactory.m
index 7589dfe..aa79bad 100644
--- a/ios/sdk/WeexSDK/Sources/Manager/WXComponentFactory.m
+++

[6/8] incubator-weex git commit: * [ios] remove white space

2017-04-18 Thread bobning

* [ios] remove white space


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/f446000c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/f446000c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/f446000c

Branch: refs/heads/0.12-dev
Commit: f446000cdfd468d6a083f7563b987e5f224a6869
Parents: b2d3855
Author: acton393 
Authored: Tue Apr 18 11:21:03 2017 +0800
Committer: acton393 
Committed: Tue Apr 18 11:21:03 2017 +0800

--
 ios/sdk/WeexSDK/Sources/Utility/WXUtility.m   | 1 +
 ios/sdk/WeexSDK/Sources/View/WXComponent+ViewManagement.m | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f446000c/ios/sdk/WeexSDK/Sources/Utility/WXUtility.m
--
diff --git a/ios/sdk/WeexSDK/Sources/Utility/WXUtility.m 
b/ios/sdk/WeexSDK/Sources/Utility/WXUtility.m
index 048e7bc..d2c2e1a 100644
--- a/ios/sdk/WeexSDK/Sources/Utility/WXUtility.m
+++ b/ios/sdk/WeexSDK/Sources/Utility/WXUtility.m
@@ -343,6 +343,7 @@ static BOOL WXNotStat;
 {
 NSMutableDictionary * linearGradient = nil;
 if ([backgroundImage hasPrefix:@"linear-gradient"] && [backgroundImage 
hasSuffix:@")"] ) {
+backgroundImage = [backgroundImage 
stringByReplacingOccurrencesOfString:@" " withString:@""];
 NSRange range = NSMakeRange(16, backgroundImage.length - 17);
 NSString *str = [backgroundImage substringWithRange:range];
 NSArray *array = [str componentsSeparatedByString:@","];

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f446000c/ios/sdk/WeexSDK/Sources/View/WXComponent+ViewManagement.m
--
diff --git a/ios/sdk/WeexSDK/Sources/View/WXComponent+ViewManagement.m 
b/ios/sdk/WeexSDK/Sources/View/WXComponent+ViewManagement.m
index 55e76b0..88f03d4 100644
--- a/ios/sdk/WeexSDK/Sources/View/WXComponent+ViewManagement.m
+++ b/ios/sdk/WeexSDK/Sources/View/WXComponent+ViewManagement.m
@@ -107,7 +107,7 @@
 - (void)_initViewPropertyWithStyles:(NSDictionary *)styles
 {
 _backgroundColor = styles[@"backgroundColor"] ? [WXConvert 
UIColor:styles[@"backgroundColor"]] : [UIColor clearColor];
-_backgroundImage = styles[@"backgroundImage"] ? [[WXConvert 
NSString:styles[@"backgroundImage"]]stringByReplacingOccurrencesOfString:@" " 
withString:@""]: nil;
+_backgroundImage = styles[@"backgroundImage"] ? [WXConvert 
NSString:styles[@"backgroundImage"]]: nil;
 _opacity = styles[@"opacity"] ? [WXConvert CGFloat:styles[@"opacity"]] : 
1.0;
 _clipToBounds = styles[@"overflow"] ? [WXConvert 
WXClipType:styles[@"overflow"]] : NO;
 _visibility = styles[@"visibility"] ? [WXConvert 
WXVisibility:styles[@"visibility"]] : WXVisibilityShow;
@@ -137,7 +137,7 @@
 }
 
 if (styles[@"backgroundImage"]) {
-_backgroundImage = styles[@"backgroundImage"] ? [[WXConvert 
NSString:styles[@"backgroundImage"]]stringByReplacingOccurrencesOfString:@" " 
withString:@""]: nil;
+_backgroundImage = styles[@"backgroundImage"] ? [WXConvert 
NSString:styles[@"backgroundImage"]]: nil;
 
 if (_backgroundImage) {
 [self setGradientLayer];

[3/8] incubator-weex git commit: Merge remote-tracking branch 'upstream/0.12-dev' into 0.12-dev

2017-04-18 Thread bobning

Merge remote-tracking branch 'upstream/0.12-dev' 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/b0260a2e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/b0260a2e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/b0260a2e

Branch: refs/heads/0.12-dev
Commit: b0260a2e20780f0770a7681a46e6c8682defcc17
Parents: 8b0f4a8 ca6a9ff
Author: acton393 
Authored: Tue Apr 18 10:13:36 2017 +0800
Committer: acton393 
Committed: Tue Apr 18 10:13:36 2017 +0800

--
 .../com/taobao/weex/ui/component/WXEmbed.java   |  2 +-
 .../Sources/Component/WXSliderComponent.m   | 53 +++-
 2 files changed, 9 insertions(+), 46 deletions(-)
--

[2/8] incubator-weex git commit: Merge remote-tracking branch 'upstream/0.12-dev' into 0.12-dev

2017-04-18 Thread bobning

Merge remote-tracking branch 'upstream/0.12-dev' 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/8b0f4a81
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/8b0f4a81
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/8b0f4a81

Branch: refs/heads/0.12-dev
Commit: 8b0f4a813e647acdf9c15256a56b7a95815624e0
Parents: 7b34ccc 5ea9966
Author: acton393 
Authored: Mon Apr 17 17:56:40 2017 +0800
Committer: acton393 
Committed: Mon Apr 17 17:56:40 2017 +0800

--
 android/commons/src/main/AndroidManifest.xml|  18 +
 .../java/com/alibaba/weex/ApplicationTest.java  |   4 +-
 .../com/alibaba/weex/WeappJsBaseTestCase.java   |   4 +-
 .../benchmark/BenchmarkActivityTestRule.java|   4 +-
 .../alibaba/weex/benchmark/BenchmarkTest.java   |   4 +-
 .../com/alibaba/weex/benchmark/BoxPlot.java |   4 +-
 .../java/com/alibaba/weex/benchmark/Repeat.java |   4 +-
 .../com/alibaba/weex/benchmark/RepeatRule.java  |   4 +-
 .../weex/benchmark/WeexNativeCompareTest.java   |   4 +-
 .../weex/uitest/TC_AG/AG_AHref_A_Href.java  |  18 +
 .../TC_AG/AG_Border_A_Border_Bottom_Color.java  |  18 +
 .../AG_Border_A_Border_Bottom_Left_Radius.java  |  18 +
 .../AG_Border_A_Border_Bottom_Right_Radius.java |  18 +
 .../TC_AG/AG_Border_A_Border_Bottom_Width.java  |  18 +
 .../uitest/TC_AG/AG_Border_A_Border_Color.java  |  18 +
 .../TC_AG/AG_Border_A_Border_Left_Color.java|  18 +
 .../TC_AG/AG_Border_A_Border_Left_Width.java|  18 +
 .../uitest/TC_AG/AG_Border_A_Border_Radius.java |  18 +
 .../TC_AG/AG_Border_A_Border_Right_Color.java   |  18 +
 .../TC_AG/AG_Border_A_Border_Right_Width.java   |  18 +
 .../uitest/TC_AG/AG_Border_A_Border_Style.java  |  18 +
 .../TC_AG/AG_Border_A_Border_Top_Color.java |  18 +
 .../AG_Border_A_Border_Top_Left_Radius.java |  18 +
 .../AG_Border_A_Border_Top_Right_Radius.java|  18 +
 .../TC_AG/AG_Border_A_Border_Top_Width.java |  18 +
 .../uitest/TC_AG/AG_Border_A_Border_Width.java  |  18 +
 .../AG_Border_Div_Border_Bottom_Color.java  |  18 +
 ...AG_Border_Div_Border_Bottom_Left_Radius.java |  18 +
 ...G_Border_Div_Border_Bottom_Right_Radius.java |  18 +
 .../AG_Border_Div_Border_Bottom_Width.java  |  18 +
 .../TC_AG/AG_Border_Div_Border_Color.java   |  18 +
 .../TC_AG/AG_Border_Div_Border_Left_Color.java  |  18 +
 .../TC_AG/AG_Border_Div_Border_Left_Width.java  |  18 +
 .../TC_AG/AG_Border_Div_Border_Radius.java  |  18 +
 .../TC_AG/AG_Border_Div_Border_Right_Color.java |  18 +
 .../TC_AG/AG_Border_Div_Border_Right_Width.java |  18 +
 .../TC_AG/AG_Border_Div_Border_Style.java   |  18 +
 .../TC_AG/AG_Border_Div_Border_Top_Color.java   |  18 +
 .../AG_Border_Div_Border_Top_Left_Radius.java   |  18 +
 .../AG_Border_Div_Border_Top_Right_Radius.java  |  18 +
 .../TC_AG/AG_Border_Div_Border_Top_Width.java   |  18 +
 .../TC_AG/AG_Border_Div_Border_Width.java   |  18 +
 .../AG_Border_Image_Border_Bottom_Color.java|  18 +
 ..._Border_Image_Border_Bottom_Left_Radius.java |  18 +
 ...Border_Image_Border_Bottom_Right_Radius.java |  18 +
 .../AG_Border_Image_Border_Bottom_Width.java|  18 +
 .../TC_AG/AG_Border_Image_Border_Color.java |  18 +
 .../AG_Border_Image_Border_Left_Color.java  |  18 +
 .../AG_Border_Image_Border_Left_Width.java  |  18 +
 .../TC_AG/AG_Border_Image_Border_Radius.java|  18 +
 .../AG_Border_Image_Border_Right_Color.java |  18 +
 .../AG_Border_Image_Border_Right_Width.java |  18 +
 .../TC_AG/AG_Border_Image_Border_Style.java |  18 +
 .../TC_AG/AG_Border_Image_Border_Top_Color.java |  18 +
 .../AG_Border_Image_Border_Top_Left_Radius.java |  18 +
 ...AG_Border_Image_Border_Top_Right_Radius.java |  18 +
 .../TC_AG/AG_Border_Image_Border_Top_Width.java |  18 +
 .../TC_AG/AG_Border_Image_Border_Width.java |  18 +
 .../AG_Border_Input_Border_Bottom_Color.java|  18 +
 ..._Border_Input_Border_Bottom_Left_Radius.java |  18 +
 ...Border_Input_Border_Bottom_Right_Radius.java |  18 +
 .../AG_Border_Input_Border_Bottom_Width.java|  18 +
 .../TC_AG/AG_Border_Input_Border_Color.java |  18 +
 .../AG_Border_Input_Border_Left_Color.java  |  18 +
 .../AG_Border_Input_Border_Left_Width.java  |  18 +
 .../TC_AG/AG_Border_Input_Border_Radius.java|  18 +
 .../AG_Border_Input_Border_Right_Color.java |  18 +
 .../AG_Border_Input_Border_Right_Width.java |  18 +
 .../TC_AG/AG_Border_Input_Border_Style.java |  18 +
 .../TC_AG/AG_Border_Input_Border_Top_Color.java |  18 +
 .../AG_Border_Input_Border_Top_Left_Radius.java |  18 +
 ...AG_Border_Input_Border_Top_Right_Radius.java |  18 +
 .../TC_AG/AG_Border_Input_Border_Top_Width.java |  18 +
 .../TC_AG/AG_Border_Input_Border_Width.java |  18 +
 .../AG_Border_Switch_Border_Bottom_Color.java   |  18 +

[5/8] incubator-weex git commit: * [ios] add config for componentWithName

2017-04-18 Thread bobning

* [ios] add config for componentWithName


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/b2d38557
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/b2d38557
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/b2d38557

Branch: refs/heads/0.12-dev
Commit: b2d38557969853b34e4b803ea2aba7a02500d4b3
Parents: e433321
Author: acton393 
Authored: Tue Apr 18 11:09:31 2017 +0800
Committer: acton393 
Committed: Tue Apr 18 11:09:31 2017 +0800

--
 .../Sources/Handler/WXConfigDefaultImpl.h   | 26 ++
 .../Sources/Handler/WXConfigDefaultImpl.m   | 54 
 .../Sources/Manager/WXComponentFactory.m|  7 +++
 .../WeexSDK/Sources/Protocol/WXConfigProtocol.h | 27 ++
 4 files changed, 114 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b2d38557/ios/sdk/WeexSDK/Sources/Handler/WXConfigDefaultImpl.h
--
diff --git a/ios/sdk/WeexSDK/Sources/Handler/WXConfigDefaultImpl.h 
b/ios/sdk/WeexSDK/Sources/Handler/WXConfigDefaultImpl.h
new file mode 100644
index 000..ccd7280
--- /dev/null
+++ b/ios/sdk/WeexSDK/Sources/Handler/WXConfigDefaultImpl.h
@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#import 
+
+#import "WXConfigProtocol.h"
+
+@interface WXConfigDefaultImpl : NSObject
+
+@end

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b2d38557/ios/sdk/WeexSDK/Sources/Handler/WXConfigDefaultImpl.m
--
diff --git a/ios/sdk/WeexSDK/Sources/Handler/WXConfigDefaultImpl.m 
b/ios/sdk/WeexSDK/Sources/Handler/WXConfigDefaultImpl.m
new file mode 100644
index 000..1d2ebf5
--- /dev/null
+++ b/ios/sdk/WeexSDK/Sources/Handler/WXConfigDefaultImpl.m
@@ -0,0 +1,54 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#import "WXConfigDefaultImpl.h"
+#import "WXThreadSafeMutableDictionary.h"
+#import "WXUtility.h"
+
+@interface WXConfigDefaultImpl()
+@property(nonatomic, strong) WXThreadSafeMutableDictionary* configDic;
+@end
+@implementation WXConfigDefaultImpl
+
+- (instancetype)init
+{
+if (self = [super init]) {
+_configDic = [WXThreadSafeMutableDictionary new];
+}
+
+return self;
+}
+
+- (void)setClassWithName:(Class)className name:(NSString *)name
+{
+if (![WXUtility isBlankString:name] && className) {
+[_configDic setObject:className forKey:name];
+}
+}
+
+- (Class)classWithName:(NSString *)name
+{
+if (![WXUtility isBlankString:name]) {
+return [_configDic objectForKey:name];
+}
+
+return nil;
+}
+
+@end

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b2d38557/ios/sdk/WeexSDK/Sources/Manager/WXComponentFactory.m
--
diff --git a/ios/sdk/WeexSDK/Sources/Manager/WXComponentFactory.m 
b/ios/sdk/WeexSDK/Sources/Manager/WXComponentFactory.m
index aa79bad..7589dfe 100644
--- a/ios/sdk/WeexSDK/Sources/Manager/WXComponentFactory.m
+++ b/ios/sdk/WeexSDK/Sources/Manager/WXComponentFactory.m
@@ -21,6 +21,8 @@
 #import "WXAssert.h"
 #import

[4/8] incubator-weex git commit: * [ios] update license header script

2017-04-18 Thread bobning

* [ios] update license header script


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/e4333210
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/e4333210
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/e4333210

Branch: refs/heads/0.12-dev
Commit: e43332101477b45ff544df7219111efaeac3c3b0
Parents: b0260a2
Author: acton393 
Authored: Tue Apr 18 11:06:58 2017 +0800
Committer: acton393 
Committed: Tue Apr 18 11:06:58 2017 +0800

--
 ios/sdk/WeexSDK/Sources/WeexSDK.h | 33 +
 ios/sdk/buildScripts.sh   | 25 ++---
 2 files changed, 35 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e4333210/ios/sdk/WeexSDK/Sources/WeexSDK.h
--
diff --git a/ios/sdk/WeexSDK/Sources/WeexSDK.h 
b/ios/sdk/WeexSDK/Sources/WeexSDK.h
index 400324e..d8ac443 100644
--- a/ios/sdk/WeexSDK/Sources/WeexSDK.h
+++ b/ios/sdk/WeexSDK/Sources/WeexSDK.h
@@ -1,20 +1,20 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+* Licensed to the Apache Software Foundation (ASF) under one 
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
  */
 
 #ifdef __OBJC__
@@ -48,6 +48,7 @@
 #import "WXDefine.h"
 #import "WXDebugTool.h"
 #import "WXConvert.h"
+#import "WXConfigProtocol.h"
 #import "WXComponentManager.h"
 #import "WXComponent.h"
 #import "WXBridgeProtocol.h"

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e4333210/ios/sdk/buildScripts.sh
--
diff --git a/ios/sdk/buildScripts.sh b/ios/sdk/buildScripts.sh
index 8e168b4..8f8fe80 100644
--- a/ios/sdk/buildScripts.sh
+++ b/ios/sdk/buildScripts.sh
@@ -5,12 +5,23 @@
 function generateFileHeader() {
headerFilePath=$1
headerFileName=`basename $1`
-   echo '/**' > $headerFilePath
-   echo ' * Created by Weex.' >> $headerFilePath
-   echo ' * Copyright (c) 2016, Alibaba, Inc. All rights reserved.' >> 
$headerFilePath
-   echo ' * ' >> $headerFilePath
-   echo ' * This source code is licensed under the Apache Licence 2.0.' >> 
$headerFilePath
-   echo ' * For the full copyright and license information,please view the 
LICENSE file in the root directory of this source tree.' >> $headerFilePath
+   echo '/*' > $headerFilePath
+echo '* Licensed to the Apache Software Foundation (ASF) under one 
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.' >> $headerFilePath
echo ' */' >> $headerFilePath

[1/8] incubator-weex git commit: * [ios] expose js error code

2017-04-18 Thread bobning

Repository: incubator-weex
Updated Branches:
  refs/heads/0.12-dev 8ce111a7d -> 24ef3af94


* [ios] expose js error code


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/7b34ccc5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/7b34ccc5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/7b34ccc5

Branch: refs/heads/0.12-dev
Commit: 7b34ccc5fa8adbb602b17822edc7a916f5c24508
Parents: 4139337
Author: acton393 
Authored: Mon Apr 17 14:00:56 2017 +0800
Committer: acton393 
Committed: Mon Apr 17 14:00:56 2017 +0800

--
 ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7b34ccc5/ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m
--
diff --git a/ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m 
b/ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m
index bce33dd..5f837cc 100644
--- a/ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m
+++ b/ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m
@@ -124,7 +124,7 @@
 
 WXSDKInstance *instance = [WXSDKEngine topInstance];
 if ([jsExceptionHandler 
respondsToSelector:@selector(onJSException:)]) {
-WXJSExceptionInfo * jsExceptionInfo = [[WXJSExceptionInfo 
alloc] initWithInstanceId:instance.instanceId bundleUrl:[instance.scriptURL 
absoluteString] errorCode:@"" functionName:@"" exception:[NSString 
stringWithFormat:@"%@\n%@",[exception toString], exception[@"stack"]] 
userInfo:nil];
+WXJSExceptionInfo * jsExceptionInfo = [[WXJSExceptionInfo 
alloc] initWithInstanceId:instance.instanceId bundleUrl:[instance.scriptURL 
absoluteString] errorCode:[NSString stringWithFormat:@"%d", WX_ERR_JS_EXECUTE] 
functionName:@"" exception:[NSString stringWithFormat:@"%@\n%@",[exception 
toString], exception[@"stack"]] userInfo:nil];
 [jsExceptionHandler onJSException:jsExceptionInfo];
 }
 WX_MONITOR_FAIL(WXMTJSBridge, WX_ERR_JS_EXECUTE, message);

[incubator-weex] Git Push Summary

2017-04-18 Thread sospartan

Repository: incubator-weex
Updated Branches:
  refs/heads/0.11.0-stable [deleted] 8c0c47588

[3/7] incubator-weex git commit: --

2017-04-18 Thread sospartan

--


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/8c2b6a29
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/8c2b6a29
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/8c2b6a29

Branch: refs/heads/0.12-dev
Commit: 8c2b6a2956475ab50fd3b64dcde9c3d105ee788f
Parents: 5529bb1
Author: xuyouhong <1647064...@qq.com>
Authored: Mon Apr 17 15:29:59 2017 +0800
Committer: xuyouhong <1647064...@qq.com>
Committed: Mon Apr 17 15:29:59 2017 +0800

--
 .../Sources/Controller/WXBaseViewController.h  |  2 +-
 .../Sources/Controller/WXBaseViewController.m  | 16 
 .../Sources/Controller/WXRootViewController.m  | 17 -
 3 files changed, 17 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8c2b6a29/ios/sdk/WeexSDK/Sources/Controller/WXBaseViewController.h
--
diff --git a/ios/sdk/WeexSDK/Sources/Controller/WXBaseViewController.h 
b/ios/sdk/WeexSDK/Sources/Controller/WXBaseViewController.h
index daf96e3..f834803 100644
--- a/ios/sdk/WeexSDK/Sources/Controller/WXBaseViewController.h
+++ b/ios/sdk/WeexSDK/Sources/Controller/WXBaseViewController.h
@@ -15,7 +15,7 @@
  * special bundle URL.
  */
 
-@interface WXBaseViewController : UIViewController 

+@interface WXBaseViewController : UIViewController
 
 /**
  * @abstract initializes the viewcontroller with bundle url.

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8c2b6a29/ios/sdk/WeexSDK/Sources/Controller/WXBaseViewController.m
--
diff --git a/ios/sdk/WeexSDK/Sources/Controller/WXBaseViewController.m 
b/ios/sdk/WeexSDK/Sources/Controller/WXBaseViewController.m
index 1523675..9051ed7 100644
--- a/ios/sdk/WeexSDK/Sources/Controller/WXBaseViewController.m
+++ b/ios/sdk/WeexSDK/Sources/Controller/WXBaseViewController.m
@@ -66,7 +66,6 @@
 - (void)viewDidLoad
 {
 [super viewDidLoad];
-[self addEdgePop];
 self.view.backgroundColor = [UIColor whiteColor];
 self.automaticallyAdjustsScrollViewInsets = NO;
 [self _renderWithURL:_sourceURL];
@@ -106,21 +105,6 @@
 [self _renderWithURL:_sourceURL];
 }
 
-- (void)addEdgePop
-{
-self.navigationController.interactivePopGestureRecognizer.delegate = self;
-}
-
-#pragma mark- UIGestureRecognizerDelegate
-
-- (BOOL)gestureRecognizerShouldBegin:(UIGestureRecognizer *)gestureRecognizer
-{
-if (!self.navigationController || 
[self.navigationController.viewControllers count] == 1) {
-return NO;
-}
-return YES;
-}
-
 - (void)_renderWithURL:(NSURL *)sourceURL
 {
 if (!sourceURL) {

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8c2b6a29/ios/sdk/WeexSDK/Sources/Controller/WXRootViewController.m
--
diff --git a/ios/sdk/WeexSDK/Sources/Controller/WXRootViewController.m 
b/ios/sdk/WeexSDK/Sources/Controller/WXRootViewController.m
index befb010..e25cc07 100644
--- a/ios/sdk/WeexSDK/Sources/Controller/WXRootViewController.m
+++ b/ios/sdk/WeexSDK/Sources/Controller/WXRootViewController.m
@@ -12,7 +12,7 @@
 
 typedef void(^OperationBlock)(void);
 
-@interface WXRootViewController()
+@interface WXRootViewController() 
 
 @property(nonatomic, strong) WXThreadSafeMutableArray *operationArray;
 @property (nonatomic, assign) BOOL operationInProcess;
@@ -21,6 +21,11 @@ typedef void(^OperationBlock)(void);
 
 @implementation WXRootViewController
 
+- (void)viewDidLoad
+{
+self.interactivePopGestureRecognizer.delegate = self;
+}
+
 - (id)initWithSourceURL:(NSURL *)sourceURL
 {
 WXBaseViewController *baseViewController = [[WXBaseViewController 
alloc]initWithSourceURL:sourceURL];
@@ -103,6 +108,16 @@ typedef void(^OperationBlock)(void);
 }
 }
 
+#pragma mark- UIGestureRecognizerDelegate
+
+- (BOOL)gestureRecognizerShouldBegin:(UIGestureRecognizer *)gestureRecognizer
+{
+if ([self.viewControllers count] == 1) {
+return NO;
+}
+return YES;
+}
+
 - (NSMutableArray *)pendingBlocks
 {

[4/7] incubator-weex git commit: Merge branch 'dev' of https://github.com/emptywalker/incubator-weex into dev

2017-04-18 Thread sospartan

Merge branch 'dev' of https://github.com/emptywalker/incubator-weex into 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/9f4f2c35
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/9f4f2c35
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/9f4f2c35

Branch: refs/heads/0.12-dev
Commit: 9f4f2c3575007e314cb53d5c8aab1b2aaa2a2283
Parents: 9ac0c82 8c2b6a2
Author: cxfeng 
Authored: Tue Apr 18 15:17:45 2017 +0800
Committer: cxfeng 
Committed: Tue Apr 18 15:17:45 2017 +0800

--
 .../Sources/Controller/WXBaseViewController.h  |  2 +-
 .../Sources/Controller/WXBaseViewController.m  | 16 
 .../Sources/Controller/WXRootViewController.m  | 17 -
 3 files changed, 17 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9f4f2c35/ios/sdk/WeexSDK/Sources/Controller/WXBaseViewController.h
--

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9f4f2c35/ios/sdk/WeexSDK/Sources/Controller/WXBaseViewController.m
--

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9f4f2c35/ios/sdk/WeexSDK/Sources/Controller/WXRootViewController.m
--

[7/7] incubator-weex git commit: Merge branch 'dev' into 0.12-dev

2017-04-18 Thread sospartan

Merge branch 'dev' 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/8ce111a7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/8ce111a7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/8ce111a7

Branch: refs/heads/0.12-dev
Commit: 8ce111a7d93d85056fd3b2d1064b06b84924a367
Parents: 32ae6e4 648cfc0
Author: sospartan 
Authored: Tue Apr 18 16:10:00 2017 +0800
Committer: sospartan 
Committed: Tue Apr 18 16:10:00 2017 +0800

--
 .travis.yml | 42 +--
 NOTICE  | 75 
 android/run-ci.sh   |  2 +-
 .../Sources/Controller/WXBaseViewController.h   |  2 +-
 .../Sources/Controller/WXBaseViewController.m   | 16 -
 .../Sources/Controller/WXRootViewController.m   | 17 -
 ios/sdk/WeexSDKTests/WXRootViewTests.m  |  4 +-
 test/ci-funcs.sh| 75 +++-
 test/run.sh | 41 ++-
 test/scripts/components/image-onload.test.js|  2 +-
 test/scripts/components/recycler.test.js|  2 +-
 11 files changed, 169 insertions(+), 109 deletions(-)
--

[5/7] incubator-weex git commit: * [test] fix travis CI

2017-04-18 Thread sospartan

* [test] fix travis CI

- disable ios macaca test, it far from stable, will use a PR to
re-enable it.
- move ios test step out of script, avoid errs eat by script
- disable iOS testInstanceAndWeexRootFrame test, since it's fail
sometimes


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/a9d3de8d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/a9d3de8d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/a9d3de8d

Branch: refs/heads/0.12-dev
Commit: a9d3de8ddc12829fe3ae386ce06fd690279cca0e
Parents: 9ac0c82
Author: sospartan 
Authored: Mon Apr 17 16:07:22 2017 +0800
Committer: sospartan 
Committed: Tue Apr 18 16:08:38 2017 +0800

--
 .travis.yml  | 42 +++--
 android/run-ci.sh|  2 +-
 ios/sdk/WeexSDKTests/WXRootViewTests.m   |  4 +-
 test/ci-funcs.sh | 75 ---
 test/run.sh  | 41 -
 test/scripts/components/image-onload.test.js |  2 +-
 test/scripts/components/recycler.test.js |  2 +-
 7 files changed, 77 insertions(+), 91 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a9d3de8d/.travis.yml
--
diff --git a/.travis.yml b/.travis.yml
index 29bcc68..6b94b22 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,8 @@
 os:
   - osx
   - linux
-language: nodejs
+language: node_js
+node_js: 7
 rvm: 2.0.0
 env:
   - TEST_SUITE=ios
@@ -28,6 +29,20 @@ matrix:
 env: TEST_SUITE=ios
 osx_image: xcode8.3
 language: objective-c
+before_script:
+  - source test/ci-funcs.sh
+  - installNode
+  - npm install -g macaca-cli
+  - brew update
+  - brew install ios-webkit-debug-proxy
+  - npm install -g macaca-ios
+  - npm install
+  - npm install mocha
+  - gem install danger danger-xcode_summary xcpretty 
xcpretty-json-formatter
+script:
+  - ./test/serve.sh 2&>1 > /dev/null &
+  - xcodebuild -project ios/sdk/WeexSDK.xcodeproj test -scheme 
WeexSDKTests CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO -destination 
'platform=iOS Simulator,name=iPhone 6' | 
XCPRETTY_JSON_FILE_OUTPUT=ios/sdk/xcodebuild.json xcpretty -f 
`xcpretty-json-formatter`
+  - bundle exec danger --dangerfile=Dangerfile-ios
   - os: linux
 env: TEST_SUITE=android
 jdk: oraclejdk8
@@ -41,14 +56,31 @@ matrix:
 - android-22
 - extra-google-m2repository
 - extra-android-m2repository
-- sys-img-armeabi-v7a-android-21
+- sys-img-armeabi-v7a-android-22
+before_script:
+  - source test/ci-funcs.sh
+  - installNode
+  - npm install -g macaca-cli
+  - npm install -g macaca-android
+  - createAVD
+  - startAVD &
+  - npm install
+  - npm install mocha
+  - export DISPLAY=:99.0
+script:
+  - source ./test/ci-funcs.sh
+  - ./test/serve.sh 2&>1 > /dev/null &
+  - cd android
+  - ./run-ci.sh 
+  - cd $TRAVIS_BUILD_DIR
+  - waitForEmulator
+  - run_in_ci=true bash test/run.sh
 cache:
   directories:
   - node_modules
   - $HOME/.m2
   - $HOME/.gradle
-before_install:
-  - source test/ci-funcs.sh && setup_cpt $TEST_SUITE
 script:
-  - test_cpt $TEST_SUITE
+  - source test/ci-funcs.sh
+  - runJSTest $TEST_SUITE
   

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a9d3de8d/android/run-ci.sh
--
diff --git a/android/run-ci.sh b/android/run-ci.sh
index 86e0989..fae4e74 100755
--- a/android/run-ci.sh
+++ b/android/run-ci.sh
@@ -1,4 +1,4 @@
 # !/bin/sh -eu
 cd playground
-./gradlew assembleDebug :weex_sdk:testDebugUnitTest -PdisableCov=true 
-PtargetSDK=19 -Dorg.gradle.daemon=true -Dorg.gradle.parallel=true 
-Dorg.gradle.jvmargs="-Xmx512m -XX:+HeapDumpOnOutOfMemoryError" 
-Dfile.encoding=UTF-8
+./gradlew assembleDebug :weex_sdk:testDebugUnitTest --info -PdisableCov=true 
-PtargetSDK=19 -Dorg.gradle.daemon=true -Dorg.gradle.parallel=true 
-Dorg.gradle.jvmargs="-Xmx512m -XX:+HeapDumpOnOutOfMemoryError" 
-Dfile.encoding=UTF-8
 COLUMNS=2000 ps -m -o pid,rss,command > ../sdk/build/reports/memdump.txt
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a9d3de8d/ios/sdk/WeexSDKTests/WXRootViewTests.m
--
diff --git a/ios/sdk/WeexSDKTests/WXRootViewTests.m 
b/ios/sdk/WeexSDKTests/WXRootViewTests.m
index

[2/7] incubator-weex git commit: * [all] add zxing to NOTICE file

2017-04-18 Thread sospartan

* [all] add zxing to NOTICE file


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/9ac0c824
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/9ac0c824
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/9ac0c824

Branch: refs/heads/0.12-dev
Commit: 9ac0c82443e65b1c9d8a2714fea6b9a5b8af9907
Parents: b342eca
Author: sospartan 
Authored: Mon Apr 17 14:25:49 2017 +0800
Committer: sospartan 
Committed: Mon Apr 17 14:25:49 2017 +0800

--
 NOTICE | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9ac0c824/NOTICE
--
diff --git a/NOTICE b/NOTICE
index 7b45898..8ceccd9 100644
--- a/NOTICE
+++ b/NOTICE
@@ -74,6 +74,9 @@ by facebook , licensed under the BSD-3-Clause License.
 This product contains software 
SocketRocket(https://github.com/facebook/SocketRocket) developed
 by facebook , licensed under the BSD-3-Clause License.
 
+This product contains software zxing(https://github.com/zxing/zxing) developed
+by zxing , licensed under the Apache 2.0 License.
+
 This product contains software okhttp(https://github.com/square/okhttp) 
developed
 by square , licensed under the Apache 2.0 License.

[6/7] incubator-weex git commit: Merge branch 'dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into dev

2017-04-18 Thread sospartan

Merge branch 'dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex 
into 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/648cfc0b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/648cfc0b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/648cfc0b

Branch: refs/heads/0.12-dev
Commit: 648cfc0bde3d0121eee46ec1c5aca082ae552b7e
Parents: a9d3de8 9f4f2c3
Author: sospartan 
Authored: Tue Apr 18 16:09:07 2017 +0800
Committer: sospartan 
Committed: Tue Apr 18 16:09:07 2017 +0800

--
 .../Sources/Controller/WXBaseViewController.h  |  2 +-
 .../Sources/Controller/WXBaseViewController.m  | 16 
 .../Sources/Controller/WXRootViewController.m  | 17 -
 3 files changed, 17 insertions(+), 18 deletions(-)
--

[1/7] incubator-weex git commit: * [all] update NOTICE to include all dependencies

2017-04-18 Thread sospartan

Repository: incubator-weex
Updated Branches:
  refs/heads/0.12-dev 32ae6e47e -> 8ce111a7d


* [all] update NOTICE to include all dependencies


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/b342eca1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/b342eca1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/b342eca1

Branch: refs/heads/0.12-dev
Commit: b342eca1e6edd1cb66114794497cdcfead1c2b34
Parents: 5ea9966
Author: sospartan 
Authored: Mon Apr 17 13:48:42 2017 +0800
Committer: sospartan 
Committed: Mon Apr 17 13:48:42 2017 +0800

--
 NOTICE | 72 +
 1 file changed, 72 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b342eca1/NOTICE
--
diff --git a/NOTICE b/NOTICE
index 21e0ee8..7b45898 100644
--- a/NOTICE
+++ b/NOTICE
@@ -10,6 +10,39 @@ by Tom Preston-Werner , licensed under the Creative Commons 
- CC BY 3.0 License.
 This product contains software core-js(https://github.com/zloirock/core-js) 
developed
 by Denis Pushkarev , licensed under the MIT License.
 
+This product contains software 
animaitonjs(https://www.npmjs.com/package/animationjs) developed
+by mr.raindrop  , licensed under the MIT License.
+
+This product contains software 
cubicbezier(https://www.npmjs.com/package/cubicbezier) developed
+by mr.raindrop  , licensed under the MIT License.
+
+This product contains software envd(https://www.npmjs.com/package/envd) 
developed
+by mr.raindrop  , licensed under the MIT License.
+
+This product contains software httpurl(https://www.npmjs.com/package/httpurl) 
developed
+by mr.raindrop  , licensed under the MIT License.
+
+This product contains software lazyimg(https://www.npmjs.com/package/lazyimg) 
developed
+by mr.raindrop  , licensed under the MIT License.
+
+This product contains software modals(https://www.npmjs.com/package/modals) 
developed
+by mr.raindrop  , licensed under the MIT License.
+
+This product contains software 
query-string(https://www.npmjs.com/package/query-string) developed
+by sindresorhus  , licensed under the MIT License.
+
+This product contains software 
weex-picker(https://www.npmjs.com/package/weex-picker) developed
+by abigtree  , licensed under the Apache 2.0 License.
+
+This product contains software 
weex-rax-framework(https://www.npmjs.com/package/weex-rax-framework) developed
+by yuanyan  , licensed under the BSD-3-Clause License.
+
+This product contains software 
weex-vue-framework(https://www.npmjs.com/package/weex-vue-framework) developed
+by fkysly  , licensed under the MIT License.
+
+This product contains software 
weex-styler(https://www.npmjs.com/package/weex-styler) developed
+by songsiqi  , licensed under the MIT License.
+
 This product contains software vuejs(https://github.com/vuejs/vue) developed
 by Yuxi Evan You , licensed under the MIT License.
 
@@ -19,3 +52,42 @@ by TooTallNate , licensed under the MIT License.
 This product contains software inline-style-prefixer
 (https://github.com/rofrischmann/inline-style-prefixer) developed by
 rofrischmann , licensed under the MIT License.
+
+This product contains software fastjson(https://github.com/alibaba/fastjson) 
developed
+by alibaba inc.  , licensed under the Apache 2.0 License.
+
+This product contains software dexposed(https://github.com/alibaba/dexposed) 
developed
+by alibaba inc.  , licensed under the Apache 2.0 License.
+
+This product contains software 
loopj(https://github.com/loopj/android-async-http) developed
+by loopj , licensed under the Apache 2.0 License.
+
+This product contains software fresco(https://github.com/facebook/fresco) 
developed
+by facebook , licensed under the BSD-3-Clause License.
+
+This product contains software 
animated-gif(https://github.com/facebook/fresco) developed
+by facebook , licensed under the BSD-3-Clause License.
+
+This product contains software yoga(https://github.com/facebook/yoga) developed
+by facebook , licensed under the BSD-3-Clause License.
+
+This product contains software 
SocketRocket(https://github.com/facebook/SocketRocket) developed
+by facebook , licensed under the BSD-3-Clause License.
+
+This product contains software okhttp(https://github.com/square/okhttp) 
developed
+by square , licensed under the Apache 2.0 License.
+
+This product contains software okio(https://github.com/square/okio) developed
+by square , licensed under the Apache 2.0 License.
+
+This product contains software scalpel(https://github.com/JakeWharton/scalpel) 
developed
+by Jake Wharton , licensed under the Apache 2.0 License.
+
+This product contains software

[1/2] incubator-weex git commit: * [test] fix travis CI

2017-04-18 Thread sospartan

Repository: incubator-weex
Updated Branches:
  refs/heads/dev 9f4f2c357 -> 648cfc0bd


* [test] fix travis CI

- disable ios macaca test, it far from stable, will use a PR to
re-enable it.
- move ios test step out of script, avoid errs eat by script
- disable iOS testInstanceAndWeexRootFrame test, since it's fail
sometimes


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/a9d3de8d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/a9d3de8d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/a9d3de8d

Branch: refs/heads/dev
Commit: a9d3de8ddc12829fe3ae386ce06fd690279cca0e
Parents: 9ac0c82
Author: sospartan 
Authored: Mon Apr 17 16:07:22 2017 +0800
Committer: sospartan 
Committed: Tue Apr 18 16:08:38 2017 +0800

--
 .travis.yml  | 42 +++--
 android/run-ci.sh|  2 +-
 ios/sdk/WeexSDKTests/WXRootViewTests.m   |  4 +-
 test/ci-funcs.sh | 75 ---
 test/run.sh  | 41 -
 test/scripts/components/image-onload.test.js |  2 +-
 test/scripts/components/recycler.test.js |  2 +-
 7 files changed, 77 insertions(+), 91 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a9d3de8d/.travis.yml
--
diff --git a/.travis.yml b/.travis.yml
index 29bcc68..6b94b22 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,8 @@
 os:
   - osx
   - linux
-language: nodejs
+language: node_js
+node_js: 7
 rvm: 2.0.0
 env:
   - TEST_SUITE=ios
@@ -28,6 +29,20 @@ matrix:
 env: TEST_SUITE=ios
 osx_image: xcode8.3
 language: objective-c
+before_script:
+  - source test/ci-funcs.sh
+  - installNode
+  - npm install -g macaca-cli
+  - brew update
+  - brew install ios-webkit-debug-proxy
+  - npm install -g macaca-ios
+  - npm install
+  - npm install mocha
+  - gem install danger danger-xcode_summary xcpretty 
xcpretty-json-formatter
+script:
+  - ./test/serve.sh 2&>1 > /dev/null &
+  - xcodebuild -project ios/sdk/WeexSDK.xcodeproj test -scheme 
WeexSDKTests CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO -destination 
'platform=iOS Simulator,name=iPhone 6' | 
XCPRETTY_JSON_FILE_OUTPUT=ios/sdk/xcodebuild.json xcpretty -f 
`xcpretty-json-formatter`
+  - bundle exec danger --dangerfile=Dangerfile-ios
   - os: linux
 env: TEST_SUITE=android
 jdk: oraclejdk8
@@ -41,14 +56,31 @@ matrix:
 - android-22
 - extra-google-m2repository
 - extra-android-m2repository
-- sys-img-armeabi-v7a-android-21
+- sys-img-armeabi-v7a-android-22
+before_script:
+  - source test/ci-funcs.sh
+  - installNode
+  - npm install -g macaca-cli
+  - npm install -g macaca-android
+  - createAVD
+  - startAVD &
+  - npm install
+  - npm install mocha
+  - export DISPLAY=:99.0
+script:
+  - source ./test/ci-funcs.sh
+  - ./test/serve.sh 2&>1 > /dev/null &
+  - cd android
+  - ./run-ci.sh 
+  - cd $TRAVIS_BUILD_DIR
+  - waitForEmulator
+  - run_in_ci=true bash test/run.sh
 cache:
   directories:
   - node_modules
   - $HOME/.m2
   - $HOME/.gradle
-before_install:
-  - source test/ci-funcs.sh && setup_cpt $TEST_SUITE
 script:
-  - test_cpt $TEST_SUITE
+  - source test/ci-funcs.sh
+  - runJSTest $TEST_SUITE
   

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a9d3de8d/android/run-ci.sh
--
diff --git a/android/run-ci.sh b/android/run-ci.sh
index 86e0989..fae4e74 100755
--- a/android/run-ci.sh
+++ b/android/run-ci.sh
@@ -1,4 +1,4 @@
 # !/bin/sh -eu
 cd playground
-./gradlew assembleDebug :weex_sdk:testDebugUnitTest -PdisableCov=true 
-PtargetSDK=19 -Dorg.gradle.daemon=true -Dorg.gradle.parallel=true 
-Dorg.gradle.jvmargs="-Xmx512m -XX:+HeapDumpOnOutOfMemoryError" 
-Dfile.encoding=UTF-8
+./gradlew assembleDebug :weex_sdk:testDebugUnitTest --info -PdisableCov=true 
-PtargetSDK=19 -Dorg.gradle.daemon=true -Dorg.gradle.parallel=true 
-Dorg.gradle.jvmargs="-Xmx512m -XX:+HeapDumpOnOutOfMemoryError" 
-Dfile.encoding=UTF-8
 COLUMNS=2000 ps -m -o pid,rss,command > ../sdk/build/reports/memdump.txt
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a9d3de8d/ios/sdk/WeexSDKTests/WXRootViewTests.m
--
diff --git

[2/2] incubator-weex git commit: Merge branch 'dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into dev

2017-04-18 Thread sospartan

Merge branch 'dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex 
into 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/648cfc0b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/648cfc0b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/648cfc0b

Branch: refs/heads/dev
Commit: 648cfc0bde3d0121eee46ec1c5aca082ae552b7e
Parents: a9d3de8 9f4f2c3
Author: sospartan 
Authored: Tue Apr 18 16:09:07 2017 +0800
Committer: sospartan 
Committed: Tue Apr 18 16:09:07 2017 +0800

--
 .../Sources/Controller/WXBaseViewController.h  |  2 +-
 .../Sources/Controller/WXBaseViewController.m  | 16 
 .../Sources/Controller/WXRootViewController.m  | 17 -
 3 files changed, 17 insertions(+), 18 deletions(-)
--

[2/5] incubator-weex git commit: + [ios] add gcanvas example & fix wxdevtool crash & move spec to root directory

2017-04-18 Thread cxfeng

+ [ios] add gcanvas example & fix wxdevtool crash & move spec to root directory


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/e7286623
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/e7286623
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/e7286623

Branch: refs/heads/0.12-dev
Commit: e72866232abccc74284c480284ec1e83dc6586d1
Parents: eb6b55c
Author: é½å±± 
Authored: Mon Apr 17 19:11:27 2017 +0800
Committer: é½å±± 
Committed: Mon Apr 17 19:11:27 2017 +0800

--
 WeexSDK.podspec | 47 
 examples/index.we   |  5 ++-
 examples/vue/index.vue  |  3 ++
 examples/vue/market/gcanvas.vue | 40 +
 ios/playground/Podfile  |  2 +
 .../WeexSDK/Sources/Bridge/WXBridgeContext.m|  2 +-
 package.json|  4 +-
 7 files changed, 100 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e7286623/WeexSDK.podspec
--
diff --git a/WeexSDK.podspec b/WeexSDK.podspec
new file mode 100644
index 000..6ec182f
--- /dev/null
+++ b/WeexSDK.podspec
@@ -0,0 +1,47 @@
+# coding: utf-8
+Pod::Spec.new do |s|
+
+  s.name = "WeexSDK"
+
+  s.version  = "0.11.0"
+
+  s.summary  = "WeexSDK Source ."
+
+  s.description  = <<-DESC
+   A framework for building Mobile cross-platform UI
+   DESC
+
+  s.homepage = "https://github.com/alibaba/weex;
+  s.license = {
+:type => 'Copyright',
+:text => <<-LICENSE
+   Alibaba-INC copyright
+LICENSE
+  }
+  s.authors  = { "cxfeng1"  => "cxfe...@gmail.com",
+ "boboning" => "ningli...@163.com",
+ "yangshengtao" => "yangshengtao1...@163.com",
+ "kfeagle"  => "sunjjb...@163.com",
+ "acton393" => "zhangxing610...@gmail.com"
+   }
+  s.platform = :ios
+  s.ios.deployment_target = '7.0'
+  s.source =  { :path => '.' }
+  s.source_files = 'ios/playground/WeexSDK/Sources/**/*.{h,m,mm,c}'
+  s.resources = 'ios/playground/WeexSDK/Resources/main.js', 
'ios/playground/WeexSDK/Resources/wx_load_er...@3x.png'
+
+  s.requires_arc = true
+  s.prefix_header_file = 'ios/playground/WeexSDK/Sources/Supporting 
Files/WeexSDK-Prefix.pch'
+
+#  s.xcconfig = { "GCC_PREPROCESSOR_DEFINITIONS" => '$(inherited) DEBUG=1' }
+
+  s.xcconfig = { "OTHER_LINK_FLAG" => '$(inherited) -ObjC'}
+
+  s.user_target_xcconfig  = { 'FRAMEWORK_SEARCH_PATHS' => 
"'$(PODS_ROOT)/WeexSDK'" }
+
+  s.frameworks = 
'CoreMedia','MediaPlayer','AVFoundation','AVKit','JavaScriptCore', 'GLKit'
+
+  s.dependency 'SocketRocket'
+  s.libraries = "stdc++"
+
+end

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e7286623/examples/index.we
--
diff --git a/examples/index.we b/examples/index.we
index e0b1a9f..aa0b842 100644
--- a/examples/index.we
+++ b/examples/index.we
@@ -54,7 +54,10 @@
 {name: 'showcase/ui', title: 'UI Gallery'},
 {name: 'showcase/dropdown/dropdown-demo', title: 'Dropdown'},
 {name: 'showcase/pseudo-class', title: 'PseudoClass'},
-{name: 'showcase/boxshadow', title: 'boxshadow'}
+{name: 'showcase/boxshadow', title: 'boxshadow'},
+
+// market
+{name: 'market/gcanvas', title: 'Gcanvas'},
   ]
 }
   }

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e7286623/examples/vue/index.vue
--
diff --git a/examples/vue/index.vue b/examples/vue/index.vue
index fb4693d..4d263cd 100644
--- a/examples/vue/index.vue
+++ b/examples/vue/index.vue
@@ -45,6 +45,9 @@
   // {name: root + '/showcase/minesweeper', title: 'Minesweeper'},
   // {name: root + '/showcase/ui', title: 'UI Gallery'},
   // {name: root + '/showcase/dropdown/dropdown-demo', title: 
'Dropdown'}
+
+  // market
+  {name: root + '/market/gcanvas', title: 'Gcanvas'}
 ]
   }
 },

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e7286623/examples/vue/market/gcanvas.vue
--
diff --git a/examples/vue/market/gcanvas.vue b/examples/vue/market/gcanvas.vue
new file mode 100644
index 000..626ece1
--- /dev/null
+++ b/examples/vue/market/gcanvas.vue
@@ -0,0 +1,40 @@
+
+  
+
+  
+
+
+  //   var gcanvas = weex.requireModule('weex-gcanvas');
+
+  var gcanvas=require('weex-gcanvas');
+

[1/5] incubator-weex git commit: + [example] fix bug demo

2017-04-18 Thread cxfeng

Repository: incubator-weex
Updated Branches:
  refs/heads/0.12-dev ca6a9ffe3 -> 32ae6e47e


+ [example] fix bug demo


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/eb6b55c2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/eb6b55c2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/eb6b55c2

Branch: refs/heads/0.12-dev
Commit: eb6b55c25ceda9e3681e195df03a0460787b77e7
Parents: 2f8eec6
Author: é½å±± 
Authored: Sat Apr 15 21:56:17 2017 +0800
Committer: é½å±± 
Committed: Sat Apr 15 21:56:17 2017 +0800

--
 examples/component/input-demo.we  | 14 +++---
 examples/vue/components/input.vue | 14 +++---
 2 files changed, 14 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/eb6b55c2/examples/component/input-demo.we
--
diff --git a/examples/component/input-demo.we b/examples/component/input-demo.we
index 950805a..ea4313b 100644
--- a/examples/component/input-demo.we
+++ b/examples/component/input-demo.we
@@ -11,7 +11,7 @@
 
 input type = text
 
-
+
 
 
 
@@ -58,42 +58,42 @@
 
 
 
-input keyboard = default
+input return-key-type = default
 
 
 
 
 
 
-input keyboard = go
+input return-key-type = go
 
 
 
 
 
 
-input keyboard = next
+input return-key-type = next
 
 
 
 
 
 
-input keyboard = search
+input return-key-type = search
 
 
 
 
 
 
-input keyboard = send
+input return-key-type = send
 
 
 
 
 
 
-input keyboard = done
+input return-key-type = done
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/eb6b55c2/examples/vue/components/input.vue
--
diff --git a/examples/vue/components/input.vue 
b/examples/vue/components/input.vue
index 6ef5f9b..9cf4c37 100644
--- a/examples/vue/components/input.vue
+++ b/examples/vue/components/input.vue
@@ -10,7 +10,7 @@
 
   input type = text
 
-
+
   
 
   
@@ -57,42 +57,42 @@
 
   
 
-  input keyboard = default
+  input return-key-type = default
 
 
   
 
   
 
-  input keyboard = go
+  input return-key-type = go
 
 
   
 
   
 
-  input keyboard = next
+  input return-key-type = next
 
 
   
 
   
 
-  input keyboard = search
+  input return-key-type = search
 
 
   
 
   
 
-  input keyboard = send
+  input return-key-type = send
 
 
   
 
   
 
-  input keyboard = done
+  input return-key-type = done

[3/5] incubator-weex git commit: + [ios] update version

2017-04-18 Thread cxfeng

+ [ios] update version


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/18fd3e6b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/18fd3e6b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/18fd3e6b

Branch: refs/heads/0.12-dev
Commit: 18fd3e6b8397711cba5f2af67b3fcc0d7f38dfdb
Parents: e728662
Author: é½å±± 
Authored: Mon Apr 17 19:32:48 2017 +0800
Committer: é½å±± 
Committed: Mon Apr 17 19:32:48 2017 +0800

--
 ios/playground/Podfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/18fd3e6b/ios/playground/Podfile
--
diff --git a/ios/playground/Podfile b/ios/playground/Podfile
index 5ca0552..b9e11fb 100644
--- a/ios/playground/Podfile
+++ b/ios/playground/Podfile
@@ -9,7 +9,7 @@ def common
 pod 'SocketRocket', '0.4.2'
 pod 'ATSDK-Weex', '0.0.1'
 
-pod 'WeexGcanvas', '0.0.1.3'
+pod 'WeexGcanvas', '0.0.1.5'
 end
 
 target 'WeexDemo' do

[5/5] incubator-weex git commit: Merge branch 'ios-demo-0.12-dev' of https://github.com/kfeagle/incubator-weex into 0.12-dev

2017-04-18 Thread cxfeng

Merge branch 'ios-demo-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/32ae6e47
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/32ae6e47
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/32ae6e47

Branch: refs/heads/0.12-dev
Commit: 32ae6e47e0d2f92b5d71e12d1dad3c1a6c9af252
Parents: ca6a9ff dd047ba
Author: cxfeng 
Authored: Tue Apr 18 15:58:36 2017 +0800
Committer: cxfeng 
Committed: Tue Apr 18 15:58:36 2017 +0800

--
 WeexSDK.podspec | 45 +++
 examples/component/input-demo.we| 14 +++---
 examples/index.we   |  5 ++-
 examples/vue/components/input.vue   | 14 +++---
 examples/vue/index.vue  |  3 ++
 examples/vue/market/gcanvas.vue | 40 +
 ios/playground/Podfile  |  5 ++-
 .../WeexDemo.xcodeproj/project.pbxproj  |  4 +-
 ios/sdk/WeexSDK.podspec | 47 
 .../WeexSDK/Sources/Bridge/WXBridgeContext.m|  2 +-
 package.json|  4 +-
 11 files changed, 116 insertions(+), 67 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/32ae6e47/ios/playground/WeexDemo.xcodeproj/project.pbxproj
--

[2/2] incubator-weex git commit: Merge branch 'dev' of https://github.com/emptywalker/incubator-weex into dev

2017-04-18 Thread cxfeng

Merge branch 'dev' of https://github.com/emptywalker/incubator-weex into 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/9f4f2c35
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/9f4f2c35
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/9f4f2c35

Branch: refs/heads/dev
Commit: 9f4f2c3575007e314cb53d5c8aab1b2aaa2a2283
Parents: 9ac0c82 8c2b6a2
Author: cxfeng 
Authored: Tue Apr 18 15:17:45 2017 +0800
Committer: cxfeng 
Committed: Tue Apr 18 15:17:45 2017 +0800

--
 .../Sources/Controller/WXBaseViewController.h  |  2 +-
 .../Sources/Controller/WXBaseViewController.m  | 16 
 .../Sources/Controller/WXRootViewController.m  | 17 -
 3 files changed, 17 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9f4f2c35/ios/sdk/WeexSDK/Sources/Controller/WXBaseViewController.h
--

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9f4f2c35/ios/sdk/WeexSDK/Sources/Controller/WXBaseViewController.m
--

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9f4f2c35/ios/sdk/WeexSDK/Sources/Controller/WXRootViewController.m
--

[1/2] incubator-weex git commit: --

2017-04-18 Thread cxfeng

Repository: incubator-weex
Updated Branches:
  refs/heads/dev 9ac0c8244 -> 9f4f2c357


--


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/8c2b6a29
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/8c2b6a29
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/8c2b6a29

Branch: refs/heads/dev
Commit: 8c2b6a2956475ab50fd3b64dcde9c3d105ee788f
Parents: 5529bb1
Author: xuyouhong <1647064...@qq.com>
Authored: Mon Apr 17 15:29:59 2017 +0800
Committer: xuyouhong <1647064...@qq.com>
Committed: Mon Apr 17 15:29:59 2017 +0800

--
 .../Sources/Controller/WXBaseViewController.h  |  2 +-
 .../Sources/Controller/WXBaseViewController.m  | 16 
 .../Sources/Controller/WXRootViewController.m  | 17 -
 3 files changed, 17 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8c2b6a29/ios/sdk/WeexSDK/Sources/Controller/WXBaseViewController.h
--
diff --git a/ios/sdk/WeexSDK/Sources/Controller/WXBaseViewController.h 
b/ios/sdk/WeexSDK/Sources/Controller/WXBaseViewController.h
index daf96e3..f834803 100644
--- a/ios/sdk/WeexSDK/Sources/Controller/WXBaseViewController.h
+++ b/ios/sdk/WeexSDK/Sources/Controller/WXBaseViewController.h
@@ -15,7 +15,7 @@
  * special bundle URL.
  */
 
-@interface WXBaseViewController : UIViewController 

+@interface WXBaseViewController : UIViewController
 
 /**
  * @abstract initializes the viewcontroller with bundle url.

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8c2b6a29/ios/sdk/WeexSDK/Sources/Controller/WXBaseViewController.m
--
diff --git a/ios/sdk/WeexSDK/Sources/Controller/WXBaseViewController.m 
b/ios/sdk/WeexSDK/Sources/Controller/WXBaseViewController.m
index 1523675..9051ed7 100644
--- a/ios/sdk/WeexSDK/Sources/Controller/WXBaseViewController.m
+++ b/ios/sdk/WeexSDK/Sources/Controller/WXBaseViewController.m
@@ -66,7 +66,6 @@
 - (void)viewDidLoad
 {
 [super viewDidLoad];
-[self addEdgePop];
 self.view.backgroundColor = [UIColor whiteColor];
 self.automaticallyAdjustsScrollViewInsets = NO;
 [self _renderWithURL:_sourceURL];
@@ -106,21 +105,6 @@
 [self _renderWithURL:_sourceURL];
 }
 
-- (void)addEdgePop
-{
-self.navigationController.interactivePopGestureRecognizer.delegate = self;
-}
-
-#pragma mark- UIGestureRecognizerDelegate
-
-- (BOOL)gestureRecognizerShouldBegin:(UIGestureRecognizer *)gestureRecognizer
-{
-if (!self.navigationController || 
[self.navigationController.viewControllers count] == 1) {
-return NO;
-}
-return YES;
-}
-
 - (void)_renderWithURL:(NSURL *)sourceURL
 {
 if (!sourceURL) {

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8c2b6a29/ios/sdk/WeexSDK/Sources/Controller/WXRootViewController.m
--
diff --git a/ios/sdk/WeexSDK/Sources/Controller/WXRootViewController.m 
b/ios/sdk/WeexSDK/Sources/Controller/WXRootViewController.m
index befb010..e25cc07 100644
--- a/ios/sdk/WeexSDK/Sources/Controller/WXRootViewController.m
+++ b/ios/sdk/WeexSDK/Sources/Controller/WXRootViewController.m
@@ -12,7 +12,7 @@
 
 typedef void(^OperationBlock)(void);
 
-@interface WXRootViewController()
+@interface WXRootViewController() 
 
 @property(nonatomic, strong) WXThreadSafeMutableArray *operationArray;
 @property (nonatomic, assign) BOOL operationInProcess;
@@ -21,6 +21,11 @@ typedef void(^OperationBlock)(void);
 
 @implementation WXRootViewController
 
+- (void)viewDidLoad
+{
+self.interactivePopGestureRecognizer.delegate = self;
+}
+
 - (id)initWithSourceURL:(NSURL *)sourceURL
 {
 WXBaseViewController *baseViewController = [[WXBaseViewController 
alloc]initWithSourceURL:sourceURL];
@@ -103,6 +108,16 @@ typedef void(^OperationBlock)(void);
 }
 }
 
+#pragma mark- UIGestureRecognizerDelegate
+
+- (BOOL)gestureRecognizerShouldBegin:(UIGestureRecognizer *)gestureRecognizer
+{
+if ([self.viewControllers count] == 1) {
+return NO;
+}
+return YES;
+}
+
 - (NSMutableArray *)pendingBlocks
 {

incubator-weex git commit: * [ios] set usingCoretext false default

[1/2] incubator-weex git commit: * [test] Add watch ability for macaca

[2/2] incubator-weex git commit: Merge branch 'test-macaca' of https://github.com/YorkShen/incubator-weex into 0.12-dev

[1/4] incubator-weex git commit: * [test] update case about line-height

[2/4] incubator-weex git commit: * [android] Add log to see CI fails

[4/4] incubator-weex git commit: * [test] add Macaca test case for text The test case mainly focus on the layout of text.

[3/5] incubator-weex git commit: * [ios] remove unused line

[4/5] incubator-weex git commit: Merge remote-tracking branch 'upstream/0.12-dev' into iOS-0.12-dev-text-refactor

[1/5] incubator-weex git commit: * [ios] draw ellipse and support letter-spacing

[7/8] incubator-weex git commit: Revert "* [ios] add config for componentWithName"

[6/8] incubator-weex git commit: * [ios] remove white space

[3/8] incubator-weex git commit: Merge remote-tracking branch 'upstream/0.12-dev' into 0.12-dev

[2/8] incubator-weex git commit: Merge remote-tracking branch 'upstream/0.12-dev' into 0.12-dev

[5/8] incubator-weex git commit: * [ios] add config for componentWithName

[4/8] incubator-weex git commit: * [ios] update license header script

[1/8] incubator-weex git commit: * [ios] expose js error code

[incubator-weex] Git Push Summary

[3/7] incubator-weex git commit: --

[4/7] incubator-weex git commit: Merge branch 'dev' of https://github.com/emptywalker/incubator-weex into dev

[7/7] incubator-weex git commit: Merge branch 'dev' into 0.12-dev

[5/7] incubator-weex git commit: * [test] fix travis CI

[2/7] incubator-weex git commit: * [all] add zxing to NOTICE file

[6/7] incubator-weex git commit: Merge branch 'dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into dev

[1/7] incubator-weex git commit: * [all] update NOTICE to include all dependencies

[1/2] incubator-weex git commit: * [test] fix travis CI

[2/2] incubator-weex git commit: Merge branch 'dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into dev

[2/5] incubator-weex git commit: + [ios] add gcanvas example & fix wxdevtool crash & move spec to root directory

[1/5] incubator-weex git commit: + [example] fix bug demo

[3/5] incubator-weex git commit: + [ios] update version

[5/5] incubator-weex git commit: Merge branch 'ios-demo-0.12-dev' of https://github.com/kfeagle/incubator-weex into 0.12-dev

[2/2] incubator-weex git commit: Merge branch 'dev' of https://github.com/emptywalker/incubator-weex into dev

[1/2] incubator-weex git commit: --

32 matches

Site Navigation

Mail list logo

Footer information