weex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jinji...@apache.org
Subject [44/50] [abbrv] incubator-weex git commit: Merge branch 'ios-feature-20170118' into dev-release095
Date Tue, 24 Jan 2017 08:21:55 GMT
Merge branch 'ios-feature-20170118' into dev-release095


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

Branch: refs/heads/master
Commit: 1e837f38a967798a2f3f6d948b2eb727470be5c9
Parents: 4d9dcc1 50641f1
Author: sospartan <sospartan@gmail.com>
Authored: Wed Jan 11 17:01:16 2017 +0800
Committer: sospartan <sospartan@gmail.com>
Committed: Wed Jan 11 17:01:16 2017 +0800

----------------------------------------------------------------------
 examples/component/slider-neighbor/index.we     |  74 ++++
 .../slider-neighbor/silder-neighbor.we          |  75 ----
 examples/index.we                               |   2 +
 examples/module/websocket-demo.we               | 112 +++++
 .../WeexDemo.xcodeproj/project.pbxproj          |  73 ++--
 .../contents.xcworkspacedata                    |   7 +
 .../xcshareddata/xcschemes/WeexDemo.xcscheme    |   2 +-
 ios/playground/WeexDemo/AppDelegate.m           |   4 +-
 ios/playground/WeexDemo/Scanner/WXScannerVC.m   |   2 +-
 ios/playground/WeexDemo/WXDemoViewController.m  |   6 +
 ios/playground/WeexDemo/WXSyncTestModule.h      |  14 +
 ios/playground/WeexDemo/WXSyncTestModule.m      |  38 ++
 ios/sdk/WeexSDK.podspec                         |  12 +-
 ios/sdk/WeexSDK.xcodeproj/project.pbxproj       | 192 +++++++--
 ios/sdk/WeexSDK/Resources/main.js               |  14 +-
 ios/sdk/WeexSDK/Sources/Bridge/JSValue+Weex.h   |  15 +
 ios/sdk/WeexSDK/Sources/Bridge/JSValue+Weex.m   |  90 ++++
 .../WeexSDK/Sources/Bridge/WXBridgeContext.h    |  11 +-
 .../WeexSDK/Sources/Bridge/WXBridgeContext.m    | 127 ++++--
 ios/sdk/WeexSDK/Sources/Bridge/WXCallJSMethod.h |  20 +
 ios/sdk/WeexSDK/Sources/Bridge/WXCallJSMethod.m |  35 ++
 .../WeexSDK/Sources/Bridge/WXComponentMethod.h  |  21 +
 .../WeexSDK/Sources/Bridge/WXComponentMethod.m  |  51 +++
 .../Sources/Bridge/WXDebugLoggerBridge.m        |   5 +
 ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m |  40 +-
 ios/sdk/WeexSDK/Sources/Bridge/WXModuleMethod.h |  28 ++
 ios/sdk/WeexSDK/Sources/Bridge/WXModuleMethod.m |  99 +++++
 .../Sources/Component/WXCanvasComponent.m       |  16 +-
 .../WeexSDK/Sources/Component/WXCellComponent.h |   4 +-
 .../WeexSDK/Sources/Component/WXCellComponent.m |  10 +
 .../Component/WXComponent+GradientColor.h       |  20 +
 .../Component/WXComponent+GradientColor.m       | 116 +++++
 .../Sources/Component/WXComponent_internal.h    |  20 +-
 .../Sources/Component/WXImageComponent.m        |  56 ++-
 .../Sources/Component/WXIndicatorComponent.m    |   5 +-
 .../WeexSDK/Sources/Component/WXListComponent.m |  48 ++-
 .../Sources/Component/WXScrollerComponent.h     |   2 +
 .../Sources/Component/WXScrollerComponent.m     |  18 +-
 .../Sources/Component/WXSliderComponent.m       |  48 ++-
 .../Component/WXSliderNeighborComponent.m       | 103 ++---
 .../Sources/Component/WXTextAreaComponent.m     | 199 +++++----
 .../WeexSDK/Sources/Component/WXTextComponent.m |  40 +-
 .../Sources/Component/WXTextInputComponent.m    | 262 ++++++------
 ios/sdk/WeexSDK/Sources/Component/WXTransform.h |   3 +
 ios/sdk/WeexSDK/Sources/Component/WXTransform.m |  25 +-
 .../Sources/Component/WXVideoComponent.m        |   2 +-
 .../Sources/Controller/WXBaseViewController.m   |  48 ++-
 ios/sdk/WeexSDK/Sources/Debug/WXDebugTool.m     |  46 +-
 .../Sources/Display/WXComponent+Display.m       |  40 +-
 ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.h    |  51 ++-
 ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m    |  62 ++-
 ios/sdk/WeexSDK/Sources/Engine/WXSDKError.h     |   5 +-
 .../WeexSDK/Sources/Events/WXComponent+Events.m | 141 ++++++-
 .../Sources/Handler/WXNetworkDefaultImpl.h      |  14 -
 .../Sources/Handler/WXNetworkDefaultImpl.m      | 111 -----
 .../WeexSDK/Sources/Layout/WXComponent+Layout.m |  87 ++--
 .../WeexSDK/Sources/Loader/WXResourceLoader.h   |  30 ++
 .../WeexSDK/Sources/Loader/WXResourceLoader.m   | 174 ++++++++
 .../WeexSDK/Sources/Loader/WXWebSocketLoader.h  |  24 ++
 .../WeexSDK/Sources/Loader/WXWebSocketLoader.m  | 131 ++++++
 .../WeexSDK/Sources/Manager/WXBridgeManager.h   |  29 +-
 .../WeexSDK/Sources/Manager/WXBridgeManager.m   |  87 +++-
 .../Sources/Manager/WXComponentFactory.m        |   6 +-
 .../Sources/Manager/WXComponentManager.h        |  12 +-
 .../Sources/Manager/WXComponentManager.m        |  58 +--
 .../Sources/Manager/WXDatePickerManager.h       |   1 -
 .../Sources/Manager/WXDatePickerManager.m       |  58 +--
 .../WeexSDK/Sources/Manager/WXHandlerFactory.m  |   1 -
 .../Sources/Manager/WXInvocationConfig.h        |   6 +-
 .../Sources/Manager/WXInvocationConfig.m        | 100 +----
 .../WeexSDK/Sources/Manager/WXModuleFactory.h   |   4 +-
 .../WeexSDK/Sources/Manager/WXModuleFactory.m   |  32 +-
 .../WeexSDK/Sources/Manager/WXModuleManager.h   |  16 -
 .../WeexSDK/Sources/Manager/WXModuleManager.m   | 111 -----
 ios/sdk/WeexSDK/Sources/Manager/WXRuleManager.m |  11 +-
 ios/sdk/WeexSDK/Sources/Manager/WXSDKManager.h  |  10 +-
 ios/sdk/WeexSDK/Sources/Manager/WXSDKManager.m  |  19 +-
 .../WeexSDK/Sources/Manager/WXServiceFactory.h  |  38 ++
 .../WeexSDK/Sources/Manager/WXServiceFactory.m  | 102 +++++
 ios/sdk/WeexSDK/Sources/Model/WXBridgeMethod.h  |  18 +-
 ios/sdk/WeexSDK/Sources/Model/WXBridgeMethod.m  |  85 +++-
 ios/sdk/WeexSDK/Sources/Model/WXComponent.h     |  10 +
 ios/sdk/WeexSDK/Sources/Model/WXComponent.m     |  39 +-
 ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.h   |  56 ++-
 ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m   | 421 +++++++++++++------
 .../Sources/Model/WXSDKInstance_private.h       |   8 +
 .../WeexSDK/Sources/Module/WXAnimationModule.m  |  26 +-
 ios/sdk/WeexSDK/Sources/Module/WXDomModule.m    |  31 +-
 .../Sources/Module/WXGlobalEventModule.m        |   1 +
 ios/sdk/WeexSDK/Sources/Module/WXMetaModule.h   |  14 +
 ios/sdk/WeexSDK/Sources/Module/WXMetaModule.m   |  40 ++
 .../WeexSDK/Sources/Module/WXNavigatorModule.m  |  28 +-
 ios/sdk/WeexSDK/Sources/Module/WXStreamModule.h |   2 +-
 ios/sdk/WeexSDK/Sources/Module/WXStreamModule.m | 220 +++++-----
 .../WeexSDK/Sources/Module/WXWebSocketModule.h  |  15 +
 .../WeexSDK/Sources/Module/WXWebSocketModule.m  | 137 ++++++
 ios/sdk/WeexSDK/Sources/Monitor/WXMonitor.h     |   2 +
 .../WeexSDK/Sources/Network/WXResourceRequest.h |  35 ++
 .../WeexSDK/Sources/Network/WXResourceRequest.m |  57 +++
 .../Sources/Network/WXResourceRequestHandler.h  |  45 ++
 .../WXResourceRequestHandlerDefaultImpl.h       |  15 +
 .../WXResourceRequestHandlerDefaultImpl.m       |  90 ++++
 .../Sources/Network/WXResourceResponse.h        |  14 +
 .../Sources/Network/WXResourceResponse.m        |  14 +
 .../WeexSDK/Sources/Protocol/WXBridgeProtocol.h |  28 +-
 .../Sources/Protocol/WXNavigationProtocol.h     |  31 +-
 .../Sources/Protocol/WXNetworkProtocol.h        |   1 +
 .../Sources/Protocol/WXURLRewriteProtocol.h     |  10 +-
 ios/sdk/WeexSDK/Sources/Utility/WXConvert.h     |  22 +-
 ios/sdk/WeexSDK/Sources/Utility/WXConvert.m     |  87 +++-
 ios/sdk/WeexSDK/Sources/Utility/WXDefine.h      |  27 +-
 ios/sdk/WeexSDK/Sources/Utility/WXType.h        |  13 +-
 ios/sdk/WeexSDK/Sources/Utility/WXUtility.h     |  57 ++-
 ios/sdk/WeexSDK/Sources/Utility/WXUtility.m     | 119 ++++--
 .../View/WXComponent+PseudoClassManagement.h    |  66 +++
 .../View/WXComponent+PseudoClassManagement.m    | 144 +++++++
 .../Sources/View/WXComponent+ViewManagement.m   |  14 +-
 ios/sdk/WeexSDK/Sources/View/WXView.m           |   2 +-
 .../Sources/WebSocket/SRWebSocket+Weex.h        |  18 +
 .../Sources/WebSocket/SRWebSocket+Weex.m        |  36 ++
 .../Sources/WebSocket/WXWebSocketDefaultImpl.h  |  14 +
 .../Sources/WebSocket/WXWebSocketDefaultImpl.m  | 110 +++++
 .../Sources/WebSocket/WXWebSocketHandler.h      |  26 ++
 ios/sdk/WeexSDK/Sources/WeexSDK.h               |   1 +
 ios/sdk/WeexSDKTests/TestSupportUtils.m         |   2 +-
 ios/sdk/WeexSDKTests/WXBridgeMethodTests.m      |  24 +-
 ios/sdk/WeexSDKTests/WXNetworkTests.m           | 109 -----
 ios/sdk/WeexSDKTests/WXRootViewTests.m          |   4 +-
 ios/sdk/WeexSDKTests/WXSDKEngineTests.m         |  15 +-
 ios/sdk/WeexSDKTests/WXSDKManagerTests.m        |   4 -
 ios/sdk/WeexSDKTests/WXStreamModuleTests.m      |   4 +-
 ios/sdk/WeexSDKTests/WXURLRewriteTests.m        |   4 +-
 132 files changed, 4549 insertions(+), 1697 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1e837f38/ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m
----------------------------------------------------------------------


Mime
View raw message