Merge branch 'release/1.1.2'

Estelle00 · Estelle00 · commit c414881e6dcd · 2018-07-25T16:50:43.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 .idea
 /node_modules
 test/unit/coverage
+dist/
diff --git a/.npmignore b/.npmignore
@@ -12,4 +12,6 @@ test/
 .gitignore
 .npmignore
 .npmrc
+.travis.yml
+circle.yml
 yarn.lock
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,2 @@
+#### v1.0.7
+##### 1、修复全局无法引入bug
diff --git a/README.md b/README.md
@@ -27,7 +27,7 @@ import VueWow from 'vue-wow'
 Vue.use(VueWow)
 
 // mount with component
-import {UAnimateContainer, UAnimate} from 'vue'
+import {UAnimateContainer, UAnimate} from 'vue-wow'
 
 export default {
   components: {
diff --git a/build/webpack.dev.config.js b/build/webpack.dev.config.js
@@ -23,6 +23,7 @@ module.exports = merge(webpackBaseConfig, {
   resolve: {
     alias: {
       'vue-wow': path.resolve(ROOT_PATH, 'src/index')
+      // 'vue-wow': path.resolve(ROOT_PATH, 'dist/vue-wow.min')
     }
   },
   plugins: [
diff --git a/circle.yml b/circle.yml
@@ -0,0 +1,3 @@
+machine:
+  node:
+    version: 8
diff --git a/dist/vue-wow.js b/dist/vue-wow.js
diff --git a/dist/vue-wow.min.js b/dist/vue-wow.min.js
diff --git a/dist/vue-wow.min.js.gz b/dist/vue-wow.min.js.gz
diff --git a/dist/vue-wow.min.js.map b/dist/vue-wow.min.js.map
diff --git a/docs/index.html b/docs/index.html
@@ -2,7 +2,8 @@
 <html lang="zh-CN">
 <head>
   <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, user-scalable=no">
+  <meta name=viewport content="width=device-width,initial-scale=1,user-scalable=no,viewport-fit=cover">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
   <title>vue-wow</title>
 </head>
 <body>
diff --git a/docs/main.js b/docs/main.js
diff --git a/docs/vendor.bundle.js b/docs/vendor.bundle.js
diff --git a/examples/index.html b/examples/index.html
@@ -2,7 +2,8 @@
 <html lang="zh-CN">
 <head>
   <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, user-scalable=no">
+  <meta name=viewport content="width=device-width,initial-scale=1,user-scalable=no,viewport-fit=cover">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
   <title>vue-wow</title>
 </head>
 <body>
diff --git a/package.json b/package.json
@@ -1,11 +1,11 @@
 {
   "name": "vue-wow",
-  "version": "1.0.6",
+  "version": "1.1.2",
   "description": "VUE浏览器可视窗口加载",
-  "main": "dist/vue-wow.js",
+  "main": "dist/vue-wow.min.js",
   "scripts": {
     "lint": "eslint --ext .js,.vue src test/unit/specs",
-    "dev": "webpack-dev-server --content-base test/ --open --inline --hot --compress --history-api-fallback --port 8080 --config build/webpack.dev.config.js",
+    "dev": "webpack-dev-server --content-base test/ --open --inline --hot --compress --history-api-fallback --host 0.0.0.0 --port 8080 --config build/webpack.dev.config.js",
     "docs": "webpack --config build/webpack.docs.config.js",
     "dist:dev": "webpack --config build/webpack.dist.dev.config.js",
     "dist:prd": "webpack --config build/webpack.dist.prd.config.js",
diff --git a/src/components/animate/index.vue b/src/components/animate/index.vue
@@ -78,8 +78,10 @@
         }
       },
       resetAnimation (event) {
-        this.removeVM(this)
-        const {animateClass} = this
+        try {
+          this.removeVM(this)
+        } catch (e) {
+        }
         if (event.type.toLowerCase().indexOf('animationend') >= 0) {
           this.className = {}
           this.style = {}
diff --git a/src/components/container/index.vue b/src/components/container/index.vue
@@ -5,6 +5,7 @@
 </template>
 <script>
   import {on, off} from 'utils/dom'
+  import {isMobile} from 'utils/assist'
   export default {
     name: 'UAnimateContainer',
     props: {
@@ -23,6 +24,9 @@
     },
     data () {
       return {
+        conf: Object.assign({}, {
+          mobile: true
+        }, this.config),
         all: [],
         vmArr: [],
         scrolled: false,
@@ -34,10 +38,13 @@
     },
     methods: {
       start () {
-        const {vmArr} = this
-        on(window, 'scroll', this.scrollHandler)
-        on(window, 'resize', this.scrollHandler)
-        this.interval = setInterval(this.scrollCallback, 50)
+        if (!this.$isServer) {
+          if (!this.disabled) {
+            on(window, 'scroll', this.scrollHandler)
+            on(window, 'resize', this.scrollHandler)
+            this.interval = setInterval(this.scrollCallback, 50)
+          }
+        }
       },
       setVM (vm) {
         const index = this.all.findIndex(item => item._uid === vm._uid)
@@ -83,10 +90,20 @@
         }
       }
     },
+    provide () {
+      return {
+        setVM: this.setVM,
+        removeVM: this.removeVM,
+        disabled: this.disabled
+      }
+    },
     destroyed () {
       this.stop()
     },
     computed: {
+      disabled () {
+        return !this.conf.mobile && isMobile()
+      }
     }
   }
 </script>
diff --git a/src/index.js b/src/index.js
@@ -4,8 +4,8 @@
 import UAnimateContainer from 'components/container/index'
 import UAnimate from 'components/animate/index'
 function install (Vue) {
-  Vue.components(UAnimateContainer.name, UAnimateContainer)
-  Vue.components(UAnimate.name, UAnimate)
+  Vue.component(UAnimateContainer.name, UAnimateContainer)
+  Vue.component(UAnimate.name, UAnimate)
 }
 if (typeof window !== 'undefined' && window.Vue) {
   install(window.Vue)
diff --git a/src/mixins/index.js b/src/mixins/index.js
@@ -28,21 +28,17 @@ export default {
   },
   created () {
     if (!this.$isServer) {
-      this.addVM()
+      try {
+        this.setVM(this)
+      } catch (e) {
+      }
     }
   },
   mounted () {
     this.start()
   },
+  inject: ['setVM', 'removeVM', 'disabled'],
   methods: {
-    addVM () {
-      const {parent} = this
-      parent && parent.setVM(this)
-    },
-    removeVM () {
-      const {parent} = this
-      parent && parent.removeVM(this)
-    },
     start () {
       // 执行运动校验
       const {begin} = this
@@ -67,23 +63,5 @@ export default {
       if (!scrollListen) return false
       return isVisible(this.$el, offset)
     }
-  },
-  computed: {
-    parent () {
-      const {scrollListen} = this
-      if (scrollListen) {
-        let parent = this.$parent
-        while (parent && parent.$options.name !== 'UAnimateContainer') {
-          parent = parent.$parent
-        }
-        return parent
-      } else {
-        return undefined
-      }
-    },
-    // 判断是否为手机
-    disabled () {
-      return isMobile()
-    }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+#### v1.0.7`
	`2`	`+##### 1、修复全局无法引入bug`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ module.exports = merge(webpackBaseConfig, {`
`23`	`23`	`resolve: {`
`24`	`24`	`alias: {`
`25`	`25`	`'vue-wow': path.resolve(ROOT_PATH, 'src/index')`
	`26`	`+ // 'vue-wow': path.resolve(ROOT_PATH, 'dist/vue-wow.min')`
`26`	`27`	`}`
`27`	`28`	`},`
`28`	`29`	`plugins: [`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+machine:`
	`2`	`+ node:`
	`3`	`+ version: 8`