Skip to content
This repository was archived by the owner on Dec 11, 2019. It is now read-only.

Commit a21be2b

Browse files
committed
Supersede cd3dd78 by "scroll-touch-edge"
Auditors: @bbondy Test Plan: 1. Open google search result 2. Click any link and back to the search result 3. Make the window smaller by open dev console (shift + f8) 4. Make sure you can horizontally scroll the page 5. Make sure you can swipe back/forward when you scroll to the edge
1 parent 74790fc commit a21be2b

File tree

5 files changed

+2
-58
lines changed

5 files changed

+2
-58
lines changed

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

-14
Original file line numberDiff line numberDiff line change
@@ -156,17 +156,3 @@ document.addEventListener('keydown', (e /*: Event*/) => {
156156
break
157157
}
158158
})
159-
160-
chrome.ipc.on('check-swipe-back', (e) => {
161-
if (document.scrollingElement.scrollLeft === 0) {
162-
chrome.ipc.sendToHost('can-swipe-back')
163-
}
164-
})
165-
166-
chrome.ipc.on('check-swipe-forward', (e) => {
167-
const scrollEle = document.scrollingElement
168-
if (scrollEle.scrollLeft === 0 ||
169-
scrollEle.scrollLeft === (scrollEle.scrollWidth - scrollEle.clientWidth)) {
170-
chrome.ipc.sendToHost('can-swipe-forward')
171-
}
172-
})

js/actions/webviewActions.js

-17
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44

55
'use strict'
66

7-
const messages = require('../constants/messages.js')
8-
97
const getWebview = () =>
108
document.querySelector('.frameWrapper.isActive webview')
119

@@ -53,21 +51,6 @@ const webviewActions = {
5351
}
5452
},
5553

56-
/**
57-
* Check two-finger gesture swipe back/forward ability
58-
* @param {bool} back - true for back, false for forward
59-
*/
60-
checkSwipe: function (back) {
61-
const webview = getWebview()
62-
if (webview) {
63-
if (back) {
64-
webview.send(messages.CHECK_SWIPE_BACK)
65-
} else {
66-
webview.send(messages.CHECK_SWIPE_FORWARD)
67-
}
68-
}
69-
},
70-
7154
/**
7255
* Set/unset webkit fullscreen status
7356
* @param {Boolean} isFullScreen - fullscreen state to go to

js/components/frame.js

-6
Original file line numberDiff line numberDiff line change
@@ -753,12 +753,6 @@ class Frame extends ImmutableComponent {
753753
}
754754
}
755755
break
756-
case messages.CAN_SWIPE_BACK:
757-
currentWindow.webContents.send(messages.CAN_SWIPE_BACK)
758-
break
759-
case messages.CAN_SWIPE_FORWARD:
760-
currentWindow.webContents.send(messages.CAN_SWIPE_FORWARD)
761-
break
762756
case messages.CLEAR_BROWSING_DATA_NOW:
763757
method = (clearBrowsingDataDetail) =>
764758
windowActions.setClearBrowsingDataDetail(clearBrowsingDataDetail)

js/components/main.js

+2-17
Original file line numberDiff line numberDiff line change
@@ -187,8 +187,6 @@ class Main extends ImmutableComponent {
187187
// Navigates back/forward on macOS two-finger swipe
188188
var trackingFingers = false
189189
var swipeGesture = false
190-
var canSwipeBack = false
191-
var canSwipeForward = false
192190
var isSwipeOnEdge = false
193191
var deltaX = 0
194192
var deltaY = 0
@@ -200,11 +198,6 @@ class Main extends ImmutableComponent {
200198
deltaX = deltaX + e.deltaX
201199
deltaY = deltaY + e.deltaY
202200
time = (new Date()).getTime() - startTime
203-
if (deltaX > 0) {
204-
webviewActions.checkSwipe(false)
205-
} else if (deltaX < 0) {
206-
webviewActions.checkSwipe(true)
207-
}
208201
}
209202
})
210203
ipc.on(messages.DEBUG_REACT_PROFILE, (e, args) => {
@@ -233,12 +226,6 @@ class Main extends ImmutableComponent {
233226
}, true)
234227
}
235228
})
236-
ipc.on(messages.CAN_SWIPE_BACK, (e) => {
237-
canSwipeBack = true
238-
})
239-
ipc.on(messages.CAN_SWIPE_FORWARD, (e) => {
240-
canSwipeForward = true
241-
})
242229
ipc.on(messages.ENABLE_SWIPE_GESTURE, (e) => {
243230
swipeGesture = true
244231
})
@@ -255,15 +242,13 @@ class Main extends ImmutableComponent {
255242
})
256243
ipc.on('scroll-touch-end', function () {
257244
if (time > 50 && trackingFingers && Math.abs(deltaY) < 50 && isSwipeOnEdge) {
258-
if (deltaX > 70 && canSwipeForward) {
245+
if (deltaX > 70) {
259246
ipc.emit(messages.SHORTCUT_ACTIVE_FRAME_FORWARD)
260-
} else if (deltaX < -70 && canSwipeBack) {
247+
} else if (deltaX < -70) {
261248
ipc.emit(messages.SHORTCUT_ACTIVE_FRAME_BACK)
262249
}
263250
}
264251
trackingFingers = false
265-
canSwipeBack = false
266-
canSwipeForward = false
267252
deltaX = 0
268253
deltaY = 0
269254
startTime = 0

js/constants/messages.js

-4
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,6 @@ const messages = {
7575
GO_BACK: _,
7676
GO_FORWARD: _,
7777
RELOAD: _,
78-
CAN_SWIPE_BACK: _,
79-
CAN_SWIPE_FORWARD: _,
80-
CHECK_SWIPE_BACK: _,
81-
CHECK_SWIPE_FORWARD: _,
8278
ENABLE_SWIPE_GESTURE: _,
8379
DISABLE_SWIPE_GESTURE: _,
8480
SHOW_FLASH_NOTIFICATION: _,

0 commit comments

Comments
 (0)