incubator-weex git commit: * [iOS] override allKeys and allValues method for safeDictionary

2018-02-25 Thread acton393 
Repository: incubator-weex
Updated Branches:
  refs/heads/master 477e9a8ab -> 0e74f4f94


* [iOS] override allKeys and allValues method for safeDictionary


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

Branch: refs/heads/master
Commit: 0e74f4f94bb5d253342a02af4892eaf58258edc6
Parents: 477e9a8
Author: acton393 
Authored: Mon Feb 26 15:43:34 2018 +0800
Committer: acton393 
Committed: Mon Feb 26 15:43:34 2018 +0800

--
 .../Utility/WXThreadSafeMutableDictionary.m | 42 
 1 file changed, 42 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0e74f4f9/ios/sdk/WeexSDK/Sources/Utility/WXThreadSafeMutableDictionary.m
--
diff --git a/ios/sdk/WeexSDK/Sources/Utility/WXThreadSafeMutableDictionary.m 
b/ios/sdk/WeexSDK/Sources/Utility/WXThreadSafeMutableDictionary.m
index 21da6a0..ae04bb0 100644
--- a/ios/sdk/WeexSDK/Sources/Utility/WXThreadSafeMutableDictionary.m
+++ b/ios/sdk/WeexSDK/Sources/Utility/WXThreadSafeMutableDictionary.m
@@ -34,6 +34,34 @@
 
 @end
 
+#define OVERRIDE_METHOD(method,retValue) \
+do { \
+_Pragma("clang diagnostic push") \
+_Pragma("clang diagnostic ignored \"-Warc-performSelector-leaks\"") \
+if (![WXUtility threadSafeCollectionUsingLock]) {\
+dispatch_sync(_queue, ^{\
+if ([_dict respondsToSelector:method]) {\
+retValue = [_dict performSelector:method];\
+}\
+});\
+} else {\
+if (WX_SYS_VERSION_GREATER_THAN(@"10.0")) {\
+os_unfair_lock_lock(&_unfairLock);\
+if ([_dict respondsToSelector:method]) {\
+retValue = [_dict performSelector:method];\
+}\
+os_unfair_lock_unlock(&_unfairLock);\
+} else {\
+pthread_mutex_lock(&_safeThreadDictionaryMutex);\
+if ([_dict respondsToSelector:method]) {\
+retValue = [_dict performSelector:method];\
+}\
+pthread_mutex_unlock(&_safeThreadDictionaryMutex);\
+}\
+}\
+_Pragma("clang diagnostic pop")\
+} while (0)
+
 @implementation WXThreadSafeMutableDictionary
 
 - (instancetype)initCommon
@@ -187,6 +215,20 @@
 }
 }
 
