diff --git a/app/scripts/components/reader/reading_controller.js b/app/scripts/components/reader/reading_controller.js index d275cd1e..00ea14ff 100644 --- a/app/scripts/components/reader/reading_controller.js +++ b/app/scripts/components/reader/reading_controller.js @@ -66,9 +66,14 @@ export default [ s.searchData = searchData = null s.loading = true s.first_load = false - const onFirstLoad = _.once(() => - $timeout(() => $("html, body").animate({ scrollLeft: "1000px" }, 1000), 0) - ) + const onFirstLoad = _.once(() => { + // only if screen is small + if ($(window).width() < 768) { + $timeout(() => $("html, body").animate({ scrollLeft: "1000px" }, 1000), 0) + } else { + $timeout(() => $("html, body").animate({ scrollTop: "1000px" }, 1000), 0) + } + }) s.showPopup = false s.error = false s.show_chapters = false // index modal @@ -175,10 +180,9 @@ export default [ } const onKeyDown = function (event) { - let abort = event.metaKey || event.ctrlKey || event.altKey || $("input:focus").length + let abort = event.metaKey || event.ctrlKey || $("input:focus").length let isToggleOpen = [79, 129].includes(event.which) - console.log("🚀 ~ file: reading_controller.js:181 ~ isToggleOpen:", isToggleOpen) if (!isToggleOpen) { abort = abort || $("body.modal-open").length } @@ -187,11 +191,11 @@ export default [ return } s.$apply(function () { - switch (event.which) { - case 78: // n + switch (event.key) { + case "n": s.nextPage() break - case 39: // arrow right + case "ArrowRight": if ( $rootElement.prop("scrollWidth") - $window.scrollX === $($window).width() @@ -199,31 +203,31 @@ export default [ s.nextPage() } break - case 70: // f + case "f": s.prevPage() break - case 37: // arrow left + case "ArrowLeft": if ($window.scrollX < 10) { s.prevPage() } break - case 126: // f15 - case 68: // d + case "F15": + case "d": s.pageix = s.pageix - 10 s.pageToLoad = s.pageix break - case 127: // f16 - case 77: // m + case "F16": + case "m": s.pageix = s.pageix + 10 s.pageToLoad = s.pageix break - case 128: // f17 - case 73: // i + case "F17": + case "i": navigator.clipboard.writeText(s.editorLbWorkId || s.workinfo.lbworkid) s.$emit("notify", "Kopierade lbworkid") break - case 129: // f18 - case 79: // o + case "F18": + case "o": s.show_about = !s.show_about break } diff --git a/app/scripts/controllers.js b/app/scripts/controllers.js index ebaaf3c6..f9d534eb 100644 --- a/app/scripts/controllers.js +++ b/app/scripts/controllers.js @@ -7,6 +7,28 @@ const c = (window.c = typeof console !== "undefined" && console !== null ? console : { log: _.noop }) const littb = angular.module("littbApp") +document.addEventListener("keydown", function (event) { + let abort = event.metaKey || event.ctrlKey || $("input:focus").length + + if (abort) { + return + } + + switch (event.key) { + case "F19": + case "®": + if (location.host == "localhost:9000") { + location.host = "litteraturbanken.se:80" + } else { + location.hostname = + location.hostname == "litteraturbanken.se" + ? "red.Litteraturbanken.se" + : "litteraturbanken.se" + } + break + } +}) + function sortObjectKeys(obj) { // Separate keys into two arrays based on their type let simpleKeys = [] diff --git a/app/scripts/library_controller.js b/app/scripts/library_controller.js index 65ab95fc..b9b552b2 100644 --- a/app/scripts/library_controller.js +++ b/app/scripts/library_controller.js @@ -38,6 +38,7 @@ littb.component("keywordSelect", { + diff --git a/app/views/dramaweb.html b/app/views/dramaweb.html index cb53e129..f5fa2bfa 100644 --- a/app/views/dramaweb.html +++ b/app/views/dramaweb.html @@ -28,6 +28,8 @@

Fri svensk dramatik
hos Litteraturbanken

+

I Dramawebben hittar du pjäser som har mer metadata, till exempel information om hur många roller det är. Det finns många fler pjäser i Litteraturbanken som du kan hitta i Biblioteket.

+
diff --git a/app/views/reader.html b/app/views/reader.html index cf3a8575..82e09dd9 100644 --- a/app/views/reader.html +++ b/app/views/reader.html @@ -89,9 +89,9 @@
- Gå bakåt en del + Gå bakåt en del
- Gå till nästa del + Gå till nästa del
@@ -108,12 +108,11 @@ - -