yetangitu/epub.js
1
0
Fork 0
mirror of https://github.com/futurepress/epub.js.git synced 2025-10-04 15:09:16 +02:00
Code Issues Releases Wiki Activity

next and prev chapter respect linear=no per #110

Browse source
This commit is contained in:
Fred Chasen 2014-04-01 16:18:06 -07:00
parent 4ed8272d41
commit ae7c84aa8a
9 changed files with 102 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

31
build/epub.js
View file

@ -2561,19 +2561,36 @@ EPUBJS.Book.prototype.prevPage = function() {
};
EPUBJS.Book.prototype.nextChapter = function() {
if(this.spinePos < this.spine.length - 1){
this.spinePos += 1;
return this.displayChapter(this.spinePos);
if (this.spinePos < this.spine.length - 1) {
var next = this.spinePos + 1;
while (this.spine[next] && this.spine[next].linear && this.spine[next].linear == 'no') {
next++;
}
if (next < this.spine.length - 1) {
this.spinePos = next;
return this.displayChapter(this.spinePos);
} else {
this.trigger("book:atEnd");
}
} else {
this.trigger("book:atEnd");
}
};
EPUBJS.Book.prototype.prevChapter = function() {
if(this.spinePos > 0){
this.spinePos -= 1;
return this.displayChapter(this.spinePos, true);
if (this.spinePos > 0) {
var prev = this.spinePos - 1;
while (this.spine[prev] && this.spine[prev].linear && this.spine[prev].linear == 'no') {
prev--;
}
if (prev >= 0) {
this.spinePos = prev;
return this.displayChapter(this.spinePos, true);
} else {
this.trigger("book:atStart");
}
} else {
this.trigger("book:atStart");
}

2
build/epub.js.map
View file

File diff suppressed because one or more lines are too long

4
build/epub.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
build/epub.min.map
View file

File diff suppressed because one or more lines are too long

31
build/epub_no_underscore.js
View file

@ -2560,19 +2560,36 @@ EPUBJS.Book.prototype.prevPage = function() {
};
EPUBJS.Book.prototype.nextChapter = function() {
if(this.spinePos < this.spine.length - 1){
this.spinePos += 1;
return this.displayChapter(this.spinePos);
if (this.spinePos < this.spine.length - 1) {
var next = this.spinePos + 1;
while (this.spine[next] && this.spine[next].linear && this.spine[next].linear == 'no') {
next++;
}
if (next < this.spine.length - 1) {
this.spinePos = next;
return this.displayChapter(this.spinePos);
} else {
this.trigger("book:atEnd");
}
} else {
this.trigger("book:atEnd");
}
};
EPUBJS.Book.prototype.prevChapter = function() {
if(this.spinePos > 0){
this.spinePos -= 1;
return this.displayChapter(this.spinePos, true);
if (this.spinePos > 0) {
var prev = this.spinePos - 1;
while (this.spine[prev] && this.spine[prev].linear && this.spine[prev].linear == 'no') {
prev--;
}
if (prev >= 0) {
this.spinePos = prev;
return this.displayChapter(this.spinePos, true);
} else {
this.trigger("book:atStart");
}
} else {
this.trigger("book:atStart");
}

2
build/epub_no_underscore.js.map
View file

File diff suppressed because one or more lines are too long

2
reader/js/epub.js.map
View file

File diff suppressed because one or more lines are too long

31
reader/js/epub.min.js vendored
View file

@ -2561,19 +2561,36 @@ EPUBJS.Book.prototype.prevPage = function() {
};
EPUBJS.Book.prototype.nextChapter = function() {
if(this.spinePos < this.spine.length - 1){
this.spinePos += 1;
return this.displayChapter(this.spinePos);
if (this.spinePos < this.spine.length - 1) {
var next = this.spinePos + 1;
while (this.spine[next] && this.spine[next].linear && this.spine[next].linear == 'no') {
next++;
}
if (next < this.spine.length - 1) {
this.spinePos = next;
return this.displayChapter(this.spinePos);
} else {
this.trigger("book:atEnd");
}
} else {
this.trigger("book:atEnd");
}
};
EPUBJS.Book.prototype.prevChapter = function() {
if(this.spinePos > 0){
this.spinePos -= 1;
return this.displayChapter(this.spinePos, true);
if (this.spinePos > 0) {
var prev = this.spinePos - 1;
while (this.spine[prev] && this.spine[prev].linear && this.spine[prev].linear == 'no') {
prev--;
}
if (prev >= 0) {
this.spinePos = prev;
return this.displayChapter(this.spinePos, true);
} else {
this.trigger("book:atStart");
}
} else {
this.trigger("book:atStart");
}

31
src/book.js
View file

@ -785,19 +785,36 @@ EPUBJS.Book.prototype.prevPage = function() {
};
EPUBJS.Book.prototype.nextChapter = function() {
if(this.spinePos < this.spine.length - 1){
this.spinePos += 1;
return this.displayChapter(this.spinePos);
if (this.spinePos < this.spine.length - 1) {
var next = this.spinePos + 1;
while (this.spine[next] && this.spine[next].linear && this.spine[next].linear == 'no') {
next++;
}
if (next < this.spine.length - 1) {
this.spinePos = next;
return this.displayChapter(this.spinePos);
} else {
this.trigger("book:atEnd");
}
} else {
this.trigger("book:atEnd");
}
};
EPUBJS.Book.prototype.prevChapter = function() {
if(this.spinePos > 0){
this.spinePos -= 1;
return this.displayChapter(this.spinePos, true);
if (this.spinePos > 0) {
var prev = this.spinePos - 1;
while (this.spine[prev] && this.spine[prev].linear && this.spine[prev].linear == 'no') {
prev--;
}
if (prev >= 0) {
this.spinePos = prev;
return this.displayChapter(this.spinePos, true);
} else {
this.trigger("book:atStart");
}
} else {
this.trigger("book:atStart");
}