From 274d8f6809d1e39f5e8ba002295f9f86e22095c4 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Mon, 8 Aug 2016 22:09:56 -0400
Subject: [PATCH] fix copy/paste

---
 .../components/navdrawer/navdrawer.js         | 49 ++++++++++++-------
 dashboard-ui/scripts/librarybrowser.js        |  6 ++-
 2 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/dashboard-ui/components/navdrawer/navdrawer.js b/dashboard-ui/components/navdrawer/navdrawer.js
index d96246e597..6653db4d54 100644
--- a/dashboard-ui/components/navdrawer/navdrawer.js
+++ b/dashboard-ui/components/navdrawer/navdrawer.js
@@ -1,4 +1,4 @@
-define(['browser', 'hammer', 'css!./navdrawer', 'scrollStyles'], function (browser, Hammer) {
+define(['browser', 'css!./navdrawer', 'scrollStyles'], function (browser) {
 
     return function (options) {
 
@@ -35,7 +35,7 @@
             this.initialize();
         };
 
-        TouchMenuLA.prototype.initElements = function () {
+        TouchMenuLA.prototype.initElements = function (Hammer) {
             options.target.classList.add('touch-menu-la');
             options.target.style.width = options.width + 'px';
             options.target.style.left = -options.width + 'px';
@@ -44,7 +44,10 @@
                 mask = document.createElement('div');
                 mask.className = 'tmla-mask';
                 document.body.appendChild(mask);
-                maskHammer = new Hammer(mask, null);
+
+                if (Hammer) {
+                    maskHammer = new Hammer(mask, null);
+                }
             }
         };
 
@@ -89,7 +92,7 @@
             self.checkMenuState(ev.deltaX, ev.deltaY);
         }
 
-        function initEdgeSwipe() {
+        function initEdgeSwipe(Hammer) {
             if (options.disableEdgeSwipe) {
                 return;
             }
@@ -258,6 +261,27 @@
             }
         };
 
+        function initWithHammer(Hammer) {
+            
+            if (Hammer) {
+                menuHammer = Hammer(options.target, null);
+            }
+
+            self.initElements(Hammer);
+
+            if (Hammer) {
+                self.touchStartMenu();
+                self.touchEndMenu();
+                self.eventStartMask();
+                self.eventEndMask();
+                initEdgeSwipe(Hammer);
+            }
+
+            if (!options.disableMask) {
+                self.clickMaskClose();
+            }
+        }
+
         TouchMenuLA.prototype.initialize = function () {
 
             options = Object.assign(defaults, options || {});
@@ -267,20 +291,11 @@
                 options.disableEdgeSwipe = true;
             }
 
-            menuHammer = Hammer(options.target, null);
-
-            self.initElements();
-
-            self.touchStartMenu();
-            self.touchEndMenu();
-            self.eventStartMask();
-            self.eventEndMask();
-
-            if (!options.disableMask) {
-                self.clickMaskClose();
+            if (browser.touch) {
+                require(['hammer'], initWithHammer);
+            } else {
+                initWithHammer();
             }
-
-            initEdgeSwipe();
         };
 
         return new TouchMenuLA();
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index 54f008b303..fff150844f 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -2,7 +2,7 @@
 
     function fadeInRight(elem) {
 
-        var pct = browserInfo.mobile ? '3.5%' : '0.5%';
+        var pct = browserInfo.mobile ? '4%' : '0.5%';
 
         var keyframes = [
           { opacity: '0', transform: 'translate3d(' + pct + ', 0, 0)', offset: 0 },
@@ -163,6 +163,10 @@
 
             configureSwipeTabs: function (ownerpage, tabs) {
 
+                if (!browserInfo.touch) {
+                    return;
+                }
+
                 var pageCount = ownerpage.querySelectorAll('.pageTabContent').length;
 
                 require(['hammer'], function (Hammer) {