update Affix & BackTop

梁灏
1 parent e4767e5a
Showing 3 changed files with 55 additions and 9 deletions Show diff stats
src/components/affix/affix.vue
src/components/back-top/back-top.vue
src/utils/dom.js
@@ -5,8 +5,8 @@
         </div>
     </div>
 </template>
-
 <script>
+    import { on, off } from '../../utils/dom';
     const prefixCls = 'ivu-affix';
     function getScroll(target, top) {
@@ -73,12 +73,16 @@
             }
         },
         mounted () {
-            window.addEventListener('scroll', this.handleScroll, false);
-            window.addEventListener('resize', this.handleScroll, false);
+//            window.addEventListener('scroll', this.handleScroll, false);
+//            window.addEventListener('resize', this.handleScroll, false);
+            on(window, 'scroll', this.handleScroll);
+            on(window, 'resize', this.handleScroll);
         },
         beforeDestroy () {
-            window.removeEventListener('scroll', this.handleScroll, false);
-            window.removeEventListener('resize', this.handleScroll, false);
+//            window.removeEventListener('scroll', this.handleScroll, false);
+//            window.removeEventListener('resize', this.handleScroll, false);
+            off(window, 'scroll', this.handleScroll);
+            off(window, 'resize', this.handleScroll);
         },
         methods: {
             handleScroll () {
@@ -9,6 +9,7 @@
 </template>
 <script>
     import { scrollTop } from '../../utils/assist';
+    import { on, off } from '../../utils/dom';
     const prefixCls = 'ivu-back-top';
     export default {
@@ -36,12 +37,16 @@
             };
         },
         mounted () {
-            window.addEventListener('scroll', this.handleScroll, false);
-            window.addEventListener('resize', this.handleScroll, false);
+//            window.addEventListener('scroll', this.handleScroll, false);
+//            window.addEventListener('resize', this.handleScroll, false);
+            on(window, 'scroll', this.handleScroll);
+            on(window, 'resize', this.handleScroll);
         },
         beforeDestroy () {
-            window.removeEventListener('scroll', this.handleScroll, false);
-            window.removeEventListener('resize', this.handleScroll, false);
+//            window.removeEventListener('scroll', this.handleScroll, false);
+//            window.removeEventListener('resize', this.handleScroll, false);
+            off(window, 'scroll', this.handleScroll);
+            off(window, 'resize', this.handleScroll);
         },
         computed: {
             classes () {
+import Vue from 'vue';
+
+const isServer = Vue.prototype.$isServer;
+
+/* istanbul ignore next */
+export const on = (function() {
+    if (!isServer && document.addEventListener) {
+        return function(element, event, handler) {
+            if (element && event && handler) {
+                element.addEventListener(event, handler, false);
+            }
+        };
+    } else {
+        return function(element, event, handler) {
+            if (element && event && handler) {
+                element.attachEvent('on' + event, handler);
+            }
+        };
+    }
+})();
+
+/* istanbul ignore next */
+export const off = (function() {
+    if (!isServer && document.removeEventListener) {
+        return function(element, event, handler) {
+            if (element && event) {
+                element.removeEventListener(event, handler, false);
+            }
+        };
+    } else {
+        return function(element, event, handler) {
+            if (element && event) {
+                element.detachEvent('on' + event, handler);
+            }
+        };
+    }
+})();
 \ No newline at end of file