Skip to content

Commit

Permalink
Merge pull request #381 from d-i-t-a/bugfix/optimized-console-logger
Browse files Browse the repository at this point in the history 
optimized console logger
  • Loading branch information
@aferditamuriqi
aferditamuriqi authored Aug 11, 2022
2 parents d34368b + faa4e91 commit ea78fb3
Show file tree
Hide file tree
Showing 25 changed files with 404 additions and 624 deletions.
22 changes: 20 additions & 2 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@d-i-t-a/reader",
"version": "2.1.0-beta.5",
"version": "2.1.0-beta.6",
"description": "A viewer application for EPUB files.",
"repository": "https://github.com/d-i-t-a/R2D2BC",
"license": "Apache-2.0",
Expand Down Expand Up @@ -32,6 +32,7 @@
"eventemitter3": "^4.0.7",
"jscrypto": "^1.0.3",
"lodash.clonedeep": "^4.5.0",
"loglevel": "^1.8.0",
"mark.js": "^8.11.1",
"promise-polyfill": "^8.2.0",
"r2-shared-js": "^1.0.51",
Expand Down
36 changes: 16 additions & 20 deletions src/model/user-settings/UserSettings.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ import {
} from "./UserProperties";
import { ReadiumCSS } from "./ReadiumCSS";
import * as HTMLUtilities from "../../utils/HTMLUtilities";
import { IS_DEV } from "../../utils";
import { addEventListenerOptional } from "../../utils/EventHandler";
import { Injectable, NavigatorAPI } from "../../navigator/IFrameNavigator";
import ReflowableBookView from "../../views/ReflowableBookView";
import FixedBookView from "../../views/FixedBookView";
import BookView from "../../views/BookView";
import log from "loglevel";

