From 60b319b1b4a43484ade93338e68fa57da290fd38 Mon Sep 17 00:00:00 2001
From: sdras <sarah.drasner@gmail.com>
Date: Sun, 20 Jan 2019 23:47:06 -0700
Subject: [PATCH] simplify with one hook, update readme

---
 README.md                     |  4 ++--
 src/components/AppDetails.vue |  3 ---
 src/hooks/enablescroll.js     | 27 ---------------------------
 src/hooks/preventscroll.js    | 33 +++++++++++++++++++++++++--------
 4 files changed, 27 insertions(+), 40 deletions(-)
 delete mode 100644 src/hooks/enablescroll.js

diff --git a/README.md b/README.md
index 5aadd55..b1f3d57 100644
--- a/README.md
+++ b/README.md
@@ -8,5 +8,5 @@ If you'd like to see them in action, check out `src/hooks` and `src/AppGrid.vue`
 
 Created by [Vue CLI](https://cli.vuejs.org/)
 
-To run: `yarn run serve`
-To build: `yarn run build`
+* To run: `yarn run serve`
+* To build: `yarn run build`
diff --git a/src/components/AppDetails.vue b/src/components/AppDetails.vue
index 6f9f6a6..868a651 100644
--- a/src/components/AppDetails.vue
+++ b/src/components/AppDetails.vue
@@ -14,8 +14,6 @@
 
 <script>
 import { preventscroll } from "./../hooks/preventscroll.js";
-import { enablescroll } from "./../hooks/enablescroll.js";
-
 import { TimelineMax, TweenMax, Sine, Elastic } from "gsap";
 import Splitting from "splitting";
 import "splitting/dist/splitting.css";
@@ -38,7 +36,6 @@ export default {
   },
   hooks() {
     preventscroll();
-    enablescroll();
   },
   methods: {
     lettering() {
diff --git a/src/hooks/enablescroll.js b/src/hooks/enablescroll.js
deleted file mode 100644
index 1a80986..0000000
--- a/src/hooks/enablescroll.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import { useDestroyed } from "vue-hooks";
-
-export function enablescroll() {
-  useDestroyed(() => {
-    const preventDefault = (e) => {
-      e = e || window.event;
-      if (e.preventDefault)
-        e.preventDefault();
-      e.returnValue = false;
-    }
-
-    (() => {
-      if (window.removeEventListener)
-        window.removeEventListener('DOMMouseScroll', preventDefault, false);
-
-      //firefox
-      window.addEventListener('DOMMouseScroll', (e) => {
-        e.stopPropagation();
-      }, true);
-
-      window.onmousewheel = document.onmousewheel = null;
-      window.onwheel = null;
-      window.ontouchmove = null;
-      document.onkeydown = null;
-    })()
-  });
-}
\ No newline at end of file
diff --git a/src/hooks/preventscroll.js b/src/hooks/preventscroll.js
index c3ce452..fcd6c54 100644
--- a/src/hooks/preventscroll.js
+++ b/src/hooks/preventscroll.js
@@ -1,14 +1,14 @@
-import { useMounted } from "vue-hooks";
+import { useDestroyed, useMounted } from "vue-hooks";
 
 export function preventscroll() {
-  useMounted(() => {
-    const preventDefault = (e) => {
-      e = e || window.event;
-      if (e.preventDefault)
-        e.preventDefault();
-      e.returnValue = false;
-    }
+  const preventDefault = (e) => {
+    e = e || window.event;
+    if (e.preventDefault)
+      e.preventDefault();
+    e.returnValue = false;
+  }
 
+  useMounted(() => {
     // keycodes for left, up, right, down
     const keys = { 37: 1, 38: 1, 39: 1, 40: 1 };
 
@@ -28,4 +28,21 @@ export function preventscroll() {
       document.onkeydown = preventDefaultForScrollKeys;
     })()
   });
+
+  useDestroyed(() => {
+    (() => {
+      if (window.removeEventListener)
+        window.removeEventListener('DOMMouseScroll', preventDefault, false);
+
+      //firefox
+      window.addEventListener('DOMMouseScroll', (e) => {
+        e.stopPropagation();
+      }, true);
+
+      window.onmousewheel = document.onmousewheel = null;
+      window.onwheel = null;
+      window.ontouchmove = null;
+      document.onkeydown = null;
+    })()
+  });
 } 
\ No newline at end of file