From e5fe1d9d9f760781953a59cff52b64cec70e9572 Mon Sep 17 00:00:00 2001 From: Mazen Oweiss Date: Wed, 15 Nov 2023 10:31:48 -0600 Subject: [PATCH 1/3] Changed KResponsiveWindow to useKResponsivewindow in Slidehow Viewer Plugin --- AUTHORS.md | 1 + .../src/views/SlideshowRendererComponent.vue | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/AUTHORS.md b/AUTHORS.md index 76d71d1292a..603163e624c 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -99,3 +99,4 @@ If you have contributed to Kolibri, feel free to add your name and Github accoun | Vikramaditya Singh | Ghat0tkach | | Kris Katkus | katkuskris | | Garvit Singhal | GarvitSinghal47 | +| Mazen Oweiss | moweiss | \ No newline at end of file diff --git a/kolibri/plugins/slideshow_viewer/assets/src/views/SlideshowRendererComponent.vue b/kolibri/plugins/slideshow_viewer/assets/src/views/SlideshowRendererComponent.vue index 498d58a187a..7dbddeaf23c 100644 --- a/kolibri/plugins/slideshow_viewer/assets/src/views/SlideshowRendererComponent.vue +++ b/kolibri/plugins/slideshow_viewer/assets/src/views/SlideshowRendererComponent.vue @@ -81,7 +81,7 @@ import client from 'kolibri.client'; import responsiveElementMixin from 'kolibri.coreVue.mixins.responsiveElementMixin'; - import responsiveWindowMixin from 'kolibri.coreVue.mixins.responsiveWindowMixin'; + import useKResponsiveWindow from 'kolibri-design-system/lib/useKResponsiveWindow'; import UiIconButton from 'kolibri-design-system/lib/keen/UiIconButton'; import CoreFullscreen from 'kolibri.coreVue.components.CoreFullscreen'; @@ -102,7 +102,17 @@ HooperPagination, HooperNavigation, }, - mixins: [responsiveElementMixin, responsiveWindowMixin], + setup() { + const { + windowIsLarge, + windowIsSmall + } = useKResponsiveWindow(); + return { + windowIsLarge, + windowIsSmall + } + }, + mixins: [responsiveElementMixin], data: () => ({ isInFullscreen: false, slides: [], From 03827060e8b3f171530abb3b38705526229d73f3 Mon Sep 17 00:00:00 2001 From: MisRob Date: Fri, 15 Dec 2023 09:02:21 +0100 Subject: [PATCH 2/3] Run linter --- .../src/views/SlideshowRendererComponent.vue | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/kolibri/plugins/slideshow_viewer/assets/src/views/SlideshowRendererComponent.vue b/kolibri/plugins/slideshow_viewer/assets/src/views/SlideshowRendererComponent.vue index 7dbddeaf23c..9f533324f7b 100644 --- a/kolibri/plugins/slideshow_viewer/assets/src/views/SlideshowRendererComponent.vue +++ b/kolibri/plugins/slideshow_viewer/assets/src/views/SlideshowRendererComponent.vue @@ -102,17 +102,14 @@ HooperPagination, HooperNavigation, }, + mixins: [responsiveElementMixin], setup() { - const { - windowIsLarge, - windowIsSmall - } = useKResponsiveWindow(); - return { - windowIsLarge, - windowIsSmall - } + const { windowIsLarge, windowIsSmall } = useKResponsiveWindow(); + return { + windowIsLarge, + windowIsSmall, + }; }, - mixins: [responsiveElementMixin], data: () => ({ isInFullscreen: false, slides: [], From 28b14b370099ac011d6fd7a5b230689e13c55040 Mon Sep 17 00:00:00 2001 From: MisRob Date: Fri, 15 Dec 2023 09:30:05 +0100 Subject: [PATCH 3/3] Fix AUTHORS.md format --- AUTHORS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AUTHORS.md b/AUTHORS.md index 603163e624c..36686477121 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -99,4 +99,4 @@ If you have contributed to Kolibri, feel free to add your name and Github accoun | Vikramaditya Singh | Ghat0tkach | | Kris Katkus | katkuskris | | Garvit Singhal | GarvitSinghal47 | -| Mazen Oweiss | moweiss | \ No newline at end of file +| Mazen Oweiss | moweiss |