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/08/21 06:17:42 UTC
[4/7] incubator-weex git commit: * [html5] fix test case and rebuild
some logic
* [html5] fix test case and rebuild some logic
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/8a4ea14b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/8a4ea14b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/8a4ea14b
Branch: refs/heads/0.16-dev
Commit: 8a4ea14bb1e89f2d0936608245b3056aac295dc9
Parents: 11def4c
Author: erha19 <fa...@gmail.com>
Authored: Thu Aug 17 20:27:49 2017 +0800
Committer: erha19 <fa...@gmail.com>
Committed: Thu Aug 17 20:27:49 2017 +0800
----------------------------------------------------------------------
html5/render/vue/core/node.js | 21 +-------------------
html5/render/vue/utils/event.js | 32 ++++++++++++++++++++++++++-----
html5/test/render/vue/core/node.js | 1 -
html5/test/render/vue/utils/event.js | 10 ++++++++++
4 files changed, 38 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8a4ea14b/html5/render/vue/core/node.js
----------------------------------------------------------------------
diff --git a/html5/render/vue/core/node.js b/html5/render/vue/core/node.js
index 60d87b3..23603aa 100644
--- a/html5/render/vue/core/node.js
+++ b/html5/render/vue/core/node.js
@@ -17,7 +17,7 @@
* under the License.
*/
-import { isArray, createEvent, extend } from '../utils'
+import { isArray, createEvent, createBubblesEvent } from '../utils'
import config from '../config'
// The space used to store the tap event queue
@@ -63,25 +63,6 @@ const supportedEvents = [
]
/**
- * Create Bubbles Event.
- * @param {DOMString} type
- * @param {Object} props
- */
-export function createBubblesEvent (target, type, props) {
- const event = new Event(type, { bubbles: true })
- try {
- Object.defineProperty(event, 'target', {
- enumerable: true,
- value: target || null
- })
- }
- catch (err) {
- return extend({}, event, { target: target || null })
- }
- return event
-}
-
-/**
* emit native events to enable v-on.
* @param {VComponent} context: which one to emit a event on.
* @param {array | object} extras: extra events. You can pass in multiple arguments here.
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8a4ea14b/html5/render/vue/utils/event.js
----------------------------------------------------------------------
diff --git a/html5/render/vue/utils/event.js b/html5/render/vue/utils/event.js
index 94b7a94..c5f8c38 100644
--- a/html5/render/vue/utils/event.js
+++ b/html5/render/vue/utils/event.js
@@ -35,22 +35,44 @@ function extend (to, ...args) {
*/
export function createEvent (target, type, props) {
const event = new Event(type, { bubbles: false })
- // event.preventDefault()
- // event.stopPropagation()
extend(event, props)
// phantomjs don't support customer event
- if (window.navigator.userAgent.indexOf('PhantomJS') !== -1) {
+ if (window.navigator.userAgent.toLowerCase().indexOf('phantomjs') !== -1) {
return event
}
try {
Object.defineProperty(event, 'target', {
enumerable: true,
- value: target || null
+ value: target
})
}
catch (err) {
- return extend({}, event, { target: target || null })
+ return extend({}, event, { target: target })
+ }
+ return event
+}
+
+/**
+ * Create a bubbable Event.
+ * @param {DOMString} type
+ * @param {Object} props
+ */
+export function createBubblesEvent (target, type, props) {
+ const event = new Event(type, { bubbles: true })
+ extend(event, props)
+ // phantomjs don't support customer event
+ if (window.navigator.userAgent.toLowerCase().indexOf('phantomjs') !== -1) {
+ return event
+ }
+ try {
+ Object.defineProperty(event, 'target', {
+ enumerable: true,
+ value: target
+ })
+ }
+ catch (err) {
+ return extend({}, event, { target: target })
}
return event
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8a4ea14b/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 fca0ebe..7235a85 100644
--- a/html5/test/render/vue/core/node.js
+++ b/html5/test/render/vue/core/node.js
@@ -20,7 +20,6 @@
import { init } from '../helper/runtime'
import div from '../../../../render/vue/components/div'
-
import eventBubbleBundle from '../data/build/dotvue/event-bubble.js'
init('core node', (Vue, helper) => {
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8a4ea14b/html5/test/render/vue/utils/event.js
----------------------------------------------------------------------
diff --git a/html5/test/render/vue/utils/event.js b/html5/test/render/vue/utils/event.js
index 9834d16..406f359 100644
--- a/html5/test/render/vue/utils/event.js
+++ b/html5/test/render/vue/utils/event.js
@@ -28,6 +28,16 @@ describe('utils', function () {
expect(clickEvent.type).to.be.equal('click')
expect(clickEvent.target).to.be.a('null')
})
+ it('createBubblesEvent', () => {
+ const {
+ createBubblesEvent
+ } = event
+ const clickEvent = createBubblesEvent('', 'click')
+ expect(createBubblesEvent).to.be.a('function')
+ expect(clickEvent.type).to.be.equal('click')
+ expect(clickEvent.target).to.be.a('null')
+ expect(clickEvent.bubbles).to.be.true
+ })
it('createCustomEvent', () => {
const {
createCustomEvent