Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
douban-api-proxy
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
captainwong
douban-api-proxy
Commits
378a0ca6
Commit
378a0ca6
authored
Sep 17, 2017
by
OzzieIsaacs
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'adv/bookmarks'
parents
2a78a02e
a4f81dd8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
epub.js
cps/static/js/reading/epub.js
+2
-2
read.html
cps/templates/read.html
+5
-5
No files found.
cps/static/js/reading/epub.js
View file @
378a0ca6
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
var
reader
=
ePubReader
(
calibre
.
bookUrl
,
{
var
reader
=
ePubReader
(
calibre
.
bookUrl
,
{
restore
:
true
,
restore
:
true
,
bookmarks
:
[
calibre
.
bookmark
]
bookmarks
:
calibre
.
bookmark
?
[
calibre
.
bookmark
]
:
[
]
});
});
reader
.
on
(
"reader:bookmarked"
,
updateBookmark
.
bind
(
reader
,
"add"
));
reader
.
on
(
"reader:bookmarked"
,
updateBookmark
.
bind
(
reader
,
"add"
));
reader
.
on
(
"reader:unbookmarked"
,
updateBookmark
.
bind
(
reader
,
"remove"
));
reader
.
on
(
"reader:unbookmarked"
,
updateBookmark
.
bind
(
reader
,
"remove"
));
...
@@ -21,7 +21,7 @@
...
@@ -21,7 +21,7 @@
// Remove other bookmarks (there can only be one)
// Remove other bookmarks (there can only be one)
if
(
action
===
"add"
)
{
if
(
action
===
"add"
)
{
this
.
settings
.
bookmarks
.
filter
(
function
(
bookmark
)
{
this
.
settings
.
bookmarks
.
filter
(
function
(
bookmark
)
{
return
bookmark
!==
location
;
return
bookmark
&&
bookmark
!==
location
;
}).
map
(
function
(
bookmark
)
{
}).
map
(
function
(
bookmark
)
{
this
.
removeBookmark
(
bookmark
);
this
.
removeBookmark
(
bookmark
);
}.
bind
(
this
));
}.
bind
(
this
));
...
...
cps/templates/read.html
View file @
378a0ca6
...
@@ -20,24 +20,24 @@
...
@@ -20,24 +20,24 @@
<!--a id="show-Search" class="show_view icon-search" data-view="Search">Search</a-->
<!--a id="show-Search" class="show_view icon-search" data-view="Search">Search</a-->
<a
id=
"show-Toc"
class=
"show_view icon-list-1 active"
data-view=
"Toc"
>
TOC
</a>
<a
id=
"show-Toc"
class=
"show_view icon-list-1 active"
data-view=
"Toc"
>
TOC
</a>
<a
id=
"show-Bookmarks"
class=
"show_view icon-bookmark"
data-view=
"Bookmarks"
>
Bookmarks
</a>
<a
id=
"show-Bookmarks"
class=
"show_view icon-bookmark"
data-view=
"Bookmarks"
>
Bookmarks
</a>
<
a
id=
"show-Notes"
class=
"show_view icon-edit"
data-view=
"Notes"
>
Notes
</a
>
<
!--a id="show-Notes" class="show_view icon-edit" data-view="Notes">Notes</a--
>
</div>
</div>
<div
id=
"tocView"
class=
"view"
>
<div
id=
"tocView"
class=
"view"
>
</div>
</div>
<div
id=
"searchView"
class=
"view"
>
<
!--
div id="searchView" class="view">
<ul id="searchResults"></ul>
<ul id="searchResults"></ul>
</div>
</div
--
>
<div
id=
"bookmarksView"
class=
"view"
>
<div
id=
"bookmarksView"
class=
"view"
>
<ul
id=
"bookmarks"
></ul>
<ul
id=
"bookmarks"
></ul>
</div>
</div>
<div
id=
"notesView"
class=
"view"
>
<
!--
div id="notesView" class="view">
<div id="new-note">
<div id="new-note">
<textarea id="note-text"></textarea>
<textarea id="note-text"></textarea>
<button id="note-anchor">Anchor</button>
<button id="note-anchor">Anchor</button>
</div>
</div>
<ol id="notes"></ol>
<ol id="notes"></ol>
</div>
</div
--
>
</div>
</div>
<div
id=
"main"
>
<div
id=
"main"
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment