- {this.props.percentage !== null ? Math.round(percentage * 100) : 0}% + {this.props.percentage ? Math.round(percentage * 100) : 0}%
{
this.props.currentEpub.goto(href);
}
render() {
- const renderContentList = () => {
- return this.state.chapters.map((item: any, index: number) => {
- let isSubContentList = item.subitems && item.subitems.length;
- const renderSubContentList = () => {
- return item.subitems.map((item: any, index: number) => {
- return (
-
-
- {item.label}
-
-
- );
- });
- };
+ const renderContentList = (items: any) => {
+ return items.map((item: any, index: number) => {
return (
-
+
{
>
{item.label}
- {isSubContentList ?
);
});
};
+ // return (
+ //
+ //
+ // {item.label}
+ //
+ // {item.subitems.length > 0 ? (
+ //
+ // );
return (
{
@@ -27,7 +26,6 @@ class ImportLocal extends React.Component {
localforage.setItem("books", bookArr).then(() => {
this.props.handleFetchBooks();
});
- OtherUtil.setReaderConfig("isBookImported", "yes");
this.props.handleMessage("Add Successfully");
this.props.handleMessageBox(true);
};
@@ -70,7 +68,7 @@ class ImportLocal extends React.Component {
};
handleBook = (file: any, md5: string) => {
//md5重复不导入
- if (this.props.books !== null) {
+ if (this.props.books) {
this.props.books.forEach((item) => {
if (item.md5 === md5) {
this.setState({ isRepeat: true });
diff --git a/src/components/popupNote/component.tsx b/src/components/popupNote/component.tsx
index b3d75df2..b21e9430 100644
--- a/src/components/popupNote/component.tsx
+++ b/src/components/popupNote/component.tsx
@@ -33,6 +33,7 @@ class PopupNote extends React.Component {
text = text && text.trim();
let cfiBase = epub.renderer.currentChapter.cfiBase;
let cfi = new window.EPUBJS.EpubCFI().generateCfiFromRange(range, cfiBase);
+ let percentage = this.props.currentEpub.locations.percentageFromCfi(cfi);
let bookKey = book.key;
let charRange = window.rangy
.getSelection(iframe)
@@ -42,11 +43,10 @@ class PopupNote extends React.Component {
let index = this.props.chapters.findIndex((item: any) => {
return item.spinePos > epub.renderer.currentChapter.spinePos;
});
- let chapter =
- this.props.chapters[index] !== undefined
- ? this.props.chapters[index].label.trim(" ")
- : "Unknown";
- let note = new Note(bookKey, chapter, text, cfi, serial, notes);
+ let chapter = this.props.chapters[index]
+ ? this.props.chapters[index].label.trim(" ")
+ : "Unknown";
+ let note = new Note(bookKey, chapter, text, cfi, serial, notes, percentage);
let noteArr = this.props.notes ? this.props.notes : [];
noteArr.push(note);
localforage.setItem("notes", noteArr);
diff --git a/src/components/popupOption/component.tsx b/src/components/popupOption/component.tsx
index 2127d55c..19cfd88b 100644
--- a/src/components/popupOption/component.tsx
+++ b/src/components/popupOption/component.tsx
@@ -51,18 +51,17 @@ class PopupOption extends React.Component {
cfiBase
);
let bookKey = book.key;
-
+ let percentage = this.props.currentEpub.locations.percentageFromCfi(cfi);
//获取章节名
let index = this.props.chapters.findIndex((item: any) => {
return item.spinePos > epub.renderer.currentChapter.spinePos;
});
- let chapter =
- this.props.chapters[index] !== undefined
- ? this.props.chapters[index].label.trim(" ")
- : "Unknown";
+ let chapter = this.props.chapters[index]
+ ? this.props.chapters[index].label.trim(" ")
+ : "Unknown";
// let chapter = epub.renderer.currentChapter.spinePos;
- let digest = new Digest(bookKey, chapter, text, cfi);
+ let digest = new Digest(bookKey, chapter, text, cfi, percentage);
let digestArr = this.props.digests ? this.props.digests : [];
digestArr.push(digest);
localforage.setItem("digests", digestArr);
@@ -122,7 +121,7 @@ class PopupOption extends React.Component {
}}
>
{
arr.forEach((item) => {
itemArr.push(items[item]);
});
- console.log(itemArr, "arr", this.props.isSort, this.props.isSearch);
return itemArr;
};
render() {
OtherUtil.setReaderConfig("totalBooks", this.props.books.length.toString());
const renderBookList = () => {
- console.log(this.props.isSort, "this.props.isSort");
//根据不同的场景获取不同的图书数据
let books =
this.props.shelfIndex !== -1
diff --git a/src/containers/deleteDialog/component.tsx b/src/containers/deleteDialog/component.tsx
index 5e60a0ae..f2270b79 100644
--- a/src/containers/deleteDialog/component.tsx
+++ b/src/containers/deleteDialog/component.tsx
@@ -12,7 +12,7 @@ class DeleteDialog extends React.Component {
this.props.handleDeleteDialog(false);
};
handleDeleteOther = () => {
- if (this.props.bookmarks !== null) {
+ if (this.props.bookmarks) {
let bookmarkArr = DeleteUtil.deleteBookmarks(
this.props.bookmarks,
this.props.currentBook.key
@@ -27,7 +27,7 @@ class DeleteDialog extends React.Component {
});
}
}
- if (this.props.notes !== null) {
+ if (this.props.notes) {
let noteArr = DeleteUtil.deleteNotes(
this.props.notes,
this.props.currentBook.key
@@ -42,7 +42,7 @@ class DeleteDialog extends React.Component {
});
}
}
- if (this.props.digests !== null) {
+ if (this.props.digests) {
let digestArr = DeleteUtil.deleteDigests(
this.props.digests,
this.props.currentBook.key
@@ -57,7 +57,7 @@ class DeleteDialog extends React.Component {
});
}
}
- if (this.props.highlighters !== null) {
+ if (this.props.highlighters) {
let highlighterArr = DeleteUtil.deleteHighlighters(
this.props.highlighters,
this.props.currentBook.key
@@ -79,7 +79,7 @@ class DeleteDialog extends React.Component {
ShelfUtil.clearShelf(this.props.shelfIndex, this.props.currentBook.key);
this.props.handleDeleteDialog(false);
} else {
- this.props.books !== null &&
+ this.props.books &&
localforage
.setItem(
"books",
diff --git a/src/containers/digestList/component.tsx b/src/containers/digestList/component.tsx
index d954fde6..a635cfb2 100644
--- a/src/containers/digestList/component.tsx
+++ b/src/containers/digestList/component.tsx
@@ -5,6 +5,8 @@ import DigestModel from "../../model/Digest";
import { Trans } from "react-i18next";
import { DigestListProps, DigestListStates } from "./interface";
import DeleteIcon from "../../components/deleteIcon";
+import RecentBooks from "../../utils/recordRecent";
+import RecordLocation from "../../utils/recordLocation";
class DigestList extends React.Component {
constructor(props: DigestListProps) {
@@ -26,6 +28,24 @@ class DigestList extends React.Component {
handleShowDelete = (deleteKey: string) => {
this.setState({ deleteKey });
};
+ handleJump = (cfi: string, bookKey: string, percentage: number) => {
+ let { books, epubs } = this.props;
+ let book = null;
+ let epub = null;
+ //根据bookKey获取指定的book和epub
+ for (let i = 0; i < books.length; i++) {
+ if (books[i].key === bookKey) {
+ book = books[i];
+ epub = epubs[i];
+ break;
+ }
+ }
+ this.props.handleReadingBook(book!);
+ this.props.handleReadingEpub(epub);
+ this.props.handleReadingState(true);
+ RecentBooks.setRecent(bookKey);
+ RecordLocation.recordCfi(bookKey, cfi, percentage);
+ };
render() {
let { digests } = this.props;
let digestArr = [];
@@ -95,6 +115,19 @@ class DigestList extends React.Component {
- {renderSubContentList()}
- {renderContentList(item.subitems)}
- {renderSubContentList(item.subitems)}
-
);
}
diff --git a/src/components/contentList/contentList.css b/src/components/contentList/contentList.css
index c6a9cf26..c68c1bb7 100644
--- a/src/components/contentList/contentList.css
+++ b/src/components/contentList/contentList.css
@@ -1,16 +1,14 @@
.book-content-list {
float: left;
-
- width: 220px;
-
+ width: calc(100% - 20px);
margin-left: 18px;
}
.book-content-name {
display: block;
- width: 282px;
+ padding: 10px 0px;
+ width: 100%;
font-size: 14px;
-
- line-height: 48px;
+ line-height: 18px;
color: rgba(75, 75, 75, 1);
opacity: 1;
float: left;
@@ -22,7 +20,7 @@
width: 220px;
float: left;
font-size: 13px;
-
+
line-height: 20px;
color: rgba(75, 75, 75, 1);
opacity: 0.64;
diff --git a/src/components/importLocal/component.tsx b/src/components/importLocal/component.tsx
index 20d19838..4c9b2307 100644
--- a/src/components/importLocal/component.tsx
+++ b/src/components/importLocal/component.tsx
@@ -7,7 +7,6 @@ import SparkMD5 from "spark-md5";
import { Trans } from "react-i18next";
import Dropzone from "react-dropzone";
import { ImportLocalProps, ImportLocalState } from "./interface";
-import OtherUtil from "../../utils/otherUtil";
import RecordRecent from "../../utils/recordRecent";
class ImportLocal extends React.Component- {renderContentList()}
-
+ {renderContentList(this.state.chapters)}
+
-
+
{
};
handleKey = (event: any) => {
let results = OtherUtil.KeySearch(event, this.props.books);
- if (results !== undefined) {
+ if (results) {
this.props.handleSearchBooks(results);
this.props.handleSearch(true);
}
diff --git a/src/containers/addDialog/component.tsx b/src/containers/addDialog/component.tsx
index fa3dc042..16a884f4 100644
--- a/src/containers/addDialog/component.tsx
+++ b/src/containers/addDialog/component.tsx
@@ -19,14 +19,31 @@ class AddDialog extends Component {
".add-dialog-new-shelf-box"
) as HTMLInputElement;
let shelfTitle: string = this.state.shelfTitle;
+ let shelfList = ShelfUtil.getShelf();
+
if (this.state.isNew) {
shelfTitle = inputElement.value;
+ if (shelfList.hasOwnProperty(shelfTitle)) {
+ this.props.handleMessage("Duplicate Shelf");
+ this.props.handleMessageBox(true);
+ return;
+ }
}
if (!shelfTitle) {
this.props.handleMessage("Empty Shelf Title");
this.props.handleMessageBox(true);
return;
}
+ //判断书架中是否已有该图书
+ if (
+ shelfList[`${shelfTitle}`] &&
+ shelfList[`${shelfTitle}`].indexOf(this.props.currentBook.key) > -1
+ ) {
+ this.props.handleMessage("Duplicate Book");
+ this.props.handleMessageBox(true);
+ return;
+ }
+
ShelfUtil.setShelf(shelfTitle, this.props.currentBook.key);
this.props.handleAddDialog(false);
this.props.handleMessage("Add Successfully");
diff --git a/src/containers/backupPage/component.tsx b/src/containers/backupPage/component.tsx
index 91350b88..0fb5f484 100644
--- a/src/containers/backupPage/component.tsx
+++ b/src/containers/backupPage/component.tsx
@@ -230,7 +230,7 @@ class BackupPage extends React.Component {
onClick={() => {
this.setState({ currentStep: 1 });
}}
- style={this.state.isBackup !== null ? {} : { display: "none" }}
+ style={this.state.isBackup ? {} : { display: "none" }}
>
Next Step
diff --git a/src/containers/bookList/component.tsx b/src/containers/bookList/component.tsx
index 3b152772..2908d583 100644
--- a/src/containers/bookList/component.tsx
+++ b/src/containers/bookList/component.tsx
@@ -57,13 +57,11 @@ class BookList extends React.Component
》{item.chapter}
{
+ this.handleJump(item.cfi, item.bookKey, item.percentage);
+ }}
+ >
+
);
diff --git a/src/containers/digestList/digestList.css b/src/containers/digestList/digestList.css
index 5ba070d0..94600d94 100644
--- a/src/containers/digestList/digestList.css
+++ b/src/containers/digestList/digestList.css
@@ -54,7 +54,7 @@
cursor: pointer;
font-size: 16px;
width: calc(50vw - 140px);
- height: 126px;
+ height: 146px;
background: rgba(255, 255, 255, 1);
box-shadow: 0px 0px 6px rgba(0, 0, 0, 0.16);
opacity: 1;
@@ -78,18 +78,15 @@
max-width: 130px;
}
.digest-list-item-citation {
+ font-size: 16px;
position: absolute;
- bottom: 5px;
+ bottom: 30px;
right: 5px;
- /* text-align: right; */
margin: 5px;
white-space: nowrap;
white-space: normal;
word-break: break-all;
color: rgba(155, 155, 155, 1);
-
- /* width: 300px; */
- /* text-align: right; */
}
.digest-list-item-text-parent {
position: absolute;
@@ -131,3 +128,6 @@
.digest-list-container-box {
margin-top: 35px;
}
+.icon-digest-right {
+ margin: 5px;
+}
diff --git a/src/containers/digestList/interface.tsx b/src/containers/digestList/interface.tsx
index 50fd11e6..5e983716 100644
--- a/src/containers/digestList/interface.tsx
+++ b/src/containers/digestList/interface.tsx
@@ -8,7 +8,11 @@ export interface DigestListProps {
bookmarks: BookmarkModel[];
chapters: any;
books: BookModel[];
+ epubs: any;
digests: DigestModel[];
+ handleReadingState: (isReading: boolean) => void;
+ handleReadingBook: (currentBook: BookModel) => void;
+ handleReadingEpub: (currentEpub: any) => void;
}
export interface DigestListStates {
deleteKey: string;
diff --git a/src/containers/header/component.tsx b/src/containers/header/component.tsx
index 5054b5b8..12ade0b6 100644
--- a/src/containers/header/component.tsx
+++ b/src/containers/header/component.tsx
@@ -14,8 +14,8 @@ class Header extends React.Component
+ {"More Digests"}
+
+
+
- {this.state.isChinese ? (
+ {this.state.language === "cn" ? (
this.changeLanguage("tw")}
+ >
+ ) : this.state.language === "en" ? (
+ this.changeLanguage("cn")}
>
) : (
diff --git a/src/containers/header/header.css b/src/containers/header/header.css
index 0193fbaf..55467223 100644
--- a/src/containers/header/header.css
+++ b/src/containers/header/header.css
@@ -108,3 +108,9 @@
color: rgba(75, 75, 75, 1);
cursor: pointer;
}
+.icon-traditional,
+.icon-simplified,
+.icon-english {
+ font-size: 25px;
+ color: rgba(75, 75, 75, 1);
+}
diff --git a/src/containers/header/interface.tsx b/src/containers/header/interface.tsx
index a06c7a15..1f1a38d1 100644
--- a/src/containers/header/interface.tsx
+++ b/src/containers/header/interface.tsx
@@ -13,6 +13,6 @@ export interface HeaderProps {
export interface HeaderState {
isOnlyLocal: boolean;
isBookImported: boolean;
- isChinese: boolean;
+ language:string;
isNewVersion: boolean;
}
diff --git a/src/containers/navigationPanel/component.tsx b/src/containers/navigationPanel/component.tsx
index dc23dacf..22527de1 100644
--- a/src/containers/navigationPanel/component.tsx
+++ b/src/containers/navigationPanel/component.tsx
@@ -103,7 +103,7 @@ class NavigationPanel extends React.Component<
{this.state.isContentShow ? (
{
this.highlighter && this.highlighter.removeAllHighlights(); // 为了避免下次反序列化失败，必须先清除已有的高亮
let classes = ["color-0", "color-1", "color-2", "color-3"];
- highlightersByChapter !== null &&
+ highlightersByChapter &&
highlightersByChapter.forEach((item) => {
this.key = item.key;
//控制渲染指定图书的指定高亮
diff --git a/src/containers/progressPanel/component.tsx b/src/containers/progressPanel/component.tsx
index cf012bf1..33c863ab 100644
--- a/src/containers/progressPanel/component.tsx
+++ b/src/containers/progressPanel/component.tsx
@@ -11,8 +11,7 @@ class ProgressPanel extends React.Component<
constructor(props: ProgressPanelProps) {
super(props);
this.state = {
- displayPercentage:
- this.props.percentage !== undefined ? this.props.percentage : 0,
+ displayPercentage: this.props.percentage ? this.props.percentage : 0,
};
}
//WARNING! To be deprecated in React v17. Use componentDidMount instead.
diff --git a/src/containers/sidebar/sidebar.css b/src/containers/sidebar/sidebar.css
index 56829569..e564f99b 100644
--- a/src/containers/sidebar/sidebar.css
+++ b/src/containers/sidebar/sidebar.css
@@ -63,16 +63,13 @@
}
.shelf-list-container-parent {
margin-top: 20px;
- height: 120px;
- width: 100%;
- overflow: hidden;
+ height: 140px;
+ width: 80%;
}
.shelf-list-container {
width: 100%;
height: 100%;
overflow-y: scroll;
- padding-right: 17px; /* Increase/decrease this value for cross-browser compatibility */
- box-sizing: content-box;
list-style-type: none;
cursor: pointer;
text-overflow: ellipsis;
diff --git a/src/i18n.tsx b/src/i18n.tsx
index 718f0a58..f5833a4f 100644
--- a/src/i18n.tsx
+++ b/src/i18n.tsx
@@ -3,6 +3,7 @@ import { reactI18nextModule } from "react-i18next";
import detector from "i18next-browser-languagedetector";
import translationEN from "./assets/locales/en/translation.json";
import translationCN from "./assets/locales/cn/translation.json";
+import translationTW from "./assets/locales/tw/translation.json";
// the translations
const resources = {
@@ -12,6 +13,9 @@ const resources = {
cn: {
translation: translationCN,
},
+ tw: {
+ translation: translationTW,
+ },
};
i18n
@@ -22,7 +26,6 @@ i18n
lng: "cn",
fallbackLng: "en",
keySeparator: false, // we do not use keys in form messages.welcome
-
interpolation: {
escapeValue: false, // react already safes from xss
},
diff --git a/src/model/Digest.ts b/src/model/Digest.ts
index 76e71334..69303788 100644
--- a/src/model/Digest.ts
+++ b/src/model/Digest.ts
@@ -5,7 +5,14 @@ class Digest {
chapter: string;
text: string;
cfi: string;
- constructor(bookKey: string, chapter: string, text: string, cfi: string) {
+ percentage: number;
+ constructor(
+ bookKey: string,
+ chapter: string,
+ text: string,
+ cfi: string,
+ percentage: number
+ ) {
this.key = new Date().getTime() + ""; //书摘的键值
this.date = {
year: new Date().getFullYear(),
@@ -16,6 +23,7 @@ class Digest {
this.chapter = chapter; //书摘的所在章节
this.text = text; //书摘的内容
this.cfi = cfi; //书摘的所在位置
+ this.percentage = percentage; //书摘的所在位置
}
}
diff --git a/src/model/Note.ts b/src/model/Note.ts
index 2fc4b7e5..a965ef0f 100644
--- a/src/model/Note.ts
+++ b/src/model/Note.ts
@@ -7,13 +7,15 @@ class Note {
cfi: string;
range: string;
notes: string;
+ percentage: number;
constructor(
bookKey: string,
chapter: string,
text: string,
cfi: string,
range: string,
- notes: string
+ notes: string,
+ percentage: number
) {
this.key = new Date().getTime() + ""; //笔记的键值
this.bookKey = bookKey; //笔记的所在书的键值
@@ -27,6 +29,7 @@ class Note {
this.cfi = cfi; //添加笔记的位置
this.range = range; // Rangy.js产生的将Range对象序列化后的字符串
this.notes = notes || ""; //笔记的内容
+ this.percentage = percentage; //笔记的内容
}
}
diff --git a/src/pages/manager/component.tsx b/src/pages/manager/component.tsx
index 6b038ae8..0b8c4868 100644
--- a/src/pages/manager/component.tsx
+++ b/src/pages/manager/component.tsx
@@ -147,11 +147,11 @@ class Manager extends React.Component {
(mode === "recent" && recentBooks !== 0) ||
mode === "shelf") ? (
diff --git a/src/containers/noteList/component.tsx b/src/containers/noteList/component.tsx
index 94a9d6fc..40ced5cc 100644
--- a/src/containers/noteList/component.tsx
+++ b/src/containers/noteList/component.tsx
@@ -52,7 +52,7 @@ class NoteList extends React.Component {
//获取笔记日期列表
for (let i = 1; i < noteArr.length; i++) {
if (
- noteArr[i].date !== undefined &&
+ noteArr[i].date &&
(noteArr[i].date.year !== temp.year ||
noteArr[i].date.month !== temp.month ||
noteArr[i].date.day !== temp.day)
@@ -89,7 +89,7 @@ class NoteList extends React.Component {
{
this.handleShowDelete(item.key);
}}
@@ -117,7 +117,7 @@ class NoteList extends React.Component {
: {}
}
>
- {isCurrent ? "Less" : "More"}
+ {isCurrent ? "Less" : "More Notes"}
{isCurrent ? null : (
diff --git a/src/containers/noteList/noteList.css b/src/containers/noteList/noteList.css
index a01e7c4e..8ba1852a 100644
--- a/src/containers/noteList/noteList.css
+++ b/src/containers/noteList/noteList.css
@@ -132,12 +132,11 @@
white-space: nowrap;
white-space: normal;
word-break: break-all;
- color: rgba(191, 191, 191, 1);
+ color: rgba(75, 75, 75, 1);
margin-right: 20px !important;
margin-top: 5px;
float: right;
font-size: 15px;
- color: rgba(155, 155, 155, 1);
}
.note-list-item-text {
/* text-align: right; */
diff --git a/src/containers/operationPanel/component.tsx b/src/containers/operationPanel/component.tsx
index fe669bf9..803e14df 100644
--- a/src/containers/operationPanel/component.tsx
+++ b/src/containers/operationPanel/component.tsx
@@ -86,7 +86,7 @@ class OperationPanel extends React.Component<
return item.spinePos > this.props.currentEpub.spinePos;
});
let chapter = "未知章节";
- if (this.props.chapters[index] !== undefined) {
+ if (this.props.chapters[index]) {
chapter = this.props.chapters[index].label.trim(" ");
}
let bookmark = new Bookmark(bookKey, cfi, label, percentage, chapter);
diff --git a/src/containers/popupMenu/component.tsx b/src/containers/popupMenu/component.tsx
index 70a21378..b86ebc11 100644
--- a/src/containers/popupMenu/component.tsx
+++ b/src/containers/popupMenu/component.tsx
@@ -110,7 +110,7 @@ class PopupMenu extends React.Component