Skip to content
This repository was archived by the owner on Mar 26, 2023. It is now read-only.

Commit 34518f4

Browse files
committed
swipe-fixes
1 parent 21c9cef commit 34518f4

3 files changed

Lines changed: 11 additions & 164 deletions

File tree

src/events/swipe.js

Lines changed: 0 additions & 150 deletions
This file was deleted.

src/router/index.js

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const routes = [
44
{
55
path: '/',
66
name: 'timetable',
7-
component: () => import('../views/Timetable.vue')
7+
component: () => import('../views/Timetable.vue'),
88
},
99
{
1010
path: '/init',
@@ -18,9 +18,4 @@ const router = createRouter({
1818
routes
1919
})
2020

21-
router.beforeEach((to, from, next) => {
22-
if (to.name === 'timetable' && !localStorage.getItem('timetable-group-id') && localStorage.getItem('timetable-group-id') != "-1")
23-
next({ name: 'init' });
24-
else next();
25-
})
2621
export default router;

src/views/Timetable.vue

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
<script>
1616
import EventRow from '@/components/EventRow.vue'
17-
import swipe from '@/events/swipe'
1817
export default {
1918
name: "Timetable",
2019
data() {
@@ -24,7 +23,7 @@ export default {
2423
date: new Date(),
2524
groupId: null,
2625
groupInfo: { number: '' },
27-
timetable: [],
26+
timetable: []
2827
};
2928
},
3029
components: {
@@ -60,11 +59,11 @@ export default {
6059
})
6160
6261
},
63-
swipeEventHandler(detail) {
62+
swipeEventHandler(e) {
6463
var nextDate = new Date(this.date)
65-
if (detail.dir == 'right')
64+
if (e.detail.dir == 'left')
6665
nextDate.setDate(this.date.getDate() + 1);
67-
if (detail.dir == 'left')
66+
if (e.detail.dir == 'right')
6867
nextDate.setDate(this.date.getDate() - 1);
6968
document.dispatchEvent(new CustomEvent('change-main-date', { detail: { date: nextDate } }));
7069
}
@@ -76,15 +75,18 @@ export default {
7675
this.date = e.detail.date;
7776
this.loadTimetableOnDate(this.date);
7877
});
78+
7979
},
8080
mounted() {
8181
this.groupId = localStorage.getItem('timetable-group-id');
8282
this.loadGroupInfo();
83-
// вызов функции swipe с предварительными настройками
84-
swipe(document, { maxTime: 2000, minTime: 100, maxDist: 300, minDist: 60 });
8583
// обработка свайпов
86-
document.addEventListener("swipe", (e) => this.swipeEventHandler(e.detail));
84+
document.addEventListener("swipe", this.swipeEventHandler);
8785
},
86+
unmounted(){
87+
document.removeEventListener("swipe", this.swipeEventHandler);
88+
console.log('removed');
89+
}
8890
};
8991
9092
</script>

0 commit comments

Comments
 (0)