Ver Fonte

move browser sniffing code back to core/util/env

Evan You há 9 anos atrás
pai
commit
c47e128eb6

+ 1 - 0
src/core/util/env.js

@@ -11,6 +11,7 @@ export const inBrowser =
 export const UA = inBrowser && window.navigator.userAgent.toLowerCase()
 export const isIE = UA && /msie|trident/.test(UA)
 export const isIE9 = UA && UA.indexOf('msie 9.0') > 0
+export const isEdge = UA && UA.indexOf('edge/') > 0
 export const isAndroid = UA && UA.indexOf('android') > 0
 
 // detect devtools

+ 1 - 1
src/platforms/web/compiler/directives/model.js

@@ -1,6 +1,6 @@
 /* @flow */
 
-import { isIE } from 'web/util/index'
+import { isIE } from 'core/util/env'
 import { addHandler, addProp, getBindingAttr } from 'compiler/helpers'
 
 let warn

+ 2 - 1
src/platforms/web/compiler/index.js

@@ -1,13 +1,14 @@
 /* @flow */
 
 import { extend, genStaticKeys, noop } from 'shared/util'
+import { isIE } from 'core/util/env'
 import { warn } from 'core/util/debug'
 import { compile as baseCompile } from 'compiler/index'
 import { detectErrors } from 'compiler/error-detector'
 import modules from './modules/index'
 import directives from './directives/index'
 import {
-  isIE, isReservedTag, isUnaryTag,
+  isReservedTag, isUnaryTag,
   mustUseProp, getTagNamespace, isPreTag
 } from '../util/index'
 

+ 1 - 2
src/platforms/web/runtime/directives/model.js

@@ -4,8 +4,7 @@
  */
 
 import { looseEqual, looseIndexOf } from 'shared/util'
-import { warn } from 'core/util/index'
-import { isAndroid, isIE9 } from 'web/util/index'
+import { warn, isAndroid, isIE9 } from 'core/util/index'
 
 const modelableTagRE = /^input|select|textarea|vue-component-[0-9]+(-[0-9a-zA-Z_\-]*)?$/
 

+ 1 - 1
src/platforms/web/runtime/directives/show.js

@@ -1,6 +1,6 @@
 /* @flow */
 
-import { isIE9 } from 'web/util/index'
+import { isIE9 } from 'core/util/env'
 import { enter, leave } from '../modules/transition'
 
 // recursively search for possible transition defined inside the component root

+ 1 - 2
src/platforms/web/runtime/modules/transition.js

@@ -1,7 +1,6 @@
 /* @flow */
 
-import { inBrowser } from 'core/util/index'
-import { isIE9 } from 'web/util/index'
+import { inBrowser, isIE9 } from 'core/util/index'
 import { cached, extend } from 'shared/util'
 import { mergeVNodeHook } from 'core/vdom/helpers'
 import { activeInstance } from 'core/instance/lifecycle'

+ 1 - 2
src/platforms/web/runtime/transition-util.js

@@ -1,7 +1,6 @@
 /* @flow */
 
-import { inBrowser } from 'core/util/index'
-import { isIE9 } from 'web/util/index'
+import { inBrowser, isIE9 } from 'core/util/index'
 import { remove } from 'shared/util'
 import { addClass, removeClass } from './class-util'
 

+ 0 - 1
src/platforms/web/util/index.js

@@ -1,7 +1,6 @@
 /* @flow */
 
 import { warn } from 'core/util/index'
-export { inBrowser, isIE, isIE9, isAndroid } from 'core/util/env'
 
 export * from './attrs'
 export * from './class'