You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by da...@apache.org on 2017/07/24 09:58:49 UTC
[1/3] incubator-weex git commit: * [html5] remove useless style code
Repository: incubator-weex
Updated Branches:
refs/heads/0.15-dev f35f97d8d -> 7ca3a1e37
* [html5] remove useless style 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/f31ecb35
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/f31ecb35
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/f31ecb35
Branch: refs/heads/0.15-dev
Commit: f31ecb3501462447a51e88f0221cd97195a0412b
Parents: c964a90
Author: erha19 <fa...@gmail.com>
Authored: Mon Jul 24 17:03:07 2017 +0800
Committer: erha19 <fa...@gmail.com>
Committed: Mon Jul 24 17:03:07 2017 +0800
----------------------------------------------------------------------
html5/test/render/vue/data/dotvue/event-bubble-bar.vue | 11 -----------
html5/test/render/vue/data/dotvue/event-bubble.vue | 11 -----------
2 files changed, 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f31ecb35/html5/test/render/vue/data/dotvue/event-bubble-bar.vue
----------------------------------------------------------------------
diff --git a/html5/test/render/vue/data/dotvue/event-bubble-bar.vue b/html5/test/render/vue/data/dotvue/event-bubble-bar.vue
index 02f289d..5e68537 100644
--- a/html5/test/render/vue/data/dotvue/event-bubble-bar.vue
+++ b/html5/test/render/vue/data/dotvue/event-bubble-bar.vue
@@ -18,14 +18,3 @@
}
}
</script>
-
-<style scoped>
-.event-bubble-outter {
- height: 400px;
- background-color: #f7f7f7;
-}
-.event-bubble-inner {
- height: 200px;
- background-color: #ccc;
-}
-</style>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f31ecb35/html5/test/render/vue/data/dotvue/event-bubble.vue
----------------------------------------------------------------------
diff --git a/html5/test/render/vue/data/dotvue/event-bubble.vue b/html5/test/render/vue/data/dotvue/event-bubble.vue
index 3ee3be4..eea9b29 100644
--- a/html5/test/render/vue/data/dotvue/event-bubble.vue
+++ b/html5/test/render/vue/data/dotvue/event-bubble.vue
@@ -23,14 +23,3 @@
}
}
</script>
-
-<style scoped>
-.ct {
- height: 600px;
- background-color: #fff;
-}
-.txt {
- font-size: 32px;
- padding: 20px;
-}
-</style>
[3/3] incubator-weex git commit: Merge branch '0.15-dev' of
https://git-wip-us.apache.org/repos/asf/incubator-weex into 0.15-dev
Posted by da...@apache.org.
Merge branch '0.15-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into 0.15-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/7ca3a1e3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/7ca3a1e3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/7ca3a1e3
Branch: refs/heads/0.15-dev
Commit: 7ca3a1e379b0fea464b665f2deb292ee8b12bd5b
Parents: 50329bb f35f97d
Author: MrRaindrop <te...@gmail.com>
Authored: Mon Jul 24 17:58:28 2017 +0800
Committer: MrRaindrop <te...@gmail.com>
Committed: Mon Jul 24 17:58:28 2017 +0800
----------------------------------------------------------------------
.../weex/ui/component/list/WXListComponent.java | 7 +-
examples/vue/components/input.vue | 17 +
.../WeexDemo.xcodeproj/project.pbxproj | 4 +
ios/playground/WeexDemo/WXDemoViewController.m | 3 +-
ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 8 +
.../WeexSDK/Sources/Bridge/WXBridgeContext.m | 12 +-
ios/sdk/WeexSDK/Sources/Bridge/WXBridgeMethod.m | 16 +-
ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 19 +-
.../WeexSDK/Sources/Component/WXEditComponent.m | 2 +-
.../Sources/Component/WXImageComponent.m | 1 +
.../Sources/Component/WXScrollerComponent.m | 1 +
.../WeexSDK/Sources/Component/WXTextComponent.m | 1 +
.../Sources/Manager/WXComponentManager.m | 4 +-
.../WeexSDK/Sources/Manager/WXTracingManager.h | 125 ++++++
.../WeexSDK/Sources/Manager/WXTracingManager.m | 382 +++++++++++++++++++
ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 3 +
.../WeexSDK/Sources/Model/WXJSExceptionInfo.h | 1 +
ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 7 +
.../WeexSDK/Sources/Module/WXAnimationModule.m | 7 +-
ios/sdk/WeexSDK/Sources/Module/WXDomModule.m | 4 +-
ios/sdk/WeexSDK/Sources/Utility/WXLog.m | 1 +
.../Sources/View/WXComponent+ViewManagement.m | 3 +-
ios/sdk/WeexSDK/Sources/WeexSDK.h | 1 +
23 files changed, 602 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
[2/3] incubator-weex git commit: * [html5] create one instance for
test
Posted by da...@apache.org.
* [html5] create one instance for test
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/50329bb5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/50329bb5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/50329bb5
Branch: refs/heads/0.15-dev
Commit: 50329bb59184deb6a45f24b6a05caeebc99bdb92
Parents: f31ecb3
Author: erha19 <fa...@gmail.com>
Authored: Mon Jul 24 17:05:36 2017 +0800
Committer: erha19 <fa...@gmail.com>
Committed: Mon Jul 24 17:05:36 2017 +0800
----------------------------------------------------------------------
html5/test/render/vue/core/node.js | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/50329bb5/html5/test/render/vue/core/node.js
----------------------------------------------------------------------
diff --git a/html5/test/render/vue/core/node.js b/html5/test/render/vue/core/node.js
index 562a9c7..ffd2355 100644
--- a/html5/test/render/vue/core/node.js
+++ b/html5/test/render/vue/core/node.js
@@ -25,9 +25,12 @@ import eventBubbleBundle from '../data/build/dotvue/event-bubble.js'
init('core node', (Vue, helper) => {
const id = 'test-event-bubble'
-
+ let vm = null
+ let el = null
before(() => {
helper.register('div', div)
+ vm = helper.createVm(eventBubbleBundle, id)
+ el = vm.$el.querySelector('.event-bubble-outter')
})
describe('stop event bubble', function () {
@@ -39,10 +42,7 @@ init('core node', (Vue, helper) => {
}
it('should trigger the closest parent.', function (done) {
- const vm = helper.createVm(eventBubbleBundle, id)
- const el = vm.$el.querySelector('.event-bubble-outter')
expect(vm.tracker).to.equal('')
-
/**
* click outter div. should trigget event on the outter div.
* and should execute handlers by the priority of:
@@ -60,9 +60,7 @@ init('core node', (Vue, helper) => {
})
it('should not bubble if already triggered.', function (done) {
- const vm = helper.createVm(eventBubbleBundle, id)
const inner = vm.$el.querySelector('.event-bubble-inner')
-
/**
* click inner div. should just trigget the inner handler and
* shouldn't bubbe to outter div.