Merge pull request #72 from d-i-t-a/bugfix/usersettings-and-locator

fixes user settings and locator
d-i-t-a · Oct 6, 2020 · 2a3127e · 2a3127e
2 parents 7c25be2 + ec4ca80
commit 2a3127e
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 8 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@d-i-t-a/reader",
-  "version": "1.1.8",
+  "version": "1.1.9",
   "description": "A viewer application for EPUB files.",
   "repository": "https://github.com/d-i-t-a/R2D2BC",
   "license": "Apache-2.0",

diff --git a/src/model/Locator.ts b/src/model/Locator.ts
@@ -31,7 +31,7 @@ export interface Locator {
 export interface LocatorText {
     after?: string;
     before?: string;
-    hightlight?: string;
+    highlight?: string;
 }
 
 export interface Locations {

diff --git a/src/model/user-settings/UserSettings.ts b/src/model/user-settings/UserSettings.ts
@@ -145,12 +145,31 @@ export class UserSettings implements UserSettings {
                     settings.fontOverride = true
                 }
             }
-            if(initialUserSettings.verticalScroll) {
+            if(oc(initialUserSettings.verticalScroll)) {
                 settings.verticalScroll = initialUserSettings.verticalScroll;
                 if (IS_DEV) console.log(settings.verticalScroll)
+                let selectedView = settings.bookViews[0];
+                var selectedViewName = 'scrolling-book-view'
+                if (settings.verticalScroll) {
+                    selectedViewName = 'scrolling-book-view'
+                } else {
+                    selectedViewName = 'columns-paginated-view'
+                }
+
+                if (selectedViewName) {
+                    for (const bookView of settings.bookViews) {
+                        if (bookView.name === selectedViewName) {
+                            selectedView = bookView;
+                            break;
+                        }
+                    }
+                }
+                settings.selectedView = selectedView;
+                settings.store.set(ReadiumCSS.SCROLL_KEY, selectedView.name);
             }
             if(initialUserSettings.textAlignment) {
                 settings.textAlignment = UserSettings.textAlignmentValues.findIndex((el: any) => el === initialUserSettings.textAlignment);
+                settings.publisherDefaults = false
                 if (IS_DEV) console.log(settings.textAlignment)
             }
             if(initialUserSettings.columnCount) {
@@ -159,18 +178,22 @@ export class UserSettings implements UserSettings {
             }
             if(initialUserSettings.wordSpacing) {
                 settings.wordSpacing = initialUserSettings.wordSpacing;
+                settings.publisherDefaults = false
                 if (IS_DEV) console.log(settings.wordSpacing)
             }
             if(initialUserSettings.letterSpacing) {
                 settings.letterSpacing = initialUserSettings.letterSpacing;
+                settings.publisherDefaults = false
                 if (IS_DEV) console.log(settings.letterSpacing)
             }
             if(initialUserSettings.pageMargins) {
                 settings.pageMargins = initialUserSettings.pageMargins;
+                settings.publisherDefaults = false
                 if (IS_DEV) console.log(settings.pageMargins)
             }
             if(initialUserSettings.lineHeight) {
                 settings.lineHeight = initialUserSettings.lineHeight;
+                settings.publisherDefaults = false
                 if (IS_DEV) console.log(settings.lineHeight)
             }
         }

diff --git a/src/modules/AnnotationModule.ts b/src/modules/AnnotationModule.ts
@@ -234,7 +234,7 @@ export default class AnnotationModule implements ReaderModule {
                 color: this.highlighter.getColor(),
                 marker: marker,
                 text: {
-                    hightlight: highlight.selectionInfo.cleanText
+                    highlight: highlight.selectionInfo.cleanText
                 }
             }
             if (this.api && this.api.addAnnotation) {

diff --git a/src/navigator/IFrameNavigator.ts b/src/navigator/IFrameNavigator.ts
@@ -1081,9 +1081,7 @@ export default class IFrameNavigator implements Navigator {
         this.handleNextChapterClick(null)
     }
     goTo(locator: Locator): any {
-        let locations: Locations = {
-            progression: 0
-        }
+        let locations: Locations = locator.locations
         if (locator.href.indexOf("#") !== -1) {
             const elementId = locator.href.slice(locator.href.indexOf("#") + 1);
             if (elementId !== null) {