Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions js/webviewGestures.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
var webviews = require('webviews.js')
var settings = require('util/settings/settings.js')

var webviewGestures = {
showBackArrow: function () {
Expand Down Expand Up @@ -87,15 +88,17 @@ function resetScrollCounters () {
}

function onSwipeGestureLowVelocity () {
const swipeGesturesDisabled = settings.get('disableSwipeGestures')

//we can't detect scroll position in an iframe, so never trigger a back gesture from it
if (isInFrame) {
if (isInFrame || swipeGesturesDisabled) {
return
}

webviews.callAsync(tabs.getSelected(), 'getZoomFactor', function(err, result) {
const minScrollDistance = 150 * result;

if ((leftMouseMove / rightMouseMove > 5) || (rightMouseMove / leftMouseMove > 5)) {
if ((leftMouseMove / rightMouseMove > 5) || (rightMouseMove / leftMouseMove > 5)) {
// swipe to the left to go forward
if (leftMouseMove - beginningScrollRight > minScrollDistance && Math.abs(horizontalMouseMove / verticalMouseMove) > 3) {
if (beginningScrollRight < 5) {
Expand Down
1 change: 1 addition & 0 deletions localization/languages/ar.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@
"settingsLanguageSelection": null, //missing translation
"settingsSeparateTitlebarToggle": "إستعمل شريط عنوان منفصل",
"settingsAutoplayToggle": "تفعيل التشغيل التلقائي",
"settingsDisableSwipeGestures": "تعطيل الإيماءات 'رجوع' و'تقدم' على لوحة التتبع",
"settingsOpenTabsInForegroundToggle": "الإنتقال إلى التبويب الجديد عند فتحه",
"settingsUserscriptsExplanation": {
"unsafeHTML": "يمكن سكريبت المستخدم من تغير سلوك المواقع - <a href=\"https://github.com/minbrowser/min/wiki/userscripts\">معرفة المزيد</a>."
Expand Down
1 change: 1 addition & 0 deletions localization/languages/be.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@
"settingsLanguageSelection": null, //missing translation
"settingsSeparateTitlebarToggle": "Выкарыстоўваць сістэмны загаловак акна",
"settingsAutoplayToggle": "Уключыць аўтаматычнае прайграванне",
"settingsDisableSwipeGestures": "Адключыць жэсты 'Назад' і 'Наперад' на трэкпадзе",
"settingsOpenTabsInForegroundToggle": "Адкрываць новыя ўкладкі на пярэднім плане",
"settingsUserscriptsExplanation": {
"unsafeHTML": "Карыстальнiцкiя скрыпты дазваляюць змяняць паводзіны сайтаў - <a href=\"https://github.com/minbrowser/min/wiki/userscripts\">даведацца больш</a>."
Expand Down
1 change: 1 addition & 0 deletions localization/languages/bg.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@
"settingsSeparateTitlebarToggle": "Използване на отделна лента със заглавието",
"settingsAutoplayToggle": null, //missing translation
"settingsOpenTabsInForegroundToggle": "Отваряне на нови раздели на преден план",
"settingsDisableGoBackwardAndGoForwardGestures": "Деактивиране на жестове 'Назад' и 'Напред' на тъчпада",
"settingsUserscriptsExplanation": {
"unsafeHTML": "Потребителските скриптове Ви позволяват да промените поведението на уеб сайтове - <a href=\"https://github.com/minbrowser/min/wiki/userscripts\">научете повече</a>."
},
Expand Down
1 change: 1 addition & 0 deletions localization/languages/bn.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@
"settingsLanguageSelection": null, //missing translation
"settingsSeparateTitlebarToggle": "পৃথক শিরোনাম বার ব্যবহার করুন",
"settingsAutoplayToggle": null, //missing translation
"settingsDisableSwipeGestures": "ট্র্যাকপ্যাডে 'পেছনে যাওয়া' এবং 'সামনে যাওয়া' নির্দেশক বন্ধ করুন",
"settingsOpenTabsInForegroundToggle": "অগ্রভাগে নতুন ট্যাবগুলি খুলুন",
"settingsUserscriptsExplanation": {
"unsafeHTML": "ব্যবহারকারীর স্ক্রিপ্ট আপনাকে ওয়েবসাইটের আচরণ পরিবর্তন করার অনুমতি দেয় - <a href=\"https://github.com/minbrowser/min/wiki/userscripts\"> আরও শিখুন </a>"
Expand Down
1 change: 1 addition & 0 deletions localization/languages/ca.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@
"settingsLanguageSelection": null, //missing translation
"settingsSeparateTitlebarToggle": "Utilitzar barra de títol separada",
"settingsAutoplayToggle": "Habilitar Reproducció Automàtica",
"settingsDisableSwipeGestures": "Desactiva els gestos del trackpad de 'Anar enrere' i 'Anar endavant'",
"settingsOpenTabsInForegroundToggle": "Obrir noves pestanyes al primer pla",
"settingsUserscriptsExplanation": {
"unsafeHTML": "Els scripts d'usuari et permeten modificar el comportament dels llocs web - <a href=\"https://github.com/minbrowser/min/wiki/userscripts\">més informació</a>."
Expand Down
1 change: 1 addition & 0 deletions localization/languages/cs.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@
"settingsLanguageSelection": null, //missing translation
"settingsSeparateTitlebarToggle": "Použít systémové záhlaví okna",
"settingsAutoplayToggle": "Povolit automatické přehrávání",
"settingsDisableSwipeGestures": "Zakázat gesta trackpadu 'Zpět' a 'Vpřed'",
"settingsOpenTabsInForegroundToggle": "Ihned přepínat na nově otevřené karty",
"settingsUserscriptsExplanation": {
"unsafeHTML": "Uživatelské skripty umožňují upravit chování webových stránek - <a href=\"https://github.com/minbrowser/min/wiki/userscripts\">více informací</a>."
Expand Down
1 change: 1 addition & 0 deletions localization/languages/da.json
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@
"settingsSeparateTitlebarToggle": "Brug separat titellinje",
"settingsAutoplayToggle": "Aktiver Autoplay",
"settingsOpenTabsInForegroundToggle": "Åbn nye faner i forgrunden",
"settingsDisableGoBackwardAndGoForwardGestures": "Deaktiver 'Gå tilbage' og 'Gå fremad' trackpad-bevægelser",
"settingsUserscriptsExplanation": {
"unsafeHTML": "Brugerscripts giver dig mulighed for at ændre adfærd på websteder - <a href=\"https://github.com/minbrowser/min/wiki/userscripts\">få mere at vide her</a>."
},
Expand Down
1 change: 1 addition & 0 deletions localization/languages/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@
"settingsLanguageSelection": null, //missing translation
"settingsSeparateTitlebarToggle": "Separate Titelleiste nutzen",
"settingsAutoplayToggle": "Automatische Wiedergabe erlauben",
"settingsDisableSwipeGestures": "Deaktivieren Sie 'Zurück' und 'Vorwärts' Trackpad-Gesten",
"settingsOpenTabsInForegroundToggle": "Neue Tabs im Vordergrund öffnen",
"settingsUserscriptsExplanation": {
"unsafeHTML": "Benutzerdefinierte Skripte erlauben es das Verhalten von Webseiten zu modifizieren - <a href=\"https://github.com/minbrowser/min/wiki/userscripts\"> mehr dazu.</a>."
Expand Down
1 change: 1 addition & 0 deletions localization/languages/el.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@
"settingsLanguageSelection": null, //missing translation
"settingsSeparateTitlebarToggle": "Χρήση ξεχωριστής γραμμής τίτλου",
"settingsAutoplayToggle": "Ενεργοποίηση αυτοαναπαραγωγής",
"settingsDisableGoBackwardAndGoForwardGestures": "Απενεργοποίηση χειρονομιών 'Πίσω' και 'Εμπρός' στο trackpad",
"settingsOpenTabsInForegroundToggle": "Άνοιγμα νέας καρτέλας στο προσκήνιο",
"settingsUserscriptsExplanation": {
"unsafeHTML": "Τα scripts χρηστών σας επιτρέπουν να τροποποιήσετε την συμπεριφορά των ιστοσελίδων - <a href=\"https://github.com/minbrowser/min/wiki/userscripts\">μάθετε περισσότερα</a>."
Expand Down
1 change: 1 addition & 0 deletions localization/languages/en-US.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@
"settingsLanguageSelection": "Language: ",
"settingsSeparateTitlebarToggle": "Use separate title bar",
"settingsAutoplayToggle": "Enable Autoplay",
"settingsDisableSwipeGestures": "Disable 'Go Back' and 'Go Forward' trackpad gestures",
"settingsOpenTabsInForegroundToggle": "Open new tabs in the foreground",
"settingsUserscriptsExplanation": {
"unsafeHTML": "User scripts allow you to modify the behavior of websites - <a href=\"https://github.com/minbrowser/min/wiki/userscripts\">learn more</a>."
Expand Down
1 change: 1 addition & 0 deletions localization/languages/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@
"settingsLanguageSelection": null, //missing translation
"settingsSeparateTitlebarToggle": "Separar barra de título", //"Usar barra de título separada"
"settingsAutoplayToggle": "Habilitar reproducción automática",
"settingsDisableSwipeGestures": "Desactivar gestos de trackpad 'Ir Atrás' e 'Ir Adelante'",
"settingsOpenTabsInForegroundToggle": "Abrir nuevas pestañas en primer plano",
"settingsUserscriptsExplanation": {
"unsafeHTML": "Los userscripts te permiten modificar el comportamiento de los sitios web - <a href=\"https://github.com/minbrowser/min/wiki/userscripts\">Más información</a>."
Expand Down
1 change: 1 addition & 0 deletions localization/languages/fa.json
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@
"settingsLanguageSelection": null, //missing translation
"settingsSeparateTitlebarToggle": "نمایش نوار عنوان",
"settingsAutoplayToggle": "پخش خودکار",
"settingsDisableSwipeGestures": "غیرفعال کردن حرکات 'عقب' و 'جلو' در ترک‌پد",
"settingsOpenTabsInForegroundToggle": null, //missing translation
"settingsUserscriptsExplanation": {
"unsafeHTML": "اسکریپت های کاربر این اجازه را به شما می دهند تا رفتار سایت ها را تغییر دهید - <a href=\"https://github.com/minbrowser/min/wiki/userscripts\">اطلاعات بیشتر</a>."
Expand Down
1 change: 1 addition & 0 deletions localization/languages/fi.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@
"settingsLanguageSelection": null, //missing translation
"settingsSeparateTitlebarToggle": "Käytä erillistä otsikkopalkkia",
"settingsAutoplayToggle": "Toista automaattisesti",
"settingsDisableSwipeGestures": "Poista käytöstä 'Takaisin' ja 'Eteenpäin' ohjauslevyn eleet",
"settingsOpenTabsInForegroundToggle": "Avaa uudet välilehdet etualalla",
"settingsUserscriptsExplanation": {
"unsafeHTML": "Komentosarjat mahdollistavat sivustojen käyttäytymisen mukauttamisen - <a href=\"https://github.com/minbrowser/min/wiki/userscripts\">lisätietoja</a>."
Expand Down
1 change: 1 addition & 0 deletions localization/languages/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@
"settingsLanguageSelection": "Langue: ",
"settingsSeparateTitlebarToggle": "Afficher une barre de titre séparée",
"settingsAutoplayToggle": "Activer la lecture automatique",
"settingsDisableSwipeGestures": "Désactiver les gestes du pavé tactile 'Reculer' et 'Avancer'",
"settingsOpenTabsInForegroundToggle": "Ouvrir les nouveaux onglets au premiers plan",
"settingsUserscriptsExplanation": {
"unsafeHTML": "Les scripts personnalisés vous permettent de modifier le comportement des pages web - <a href=\"https://github.com/minbrowser/min/wiki/userscripts\">en savoir plus (en anglais)</a>."
Expand Down
1 change: 1 addition & 0 deletions localization/languages/hr.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@
"settingsLanguageSelection": "Jezik: ",
"settingsSeparateTitlebarToggle": "Koristi zasebnu naslovnu traku",
"settingsAutoplayToggle": "Omogući automatsku reprodukciju",
"settingsDisableSwipeGestures": "Onemogući geste trackpada 'Natrag' i 'Naprijed'",
"settingsOpenTabsInForegroundToggle": "Otvori nove kartice u prvom planu",
"settingsUserscriptsExplanation": {
"unsafeHTML": "Korisničke skripte omogućuju vam izmjenu ponašanja web stranica - <a href=\"https://github.com/minbrowser/min/wiki/userscripts\">Saznajte više</a>."
Expand Down
1 change: 1 addition & 0 deletions localization/languages/hu.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@
"settingsLanguageSelection": null, //missing translation
"settingsSeparateTitlebarToggle": null, //missing translation
"settingsAutoplayToggle": null, //missing translation
"settingsDisableSwipeGestures": "Tiltsa le a 'Vissza' és 'Előre' érintőpad gesztusokat",
"settingsOpenTabsInForegroundToggle": null, //missing translation
"settingsUserscriptsExplanation": "Felhasználói szkript magyarázat",
"settingsUserscriptShowDirectory": null, //missing translation,
Expand Down
1 change: 1 addition & 0 deletions localization/languages/id.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@
"settingsLanguageSelection": null, //missing translation
"settingsSeparateTitlebarToggle": "Gunakan bilah judul terpisah",
"settingsAutoplayToggle": "Aktifkan Putar Otomatis",
"settingsDisableSwipeGestures": "Nonaktifkan gestur trackpad 'Mundur' dan 'Maju'",
"settingsOpenTabsInForegroundToggle": "Buka tab baru di latar depan",
"settingsUserscriptsExplanation": {
"unsafeHTML": "User script memungkinkan Anda untuk merubah perilaku situs web - <a href=\"https://github.com/minbrowser/min/wiki/userscripts\">Pelajari lebih lanjut</a>."
Expand Down
1 change: 1 addition & 0 deletions localization/languages/it.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@
"settingsLanguageSelection": null, //missing translation
"settingsSeparateTitlebarToggle": "Usa barra del titolo separata",
"settingsAutoplayToggle": "Abilita Autoplay",
"settingsDisableSwipeGestures": "Disabilita i gesti 'Indietro' e 'Avanti' sul trackpad",
"settingsOpenTabsInForegroundToggle": "Apri nuove schede in primo piano",
"settingsUserscriptsExplanation": {
"unsafeHTML": "Gli script definiti dall'utente ti permettono di modificare il comportamento dei siti - <a href=\"https://github.com/minbrowser/min/wiki/userscripts\">scopri di più</a>."
Expand Down
1 change: 1 addition & 0 deletions localization/languages/ja.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@
"settingsLanguageSelection": null, //missing translation
"settingsSeparateTitlebarToggle": "別のタイトルバーを使用する",
"settingsAutoplayToggle": "自動再生を有効にする",
"settingsDisableSwipeGestures": "トラックパッドの「戻る」と「進む」ジェスチャーを無効にする",
"settingsOpenTabsInForegroundToggle": "フォアグラウンドで新しいタブを開く",
"settingsUserscriptsExplanation": {
"unsafeHTML": "ユーザースクリプトを使用して、Webサイトの動作を変更できます - <a href=\"https://github.com/minbrowser/min/wiki/userscripts\">詳細</a>。"
Expand Down
1 change: 1 addition & 0 deletions localization/languages/ko.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@
"settingsLanguageSelection": "언어 선택",
"settingsSeparateTitlebarToggle": "윈도우 기본 표시줄 사용",
"settingsAutoplayToggle": "자동재생 사용",
"settingsDisableSwipeGestures": "트랙패드 '뒤로 가기' 및 '앞으로 가기' 제스처 비활성화",
"settingsOpenTabsInForegroundToggle": "새 탭으로 열기 후에 열린 탭으로 이동",
"settingsUserscriptsExplanation": {
"unsafeHTML": "스크립트를 사용하면 사이트의 동작을 수정할 수 있습니다. - <a href=\"https://github.com/minbrowser/min/wiki/userscripts\">더보기</a>."
Expand Down
1 change: 1 addition & 0 deletions localization/languages/lt.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@
"settingsLanguageSelection": null, //missing translation
"settingsSeparateTitlebarToggle": null, //missing translation
"settingsAutoplayToggle": null, //missing translation
"settingsDisableSwipeGestures": "Išjungti 'Atgal' ir 'Pirmyn' lietimų gestus",
"settingsOpenTabsInForegroundToggle": null, //missing translation
"settingsUserscriptsExplanation": {
"unsafeHTML": "Naudotojo scenarijai leidžia jums modifikuoti internetinių svetainių elgseną - <a href=\"https://github.com/minbrowser/min/wiki/userscripts\">sužinokite daugiau</a>."
Expand Down
1 change: 1 addition & 0 deletions localization/languages/nl.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@
"settingsLanguageSelection": "Taal: ",
"settingsSeparateTitlebarToggle": "Gebruik aparte titelbalk",
"settingsAutoplayToggle": "Automatisch afspelen inschakelen",
"settingsDisableSwipeGestures": "Schakel trackpad-gebaren 'Vorige' en 'Volgende' uit",
"settingsOpenTabsInForegroundToggle": "Open nieuwe tabbladen op de voorgrond",
"settingsUserscriptsExplanation": {
"unsafeHTML": "Gebruikersscripten kunt u gebruiken om het gedrag van websites te wijzigingen - <a href=\"https://github.com/minbrowser/min/wiki/userscripts\">lees meer</a>."
Expand Down
1 change: 1 addition & 0 deletions localization/languages/pl.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@
"settingsLanguageSelection": "Język: ",
"settingsSeparateTitlebarToggle": "Użyj osobnego paska tytułu",
"settingsAutoplayToggle": "Włącz autoodtwarzanie",
"settingsDisableSwipeGestures": "Wyłącz gesty 'Wstecz' i 'Dalej' na gładziku",
"settingsOpenTabsInForegroundToggle": "Otwórz nowe karty na pierwszym planie",
"settingsUserscriptsExplanation": {
"unsafeHTML": "Skrypty użytkownika pozwalają modyfikować zachowanie stron internetowych - <a href=\"https://github.com/minbrowser/min/wiki/userscripts\">dowiedz się więcej</a>."
Expand Down
1 change: 1 addition & 0 deletions localization/languages/pt-BR.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@
"settingsLanguageSelection": "Idioma: ",
"settingsSeparateTitlebarToggle": "Usar a barra de título separada",
"settingsAutoplayToggle": "Habilitar reprodução automática",
"settingsDisableGoBackwardAndGoForwardGestures": "Desativar gestos de trackpad 'Voltar' e 'Avançar'",
"settingsOpenTabsInForegroundToggle": "Abrir novas abas em primeiro plano",
"settingsUserscriptsExplanation": {
"unsafeHTML": "Scripts do usuário permitem modificar o comportamento do site - <a href=\"https://github.com/minbrowser/min/wiki/userscripts\">Saiba mais</a>."
Expand Down
1 change: 1 addition & 0 deletions localization/languages/pt-PT.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@
"settingsLanguageSelection": "Idioma:",
"settingsSeparateTitlebarToggle": "Utilizar barra de título separada",
"settingsAutoplayToggle": "Ativar reprodução automática",
"settingsDisableSwipeGestures": "Desativar gestos de trackpad 'Voltar' e 'Avançar'",
"settingsOpenTabsInForegroundToggle": "Abrir novos separadores em primeiro plano",
"settingsUserscriptsExplanation": {
"unsafeHTML": "Os scripts permitem-lhe alterar o comportamento dos sites - <a href=\"https://github.com/minbrowser/min/wiki/userscripts\">Saber mais</a>."
Expand Down
1 change: 1 addition & 0 deletions localization/languages/ru.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@
"settingsLanguageSelection": "Язык: ",
"settingsSeparateTitlebarToggle": "Использовать системный заголовок окна",
"settingsAutoplayToggle": "Включить автоматическое воспроизведение",
"settingsDisableSwipeGestures": "Отключить жесты 'Назад' и 'Вперед' на трекпаде",
"settingsOpenTabsInForegroundToggle": "Открывать новые вкладки на переднем плане",
"settingsUserscriptsExplanation": {
"unsafeHTML": "Пользовательские скрипты позволяют изменять поведение сайтов - <a href=\"https://github.com/minbrowser/min/wiki/userscripts\">узнать больше</a>."
Expand Down
1 change: 1 addition & 0 deletions localization/languages/sr.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@
"settingsLanguageSelection": null, //missing translation
"settingsSeparateTitlebarToggle": "Koristi zasebanu naslovnu traku",
"settingsAutoplayToggle": "Dozvoli automatsku reprodukciju",
"settingsDisableSwipeGestures": "Isključi 'Nazad' i 'Napred' pokrete na tačpadu",
"settingsOpenTabsInForegroundToggle": "Otvori nove tabove u prvom planu",
"settingsUserscriptsExplanation": {
"unsafeHTML": "Korisničke skripte omogućavaju modifikovanje ponašanja sajtova - <a href=\"https://github.com/minbrowser/min/wiki/userscripts\">learn more</a>."
Expand Down
1 change: 1 addition & 0 deletions localization/languages/sv.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@
"settingsLanguageSelection": "Språk: ",
"settingsSeparateTitlebarToggle": "Använd separat titelrad",
"settingsAutoplayToggle": "Aktivera automatisk uppspelning",
"settingsDisableSwipeGestures": "Inaktivera 'Gå tillbaka' och 'Gå framåt' styrplattagester",
"settingsOpenTabsInForegroundToggle": "Öppna nya flikar i förgrunden",
"settingsUserscriptsExplanation": {
"unsafeHTML": "Användarscript låter dig ändra beteendet hos webbsidor - <a href=\"https://github.com/minbrowser/min/wiki/userscripts\">lär dig mer</a>."
Expand Down
Loading