提交 e26acfc8 编写于 作者: Q qiang

Merge branch 'dev' into v3

...@@ -33,8 +33,7 @@ function addEventListener (pageId, callback) { ...@@ -33,8 +33,7 @@ function addEventListener (pageId, callback) {
channel && channel.close() channel && channel.close()
channel = new BroadcastChannel_(getPageId()) channel = new BroadcastChannel_(getPageId())
channel.onmessage = onPlusMessage channel.onmessage = onPlusMessage
} else { } else if (!globalEvent) {
globalEvent && globalEvent.removeEventListener('plusMessage', onPlusMessage)
globalEvent = weex_.requireModule('globalEvent') globalEvent = weex_.requireModule('globalEvent')
globalEvent.addEventListener('plusMessage', onPlusMessage) globalEvent.addEventListener('plusMessage', onPlusMessage)
} }
...@@ -78,7 +77,7 @@ export function showPage ({ ...@@ -78,7 +77,7 @@ export function showPage ({
// eslint-disable-next-line // eslint-disable-next-line
plus_ = context.plus || plus plus_ = context.plus || plus
// eslint-disable-next-line // eslint-disable-next-line
weex_ = context.weex || weex weex_ = context.weex || (typeof weex === 'object' ? weex : null)
// eslint-disable-next-line // eslint-disable-next-line
BroadcastChannel_ = context.BroadcastChannel || (typeof BroadcastChannel === 'object' ? BroadcastChannel : null) BroadcastChannel_ = context.BroadcastChannel || (typeof BroadcastChannel === 'object' ? BroadcastChannel : null)
const titleNView = { const titleNView = {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册