Merge pull request #4369 from darkdh/obsolete-swipe-viewport-solution

Supersede cd3dd78 by "scroll-touch-edge"

Author: bbondy

app/extensions/brave/content/scripts/inputHandler.js

@@ -156,17 +156,3 @@ document.addEventListener('keydown', (e /*: Event*/) => {
       break
   }
 })
-
-chrome.ipc.on('check-swipe-back', (e) => {
-  if (document.scrollingElement.scrollLeft === 0) {
-    chrome.ipc.sendToHost('can-swipe-back')
-  }
-})
-
-chrome.ipc.on('check-swipe-forward', (e) => {
-  const scrollEle = document.scrollingElement
-  if (scrollEle.scrollLeft === 0 ||
-    scrollEle.scrollLeft === (scrollEle.scrollWidth - scrollEle.clientWidth)) {
-    chrome.ipc.sendToHost('can-swipe-forward')
-  }
-})

js/actions/webviewActions.js

@@ -53,21 +53,6 @@ const webviewActions = {
     }
   },
 
-  /**
-   * Check two-finger gesture swipe back/forward ability
-   * @param {bool} back - true for back, false for forward
-   */
-  checkSwipe: function (back) {
-    const webview = getWebview()
-    if (webview) {
-      if (back) {
-        webview.send(messages.CHECK_SWIPE_BACK)
-      } else {
-        webview.send(messages.CHECK_SWIPE_FORWARD)
-      }
-    }
-  },
-
   /**
    * Set/unset webkit fullscreen status
    * @param {Boolean} isFullScreen - fullscreen state to go to

js/components/frame.js

@@ -760,12 +760,6 @@ class Frame extends ImmutableComponent {
             }
           }
           break
-        case messages.CAN_SWIPE_BACK:
-          currentWindow.webContents.send(messages.CAN_SWIPE_BACK)
-          break
-        case messages.CAN_SWIPE_FORWARD:
-          currentWindow.webContents.send(messages.CAN_SWIPE_FORWARD)
-          break
         case messages.CLEAR_BROWSING_DATA_NOW:
           method = (clearBrowsingDataDetail) =>
             windowActions.setClearBrowsingDataDetail(clearBrowsingDataDetail)

js/components/main.js

@@ -187,8 +187,6 @@ class Main extends ImmutableComponent {
     // Navigates back/forward on macOS two-finger swipe
     var trackingFingers = false
     var swipeGesture = false
-    var canSwipeBack = false
-    var canSwipeForward = false
     var isSwipeOnEdge = false
     var deltaX = 0
     var deltaY = 0
@@ -200,11 +198,6 @@ class Main extends ImmutableComponent {
         deltaX = deltaX + e.deltaX
         deltaY = deltaY + e.deltaY
         time = (new Date()).getTime() - startTime
-        if (deltaX > 0) {
-          webviewActions.checkSwipe(false)
-        } else if (deltaX < 0) {
-          webviewActions.checkSwipe(true)
-        }
       }
     })
     ipc.on(messages.DEBUG_REACT_PROFILE, (e, args) => {
@@ -233,12 +226,6 @@ class Main extends ImmutableComponent {
         }, true)
       }
     })
-    ipc.on(messages.CAN_SWIPE_BACK, (e) => {
-      canSwipeBack = true
-    })
-    ipc.on(messages.CAN_SWIPE_FORWARD, (e) => {
-      canSwipeForward = true
-    })
     ipc.on(messages.ENABLE_SWIPE_GESTURE, (e) => {
       swipeGesture = true
     })
@@ -255,15 +242,13 @@ class Main extends ImmutableComponent {
     })
     ipc.on('scroll-touch-end', function () {
       if (time > 50 && trackingFingers && Math.abs(deltaY) < 50 && isSwipeOnEdge) {
-        if (deltaX > 70 && canSwipeForward) {
+        if (deltaX > 70) {
           ipc.emit(messages.SHORTCUT_ACTIVE_FRAME_FORWARD)
-        } else if (deltaX < -70 && canSwipeBack) {
+        } else if (deltaX < -70) {
           ipc.emit(messages.SHORTCUT_ACTIVE_FRAME_BACK)
         }
       }
       trackingFingers = false
-      canSwipeBack = false
-      canSwipeForward = false
       deltaX = 0
       deltaY = 0
       startTime = 0

js/constants/messages.js

@@ -75,10 +75,6 @@ const messages = {
   GO_BACK: _,
   GO_FORWARD: _,
   RELOAD: _,
-  CAN_SWIPE_BACK: _,
-  CAN_SWIPE_FORWARD: _,
-  CHECK_SWIPE_BACK: _,
-  CHECK_SWIPE_FORWARD: _,
   ENABLE_SWIPE_GESTURE: _,
   DISABLE_SWIPE_GESTURE: _,
   SHOW_FLASH_NOTIFICATION: _,