export interface UserSettingsConfig {
/** Store to save the user's selections in. */
Expand Down Expand Up @@ -113,7 +113,7 @@ export class UserSettings implements IUserSettings {
ReadiumCSS.SCROLL_KEY
);

return scroll === false;
return !scroll;
}
async isScrollMode() {
return !(await this.isPaginated());
Expand Down Expand Up @@ -185,7 +185,7 @@ export class UserSettings implements IUserSettings {
prop.value = settings.verticalScroll;
await settings.saveProperty(prop);
}
if (IS_DEV) console.log(settings.verticalScroll);
log.log(settings.verticalScroll);
}
if (initialUserSettings.appearance) {
settings.appearance = UserSettings.appearanceValues.findIndex(
Expand All @@ -196,7 +196,7 @@ export class UserSettings implements IUserSettings {
prop.value = settings.appearance;
await settings.saveProperty(prop);
}
if (IS_DEV) console.log(settings.appearance);
log.log(settings.appearance);
}
if (initialUserSettings.fontSize) {
settings.fontSize = initialUserSettings.fontSize;
Expand All @@ -205,7 +205,7 @@ export class UserSettings implements IUserSettings {
prop.value = settings.fontSize;
await settings.saveProperty(prop);
}
if (IS_DEV) console.log(settings.fontSize);
log.log(settings.fontSize);
}
if (initialUserSettings.fontFamily) {
settings.fontFamily = UserSettings.fontFamilyValues.findIndex(
Expand All @@ -216,7 +216,7 @@ export class UserSettings implements IUserSettings {
prop.value = settings.fontFamily;
await settings.saveProperty(prop);
}
if (IS_DEV) console.log(settings.fontFamily);
log.log(settings.fontFamily);
if (settings.fontFamily !== 0) {
settings.fontOverride = true;
}
Expand All @@ -233,7 +233,7 @@ export class UserSettings implements IUserSettings {
await settings.saveProperty(prop);
}
// settings.publisherDefaults = false;
if (IS_DEV) console.log(settings.textAlignment);
log.log(settings.textAlignment);
}
if (initialUserSettings.columnCount) {
settings.columnCount = UserSettings.columnCountValues.findIndex(
Expand All @@ -246,7 +246,7 @@ export class UserSettings implements IUserSettings {
prop.value = settings.columnCount;
await settings.saveProperty(prop);
}
if (IS_DEV) console.log(settings.columnCount);
log.log(settings.columnCount);
}
if (initialUserSettings.wordSpacing) {
settings.wordSpacing = initialUserSettings.wordSpacing;
Expand All @@ -257,7 +257,7 @@ export class UserSettings implements IUserSettings {
prop.value = settings.wordSpacing;
await settings.saveProperty(prop);
}
if (IS_DEV) console.log(settings.wordSpacing);
log.log(settings.wordSpacing);
}
if (initialUserSettings.letterSpacing) {
settings.letterSpacing = initialUserSettings.letterSpacing;
Expand All @@ -268,7 +268,7 @@ export class UserSettings implements IUserSettings {
prop.value = settings.letterSpacing;
await settings.saveProperty(prop);
}
if (IS_DEV) console.log(settings.letterSpacing);
log.log(settings.letterSpacing);
}
if (initialUserSettings.pageMargins) {
settings.pageMargins = initialUserSettings.pageMargins;
Expand All @@ -279,7 +279,7 @@ export class UserSettings implements IUserSettings {
prop.value = settings.pageMargins;
await settings.saveProperty(prop);
}
if (IS_DEV) console.log(settings.pageMargins);
log.log(settings.pageMargins);
}
if (initialUserSettings.lineHeight) {
settings.lineHeight = initialUserSettings.lineHeight;
Expand All @@ -288,7 +288,7 @@ export class UserSettings implements IUserSettings {
prop.value = settings.lineHeight;
await settings.saveProperty(prop);
}
if (IS_DEV) console.log(settings.lineHeight);
log.log(settings.lineHeight);
}
settings.userProperties = settings.getUserSettings();
await settings.initialise();
Expand Down Expand Up @@ -328,9 +328,7 @@ export class UserSettings implements IUserSettings {
}

stop() {
if (IS_DEV) {
console.log("book settings stop");
}
log.log("book settings stop");
}

private async initialise() {
Expand Down Expand Up @@ -717,10 +715,10 @@ export class UserSettings implements IUserSettings {
if (this.view) {
this.view.iframe = iframe;
}
if (this.settingsView) this.renderControls(this.settingsView);
if (this.settingsView) UserSettings.renderControls(this.settingsView);
}

private renderControls(element: HTMLElement): void {
private static renderControls(element: HTMLElement): void {
// Clicking the settings view outside the ul hides it, but clicking inside the ul keeps it up.
addEventListenerOptional(
HTMLUtilities.findElement(element, "ul"),
Expand Down Expand Up @@ -801,9 +799,7 @@ export class UserSettings implements IUserSettings {
};
if (this.api?.updateSettings) {
this.api?.updateSettings(userSettings).then((_) => {
if (IS_DEV) {
console.log("api updated user settings", userSettings);
}
log.log("api updated user settings", JSON.stringify(userSettings));
});
}
}
Expand Down
40 changes: 12 additions & 28 deletions src/modules/AnnotationModule.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ import {
Bookmark,
Locator,
} from "../model/Locator";
import { IS_DEV } from "../utils";
import { icons as IconLib } from "../utils/IconLib";
import { v4 as uuid } from "uuid";
import { Link } from "../model/Link";
Expand All @@ -42,6 +41,7 @@ import {
ISelectionInfo,
} from "./highlight/common/selection";
import * as lodash from "lodash";
import log from "loglevel";

export type Highlight = (highlight: Annotation) => Promise<Annotation>;

Expand Down Expand Up @@ -120,9 +120,7 @@ export class AnnotationModule implements ReaderModule {
}

async stop() {
if (IS_DEV) {
console.log("Annotation module stop");
}
log.log("Annotation module stop");
}

protected async start(): Promise<void> {
Expand Down Expand Up @@ -254,8 +252,8 @@ export class AnnotationModule implements ReaderModule {
return "";
}
} catch (err) {
console.log("uniqueCssSelector:");
console.log(err);
log.log("uniqueCssSelector:");
log.error(err);
return "";
}
}
Expand All @@ -279,9 +277,7 @@ export class AnnotationModule implements ReaderModule {
);
if (book) {
this.saveAnnotation(book[0]).then((anno) => {
if (IS_DEV) {
console.log("saved bookmark " + anno.id);
}
log.log("saved bookmark " + anno.id);
});
}
}
Expand All @@ -292,9 +288,7 @@ export class AnnotationModule implements ReaderModule {
}

async scrollToHighlight(id: any): Promise<any> {
if (IS_DEV) {
console.log("still need to scroll to " + id);
}
log.log("still need to scroll to " + id);
var position = await this.annotator?.getAnnotationPosition(
id,
this.delegate.iframes[0].contentWindow as any
Expand All @@ -307,10 +301,8 @@ export class AnnotationModule implements ReaderModule {
let deleted = await this.annotator.deleteAnnotation(annotation.id);
let added = await this.addAnnotation(annotation);

if (IS_DEV) {
console.log("Highlight deleted " + JSON.stringify(deleted));
console.log("Highlight added " + JSON.stringify(added));
}
log.log("Highlight deleted " + JSON.stringify(deleted));
log.log("Highlight added " + JSON.stringify(added));
await this.showHighlights();
await this.drawHighlights();
return added;
Expand All @@ -323,9 +315,7 @@ export class AnnotationModule implements ReaderModule {
if (this.annotator) {
var deleted = await this.annotator.deleteAnnotation(id);

if (IS_DEV) {
console.log("Highlight deleted " + JSON.stringify(deleted));
}
log.log("Highlight deleted " + JSON.stringify(deleted));
await this.showHighlights();
await this.drawHighlights();
return deleted;
Expand Down Expand Up @@ -877,9 +867,7 @@ export class AnnotationModule implements ReaderModule {
this.delegate.stopReadAloud();
this.delegate.navigate(locator);
} else {
if (IS_DEV) {
console.log("annotation data missing: ", event);
}
log.log("annotation data missing: ", event);
}
}

Expand All @@ -888,17 +876,13 @@ export class AnnotationModule implements ReaderModule {
event: MouseEvent,
locator: any
): void {
if (IS_DEV) {
console.log("annotation data locator: ", locator);
}
log.log("annotation data locator: ", locator);
if (locator) {
if (type === AnnotationType.Annotation) {
this.deleteHighlight(locator);
}
} else {
if (IS_DEV) {
console.log("annotation data missing: ", event);
}
log.log("annotation data missing: ", event);
}
}

Expand Down
Loading

0 comments on commit ea78fb3

Please sign in to comment.