+- (NSArray *)allKeys
+{
+__block NSArray *allKeys = nil;
+OVERRIDE_METHOD(_cmd, allKeys);
+return allKeys;
+}
+
+- (NSArray *)allValues
+{
+__block NSArray *allValues = nil;
+OVERRIDE_METHOD(_cmd, allValues);
+return allValues;
+}
+
 - (void)removeObjectForKey:(id)aKey
 {
 if (![WXUtility threadSafeCollectionUsingLock]) {

[1/2] incubator-weex git commit: *[iOS]fix annotation spell error.

2018-02-25 Thread acton393 
Repository: incubator-weex
Updated Branches:
  refs/heads/master 0b3edc6ba -> 477e9a8ab


*[iOS]fix annotation spell error.


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

Branch: refs/heads/master
Commit: 95523c45b7c12e20fdd26c5e8315a4e59abf1b89
Parents: 95e16d8
Author: 徐有阳 
Authored: Sat Feb 24 16:49:38 2018 +0800
Committer: 徐有阳 
Committed: Sat Feb 24 16:49:38 2018 +0800

--
 .../WeexSDK/Sources/Component/RecycleList/WXRecycleListComponent.m | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/95523c45/ios/sdk/WeexSDK/Sources/Component/RecycleList/WXRecycleListComponent.m
--
diff --git 
a/ios/sdk/WeexSDK/Sources/Component/RecycleList/WXRecycleListComponent.m 
b/ios/sdk/WeexSDK/Sources/Component/RecycleList/WXRecycleListComponent.m
index b22fe26..b3eb315 100644
--- a/ios/sdk/WeexSDK/Sources/Component/RecycleList/WXRecycleListComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/RecycleList/WXRecycleListComponent.m
@@ -360,7 +360,7 @@ WX_EXPORT_METHOD(@selector(setListData:))
 [_collectionView scrollToItemAtIndexPath:toIndexPath 
atScrollPosition:UICollectionViewScrollPositionTop animated:animated];
 }
 
-#pragma mark - WXComonent Internal Methods
+#pragma mark - WXComponent Internal Methods
 
 - (void)_insertSubcomponent:(WXComponent *)subcomponent 
atIndex:(NSInteger)index
 {

[GitHub] incubator-weex pull request #1038: *[iOS]fix annotation spell error.

2018-02-25 Thread asfgit 
Github user asfgit closed the pull request at:

https://github.com/apache/incubator-weex/pull/1038


---

[2/2] incubator-weex git commit: Merge branch 'master' of https://github.com/xuyouyang/incubator-weex into merge-pull-request-master

2018-02-25 Thread acton393 
Merge branch 'master' of https://github.com/xuyouyang/incubator-weex into 
merge-pull-request-master


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

Branch: refs/heads/master
Commit: 477e9a8abd91b22737977f60f8353b11787f732a
Parents: 0b3edc6 95523c4
Author: acton393 
Authored: Mon Feb 26 15:11:50 2018 +0800
Committer: acton393 
Committed: Mon Feb 26 15:11:50 2018 +0800

--
 .../WeexSDK/Sources/Component/RecycleList/WXRecycleListComponent.m | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

incubator-weex git commit: * [WEEX-207] [android] statistics jsf init status and upload

2018-02-25 Thread toretto 
Repository: incubator-weex
Updated Branches:
  refs/heads/master 10182df72 -> 0b3edc6ba


 * [WEEX-207] [android] statistics jsf init status and upload


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

Branch: refs/heads/master
Commit: 0b3edc6ba2f3ef888ad3786f06264d0cfecf0248
Parents: 10182df
Author: yuhun-alibaba 
Authored: Tue Feb 6 17:01:37 2018 +0800
Committer: yuhun-alibaba 
Committed: Mon Feb 26 12:13:13 2018 +0800

--
 .../main/java/com/taobao/weex/bridge/WXBridgeManager.java | 10 --
 .../src/main/java/com/taobao/weex/common/WXErrorCode.java |  4 
 2 files changed, 12 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0b3edc6b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
--
diff --git 
a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java 
b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
index 79e3127..fca40d9 100644
--- a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
+++ b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
@@ -1809,12 +1809,18 @@ public class WXBridgeManager implements Callback, 
BactchExecutor {
   String reinitInfo = "";
   if (reInitCount > 1) {
 reinitInfo = "reinit Framework:";
+WXExceptionUtils.commitCriticalExceptionRT(null, 
WXErrorCode.WX_JS_FRAMEWORK_REINIT_SUCCESS.getErrorCode(),
+"initFramework", reinitInfo + "success", null);
+  } else {
+WXExceptionUtils.commitCriticalExceptionRT(null, 
WXErrorCode.WX_JS_FRAMEWORK_INIT_SUCCESS.getErrorCode(),
+"initFramework", reinitInfo + "success", null);
   }
+
 } else {
   if (reInitCount > 1) {
 WXLogUtils.e("[WXBridgeManager] invokeReInitFramework  
ExecuteJavaScript fail");
 String err = "[WXBridgeManager] invokeReInitFramework  
ExecuteJavaScript fail reinit FrameWork";
-   WXExceptionUtils.commitCriticalExceptionRT(null, 
WXErrorCode.WX_ERR_JS_FRAMEWORK.getErrorCode(),
+   WXExceptionUtils.commitCriticalExceptionRT(null, 
WXErrorCode.WX_ERR_JS_REINIT_FRAMEWORK.getErrorCode(),
"initFramework", "reInitCount = " + 
reInitCount + err, null);
   } else {
 WXLogUtils.e("[WXBridgeManager] invokeInitFramework  
ExecuteJavaScript fail");
@@ -1827,7 +1833,7 @@ public class WXBridgeManager implements Callback, 
BactchExecutor {
 if (reInitCount > 1) {
   WXLogUtils.e("[WXBridgeManager] invokeInitFramework ", e);
   String err = "[WXBridgeManager] invokeInitFramework reinit FrameWork 
exception!#" + e.toString();
- WXExceptionUtils.commitCriticalExceptionRT(null, 
WXErrorCode.WX_ERR_JS_FRAMEWORK.getErrorCode(),
+ WXExceptionUtils.commitCriticalExceptionRT(null, 
WXErrorCode.WX_ERR_JS_REINIT_FRAMEWORK.getErrorCode(),
  "initFramework", "reInitCount ==" + 
reInitCount + err, null);
 } else {
   WXLogUtils.e("[WXBridgeManager] invokeInitFramework ", e);

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0b3edc6b/android/sdk/src/main/java/com/taobao/weex/common/WXErrorCode.java
--
diff --git a/android/sdk/src/main/java/com/taobao/weex/common/WXErrorCode.java 
b/android/sdk/src/main/java/com/taobao/weex/common/WXErrorCode.java
index b6a9340..36a03db 100644
--- a/android/sdk/src/main/java/com/taobao/weex/common/WXErrorCode.java
+++ b/android/sdk/src/main/java/com/taobao/weex/common/WXErrorCode.java
@@ -142,6 +142,10 @@ public enum WXErrorCode {
 
   WX_ERR_JSDOWNLOAD_END("-2299", "js bundle download end"),
 
+  // for js framework
+  WX_JS_FRAMEWORK_INIT_SUCCESS("-1000", "js framework success"),
+
+  WX_JS_FRAMEWORK_REINIT_SUCCESS("-1001", "js framework reinit success"),
   /**
* JS Framework run error
*/

incubator-weex git commit: * [iOS] remove deprecated message

2018-02-25 Thread acton393 
Repository: incubator-weex
Updated Branches:
  refs/heads/master b48c23d68 -> 10182df72


* [iOS] remove deprecated message


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

Branch: refs/heads/master
Commit: 10182df72d4f12f86386646669887f2fdab8858a
Parents: b48c23d
Author: acton393 
Authored: Mon Feb 26 11:53:04 2018 +0800
Committer: acton393 
Committed: Mon Feb 26 11:53:04 2018 +0800

--
 ios/sdk/WeexSDK.xcodeproj/project.pbxproj   | 4 ++--
 ios/sdk/WeexSDK/Sources/Model/WXComponent.h | 3 ++-
 ios/sdk/WeexSDK/Sources/Protocol/WXModuleProtocol.h | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/10182df7/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
--
diff --git a/ios/sdk/WeexSDK.xcodeproj/project.pbxproj 
b/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
index 4645949..f017ac8 100644
--- a/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
+++ b/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
@@ -2578,7 +2578,7 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
GCC_PREFIX_HEADER = "WeexSDK/Sources/Supporting 
Files/WeexSDK-Prefix.pch";
GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
-   GCC_TREAT_WARNINGS_AS_ERRORS = NO;
+   GCC_TREAT_WARNINGS_AS_ERRORS = YES;
HEADER_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/WeexSDK/Dependency",
@@ -2623,7 +2623,7 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
GCC_PREFIX_HEADER = "WeexSDK/Sources/Supporting 
Files/WeexSDK-Prefix.pch";
GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
-   GCC_TREAT_WARNINGS_AS_ERRORS = NO;
+   GCC_TREAT_WARNINGS_AS_ERRORS = YES;
HEADER_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/WeexSDK/Dependency",

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/10182df7/ios/sdk/WeexSDK/Sources/Model/WXComponent.h
--
diff --git a/ios/sdk/WeexSDK/Sources/Model/WXComponent.h 
b/ios/sdk/WeexSDK/Sources/Model/WXComponent.h
index 92f1e34..5e8ba70 100644
--- a/ios/sdk/WeexSDK/Sources/Model/WXComponent.h
+++ b/ios/sdk/WeexSDK/Sources/Model/WXComponent.h
@@ -32,7 +32,8 @@ typedef enum : NSUInteger {
  * @abstract the component callback , result can be string or dictionary.
  * @discussion callback data to js, the id of callback function will be 
removed to save memory.
  */
-typedef void (^WXCallback)(_Nonnull id result) DEPRECATED_MSG_ATTRIBUTE("use 
WXKeepAliveCallback, you can specify keep the callback or not, if keeped, it 
can be called multi times, or it will be removed after called.");
+typedef void (^WXCallback)(_Nonnull id result);
+// DEPRECATED_MSG_ATTRIBUTE("use WXKeepAliveCallback, you can specify keep the 
callback or not, if keeped, it can be called multi times, or it will be removed 
after called.")
 
 /**
  * @abstract the component callback , result can be string or dictionary.

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/10182df7/ios/sdk/WeexSDK/Sources/Protocol/WXModuleProtocol.h
--
diff --git a/ios/sdk/WeexSDK/Sources/Protocol/WXModuleProtocol.h 
b/ios/sdk/WeexSDK/Sources/Protocol/WXModuleProtocol.h
index 6ea275c..4c8f877 100644
--- a/ios/sdk/WeexSDK/Sources/Protocol/WXModuleProtocol.h
+++ b/ios/sdk/WeexSDK/Sources/Protocol/WXModuleProtocol.h
@@ -34,7 +34,8 @@
  * @abstract the module callback , result can be string or dictionary.
  * @discussion callback data to js, the id of callback function will be 
removed to save memory.
  */
-typedef void (^WXModuleCallback)(id result) DEPRECATED_MSG_ATTRIBUTE("use 
WXModuleKeepAliveCallback, you can specify keep the callback or not, if keeped, 
it can be called multi times, or it will be removed after called.");
+typedef void (^WXModuleCallback)(id result);
+//DEPRECATED_MSG_ATTRIBUTE("use WXModuleKeepAliveCallback, you can specify 
keep the callback or not, if keeped, it can be called multi times, or it will 
be removed after called.")
 
 /**
  * @abstract the module callback

[GitHub] incubator-weex issue #1040: [Android] made onFocusChangeListener public

2018-02-25 Thread weex-bot 
Github user weex-bot commented on the issue:

https://github.com/apache/incubator-weex/pull/1040
  






  

  
  Messages

  
  
  :book:
  has no jsfm file changed.

  

  :book:
  jsfm test finished.

  




  Generated by :no_entry_sign: http://github.com/danger/danger-js/;>dangerJS




---

[GitHub] incubator-weex pull request #1040: [Android] made onFocusChangeListener publ...

2018-02-25 Thread misakuo 
GitHub user misakuo opened a pull request:

https://github.com/apache/incubator-weex/pull/1040

[Android] made onFocusChangeListener public



You can merge this pull request into a Git repository by running:

$ git pull https://github.com/misakuo/incubator-weex 
android-patch-focus-listener

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/incubator-weex/pull/1040.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #1040


commit 843eba82ab445874f5f328c9339829329cdfd85b
Author: misakuo 
Date:   2018-02-26T03:09:36Z

*[improvement] made onFocusChangeListener public




---

[GitHub] incubator-weex pull request #1039: * [WEEX-207] [android] statistics jsf ini...

2018-02-25 Thread yuhun-alibaba 
GitHub user yuhun-alibaba reopened a pull request:

https://github.com/apache/incubator-weex/pull/1039

 * [WEEX-207] [android] statistics jsf init status and upload

[android] statistics jsf init status and upload

You can merge this pull request into a Git repository by running:

$ git pull https://github.com/yuhun-alibaba/incubator-weex 
add_jsf_failed_success_collection

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/incubator-weex/pull/1039.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #1039


commit d3ed3fb343de1aef1ef335520eccb330d5b4e6c8
Author: yuhun-alibaba 
Date:   2018-02-06T09:01:37Z

 * [WEEX-207] [android] statistics jsf init status and upload




---

[GitHub] incubator-weex pull request #1039: * [WEEX-207] [android] statistics jsf ini...

2018-02-25 Thread yuhun-alibaba 
Github user yuhun-alibaba closed the pull request at:

https://github.com/apache/incubator-weex/pull/1039


---

[GitHub] incubator-weex issue #1039: * [WEEX-207] [android] statistics jsf init statu...

2018-02-25 Thread weex-bot 
Github user weex-bot commented on the issue:

https://github.com/apache/incubator-weex/pull/1039
  






  

  
  Messages

  
  
  :book:
  has no jsfm file changed.

  

  :book:
  jsfm test finished.

  




  Generated by :no_entry_sign: http://github.com/danger/danger-js/;>dangerJS




---

[GitHub] incubator-weex pull request #1039: * [WEEX-207] [android] statistics jsf ini...

2018-02-25 Thread yuhun-alibaba 
GitHub user yuhun-alibaba opened a pull request:

https://github.com/apache/incubator-weex/pull/1039

 * [WEEX-207] [android] statistics jsf init status and upload

[android] statistics jsf init status and upload

You can merge this pull request into a Git repository by running:

$ git pull https://github.com/yuhun-alibaba/incubator-weex 
add_jsf_failed_success_collection

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/incubator-weex/pull/1039.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #1039


commit d3ed3fb343de1aef1ef335520eccb330d5b4e6c8
Author: yuhun-alibaba 
Date:   2018-02-06T09:01:37Z

 * [WEEX-207] [android] statistics jsf init status and upload




---

[1/3] incubator-weex-site git commit: Updated Weex page architecture

2018-02-25 Thread hanks 
Repository: incubator-weex-site
Updated Branches:
  refs/heads/master 14e842f9a -> 288bb98e0


Updated Weex page architecture


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

Branch: refs/heads/master
Commit: 39719a3e46922b772d189e7ff2aa63051acc53ce
Parents: 14e842f
Author: Jonathan Dong 
Authored: Sat Feb 24 16:45:21 2018 +0800
Committer: Jonathan Dong 
Committed: Sat Feb 24 16:45:21 2018 +0800

--
 source/cn/guide/advanced/page-architecture.md | 16 ++--
 1 file changed, 10 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/39719a3e/source/cn/guide/advanced/page-architecture.md
--
diff --git a/source/cn/guide/advanced/page-architecture.md 
b/source/cn/guide/advanced/page-architecture.md
index 2321040..2842488 100644
--- a/source/cn/guide/advanced/page-architecture.md
+++ b/source/cn/guide/advanced/page-architecture.md
@@ -3,27 +3,27 @@ title: Weex 页面结构
 type: guide
 group: 高阶特性
 order: 8.6
-version: 2.1
+version: 2.2
 ---
 
 # Weex 页面结构
 
-一个 Weex 
页面就是一个相对独立解耦的移动应用界面，它不仅包
括了界面展示、更包
含了逻辑处理、设备能力使用、生命周期管理等部分。
+对于一个 Weex 
页面来说，在移动设备上它就是一个相对独立解耦的移动应用界面，它不ä»
…包括了界面展示，也包
含了应用逻辑、设备能力、生命周期管理等部分。
 
 ## 界面
 
 ### DOM 模型
 
-Weex 页面通过类似 HTML DOM 的方式管理界面，首å…
ˆé¡µé¢ä¼šè¢«åˆ†è§£ä¸ºä¸€ä¸ª DOM 树，，每个 DOM 
结点都代表了一个相对独立的 native 视图的单å…
ƒã€‚然后不同的视图单元之间通过æ 
‘形结构组合在了一起，构成一个完整的页面。
+Weex 页面通过类似 HTML DOM 的方式管理界面。首先，Weex 会在 
JavaScript 执行环境中将界面模板解析为 Virtual DOM æ 
‘表示，每个 DOM 节点都代表了一个相对独立的 native 
视图的单元；再将该 Virtual DOM 映
射到移动设备上，生成用于表示移动设备界面的 Native DOM æ 
‘，最后再使用移动控件将之渲染为真正的界面。
 
-**相关链接**
-
-* [Weex Native DOM APIs](../../references/native-dom-api.html)
+关于 Virtual DOM 和 Native DOM，可以通过`weex debugger`中的`Element 
Mode`选项查看。
 
 ### 组件
 
 Weex 支持文字、图片、视频等内容型组件，也支持 
div、list、scroller 等容器型组件，还包括 
slider、input、textarea、switch 等多种特殊的组件。Weex 
的界面就是由这些组件以 DOM 树的方式构建出来的。
 
+组件分为**内置组件**和**扩展组件**两类，内置组件随Weex 
SDK提供，提供构建界面的基础能力；如果觉得不够用或者
满足不了特定使用需要，Weex也支持开发者
自己创建扩展组件，并通过Weex提供的注册接口将组件集成到应用中使用。
+
 **相关链接**
 
 * [Weex 组件列表](../../references/components/index.html)
@@ -40,6 +40,8 @@ Weex 页面中的组件会按ç…
§ä¸€å®šçš„布局规范来进行排布，我们这
 
 Weex 提供了非常丰富的系统功能 API，包
括弹出存储、网络、导航、弹对话框和 toast 等，开发者
可以在 Weex 页面通过获取一个 native module 的方式引å…
¥å¹¶è°ƒç”¨è¿™äº›å®¢æˆ·ç«¯åŠŸèƒ½ API。
 
+开发者也可以通过Weex提供的 Module 扩展能力，注册自定义的 
API 使用。
+
 **相关链接**
 
 * [Weex 模块列表](../../references/modules/index.html)
@@ -47,3 +49,5 @@ Weex 提供了非常丰富的系统功能 API，包
括弹出存储、网络、
 ## 生命周期
 
 每个 Weex 页面都有å…
¶è‡ªèº«çš„生命周期，页面从开始被创建到最后被销毁，会经历到整个过程。这是通过对
 Weex 页面的创建和销毁，在路由中通过 SDK 
自行定义并实现的。
+
+由于 Weex 内置 Vue，对于 Vue 实例的生命周期回调 Weex 
提供原生支持，具体可参照 Vue 生命周期相关文档。
\ No newline at end of file

[2/3] incubator-weex-site git commit: fix spelling mistake for navigator module reference

2018-02-25 Thread hanks 
fix spelling mistake for navigator module reference

In the parameter the url param instruction went wrong into `stirng`.
Changed this into `string`

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

Branch: refs/heads/master
Commit: d5759f9238a18a3e3f85de5a13c75b73dcb063c7
Parents: 14e842f
Author: Souler Ou 
Authored: Sun Feb 25 21:09:56 2018 +0800
Committer: GitHub 
Committed: Sun Feb 25 21:09:56 2018 +0800

--
 source/cn/references/modules/navigator.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex-site/blob/d5759f92/source/cn/references/modules/navigator.md
--
diff --git a/source/cn/references/modules/navigator.md 
b/source/cn/references/modules/navigator.md
index a7db145..a375a68 100644
--- a/source/cn/references/modules/navigator.md
+++ b/source/cn/references/modules/navigator.md
@@ -21,7 +21,7 @@ version: 2.1
  参数
 
 * `options {Object}`：选项参数
-  * `url {stirng}`：要压入的 Weex 页面的 URL
+  * `url {string}`：要压入的 Weex 页面的 URL
   * `animated {string}`：`"true"` 示意为页面压å…
¥æ—¶éœ€è¦åŠ¨ç”»æ•ˆæžœï¼Œ`"false"` 则不需要，默认值为 `"true"`
 * `callback {Function}`：执行完该操作后的回调函数

[3/3] incubator-weex-site git commit: fix spelling mistake for navigator module reference (#74)

2018-02-25 Thread hanks 
fix spelling mistake for navigator module reference (#74)


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

Branch: refs/heads/master
Commit: 288bb98e0db0e0145177c67d6afdc6364e89a2d5
Parents: 39719a3 d5759f9
Author: Hanks 
Authored: Mon Feb 26 10:56:02 2018 +0800
Committer: Hanks 
Committed: Mon Feb 26 10:56:02 2018 +0800

--
 source/cn/references/modules/navigator.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--