feat: add taro env

NervJS · Sep 25, 2019 · 003f2aa · 003f2aa
1 parent f7eed66
commit 003f2aa
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/packages/nerv-utils/src/env.ts b/packages/nerv-utils/src/env.ts
@@ -33,7 +33,10 @@ export const doc: Document = isBrowser ? document : fakeDoc
 export const UA = isBrowser && window.navigator.userAgent.toLowerCase()
 
 export const isMacSafari = isBrowser && UA && window.navigator.platform &&
-  /mac/i.test(navigator.platform) && /^((?!chrome|android).)*safari/i.test(UA)
+  /mac/i.test(window.navigator.platform) && /^((?!chrome|android).)*safari/i.test(UA)
+
+export const isTaro = isBrowser && !document.scripts
 
 export const isIE9 = UA && UA.indexOf('msie 9.0') > 0
+
 export const isiOS = (UA && /iphone|ipad|ipod|ios/.test(UA))
diff --git a/packages/nerv/src/event.ts b/packages/nerv/src/event.ts
@@ -1,4 +1,4 @@
-import { isFunction, MapClass, doc, isiOS, isIE9 } from 'nerv-utils'
+import { isFunction, MapClass, doc, isiOS, isIE9, isTaro } from 'nerv-utils'
 import { noop } from 'nerv-shared'
 
 const ONINPUT = 'oninput'
@@ -94,7 +94,7 @@ export function attachEvent (
     return
   }
   let delegatedRoots = delegatedEvents.get(eventName)
-  if (unbubbleEvents[eventName] === 1) {
+  if (unbubbleEvents[eventName] === 1 || isTaro) {
     if (!delegatedRoots) {
       delegatedRoots = new MapClass()
     }
@@ -137,7 +137,7 @@ export function detachEvent (
     return
   }
   const delegatedRoots = delegatedEvents.get(eventName)
-  if (unbubbleEvents[eventName] === 1 && delegatedRoots) {
+  if ((unbubbleEvents[eventName] === 1 && delegatedRoots) || isTaro) {
     const event = delegatedRoots.get(domNode)
     if (event) {
       domNode.removeEventListener(parseEventName(eventName), event.event, false)