Permalink
Browse files

* [ios] Fixed :Merge remote-tracking branch 'alibaba/ios-feature-2017…

…0118' into ios-feature-20170118-new-slider-neighbor-fix move "sliderview init" code to loadview method.
  • Loading branch information...
1 parent 6439820 commit 141fd9d40f01930cdda7fd2678865c7f0cc2ba24 @bluebird78999 bluebird78999 committed Dec 30, 2016
Showing with 16,903 additions and 1,338 deletions.
  1. +2 −0 .travis.yml
  2. +1 −1 doc/modules/navigator.md
  3. +3 −1 ios/playground/Podfile
  4. +2,032 −830 ios/playground/WeexDemo.xcodeproj/project.pbxproj
  5. +1 −1 ios/playground/WeexDemo.xcodeproj/xcshareddata/xcschemes/WeexDemo.xcscheme
  6. +2 −0 ios/playground/WeexDemo/AppDelegate.m
  7. +2 −4 ios/{sdk/WeexSDK/Sources/Manager/WXModuleManager.h → playground/WeexDemo/WXSyncTestModule.h}
  8. +38 −0 ios/playground/WeexDemo/WXSyncTestModule.m
  9. +47 −14 ios/sdk/WeexSDK.xcodeproj/project.pbxproj
  10. +90 −0 ios/sdk/WeexSDK.xcodeproj/xcshareddata/xcschemes/WeexSDKTests.xcscheme
  11. +13,865 −4 ios/sdk/WeexSDK/Resources/main.js
  12. +15 −0 ios/sdk/WeexSDK/Sources/Bridge/JSValue+Weex.h
  13. +90 −0 ios/sdk/WeexSDK/Sources/Bridge/JSValue+Weex.m
  14. +2 −2 ios/sdk/WeexSDK/Sources/Bridge/WXBridgeContext.h
  15. +58 −33 ios/sdk/WeexSDK/Sources/Bridge/WXBridgeContext.m
  16. +20 −0 ios/sdk/WeexSDK/Sources/Bridge/WXCallJSMethod.h
  17. +35 −0 ios/sdk/WeexSDK/Sources/Bridge/WXCallJSMethod.m
  18. +21 −0 ios/sdk/WeexSDK/Sources/Bridge/WXComponentMethod.h
  19. +51 −0 ios/sdk/WeexSDK/Sources/Bridge/WXComponentMethod.m
  20. +33 −1 ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m
  21. +28 −0 ios/sdk/WeexSDK/Sources/Bridge/WXModuleMethod.h
  22. +88 −0 ios/sdk/WeexSDK/Sources/Bridge/WXModuleMethod.m
  23. +26 −2 ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m
  24. +7 −0 ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m
  25. +9 −0 ios/sdk/WeexSDK/Sources/Component/WXSliderComponent.m
  26. +13 −6 ios/sdk/WeexSDK/Sources/Component/WXSliderNeighborComponent.m
  27. +6 −7 ios/sdk/WeexSDK/Sources/Component/WXTextAreaComponent.m
  28. +15 −2 ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m
  29. +2 −2 ios/sdk/WeexSDK/Sources/Component/WXTextInputComponent.m
  30. +2 −2 ios/sdk/WeexSDK/Sources/Display/WXComponent+Display.m
  31. +13 −1 ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.h
  32. +6 −1 ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m
  33. +13 −8 ios/sdk/WeexSDK/Sources/Manager/WXBridgeManager.h
  34. +46 −15 ios/sdk/WeexSDK/Sources/Manager/WXBridgeManager.m
  35. +3 −3 ios/sdk/WeexSDK/Sources/Manager/WXComponentFactory.m
  36. +0 −2 ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.h
  37. +0 −27 ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.m
  38. +3 −3 ios/sdk/WeexSDK/Sources/Manager/WXInvocationConfig.h
  39. +13 −87 ios/sdk/WeexSDK/Sources/Manager/WXInvocationConfig.m
  40. +2 −2 ios/sdk/WeexSDK/Sources/Manager/WXModuleFactory.h
  41. +14 −10 ios/sdk/WeexSDK/Sources/Manager/WXModuleFactory.m
  42. +0 −111 ios/sdk/WeexSDK/Sources/Manager/WXModuleManager.m
  43. +5 −5 ios/sdk/WeexSDK/Sources/Manager/WXSDKManager.h
  44. +5 −14 ios/sdk/WeexSDK/Sources/Manager/WXSDKManager.m
  45. +9 −9 ios/sdk/WeexSDK/Sources/Model/WXBridgeMethod.h
  46. +63 −22 ios/sdk/WeexSDK/Sources/Model/WXBridgeMethod.m
  47. +5 −0 ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
  48. +1 −0 ios/sdk/WeexSDK/Sources/Monitor/WXMonitor.h
  49. +1 −0 ios/sdk/WeexSDK/Sources/Network/WXResourceRequest.h
  50. +17 −5 ios/sdk/WeexSDK/Sources/Protocol/WXBridgeProtocol.h
  51. +12 −5 ios/sdk/WeexSDK/Sources/Utility/WXDefine.h
  52. +5 −0 ios/sdk/WeexSDKTests/TestSupportUtils.h
  53. +36 −2 ios/sdk/WeexSDKTests/TestSupportUtils.m
  54. +2 −10 ios/sdk/WeexSDKTests/WXAnimationModuleTests.m
  55. +12 −19 ios/sdk/WeexSDKTests/WXBridgeMethodTests.m
  56. +0 −7 ios/sdk/WeexSDKTests/WXConvertTests.m
  57. +0 −7 ios/sdk/WeexSDKTests/WXInstanceWrapTests.m
  58. +11 −11 ios/sdk/WeexSDKTests/WXRootViewTests.m
  59. +1 −8 ios/sdk/WeexSDKTests/WXSDKEngineTests.m
  60. +0 −11 ios/sdk/WeexSDKTests/WXSDKManagerTests.m
  61. +0 −7 ios/sdk/WeexSDKTests/WXStorageTests.m
  62. +1 −1 ios/sdk/WeexSDKTests/WXStreamModuleTests.m
  63. +0 −7 ios/sdk/WeexSDKTests/WXTimerModuleTests.m
  64. +0 −6 ios/sdk/WeexSDKTests/WeexSDKTests.m
View
@@ -0,0 +1,2 @@
+language: objective-c
+script: xcodebuild -project ios/sdk/WeexSDK.xcodeproj test -scheme WeexSDKTests CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO -destination 'platform=iOS Simulator,name=iPhone 6'
@@ -13,7 +13,7 @@ A series of navigator operation apis like `push`, `pop`.
#### Arguments
* `options`*(object)*: some options.
- * `url`*(stirng)*: The URL of the weex page to push.
+ * `url`*(string)*: The URL of the weex page to push.
* `animated`*(string)*: `true`if the weex page is push through animation, otherwise, `false`.
* `callback`*(object)*: the callback function after executing this action.
@@ -1,4 +1,6 @@
-source 'git@github.com/CocoaPods/Specs.git'
+#source 'git@github.com/CocoaPods/Specs.git'
+source "https://github.com/CocoaPods/Old-Specs”
+
platform :ios, '7.0'
#inhibit_all_warnings!
Oops, something went wrong.

0 comments on commit 141fd9d

Please sign in to comment.