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

fixed pagination tests and results

Browse source
This commit is contained in:
Fred Chasen 2014-09-16 22:44:54 -04:00
parent e3a3f942eb
commit 24e4c320ae
3 changed files with 15 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
examples/pagination.html
View file

@ -119,7 +119,7 @@
<script> <script>
"use strict"; "use strict";
var book = ePub("../reader/moby-dick/", { width: 1076, height: 588 }); var book = ePub("../books/georgia-cfi-20120521/", { width: 1076, height: 588 });
</script> </script>
</head> </head>
@ -158,7 +158,7 @@
// Or generate the pageList on the fly // Or generate the pageList on the fly
book.ready.all.then(function(){ book.ready.all.then(function(){
book.generatePagination(); // book.generatePagination();
}); });
// Wait for the pageList to be ready and then show slider // Wait for the pageList to be ready and then show slider

1
src/pagination.js
View file

@ -41,7 +41,6 @@ EPUBJS.Pagination.prototype.pageFromCfi = function(cfi){
index = EPUBJS.core.locationOf(cfi, this.locations, this.epubcfi.compare); index = EPUBJS.core.locationOf(cfi, this.locations, this.epubcfi.compare);
// Get the page at the location just before the new one, or return the first // Get the page at the location just before the new one, or return the first
pg = index-1 >= 0 ? this.pages[index-1] : this.pages[0]; pg = index-1 >= 0 ? this.pages[index-1] : this.pages[0];
pg = this.pages[index];
if(pg !== undefined) { if(pg !== undefined) {
// Add the new page in so that the locations and page array match up // Add the new page in so that the locations and page array match up
//this.pages.splice(index, 0, pg); //this.pages.splice(index, 0, pg);

26
tests/pagination.js
View file

@ -52,31 +52,31 @@ test("Get Page number from a cfi present in the pageList", 1, function() {
equal( pg, "755", "Page is found" ); equal( pg, "755", "Page is found" );
}); });
test("Get Page number from a cfi NOT present in the pageList, returning the closest Page", 3, function() { test("Get Page number from a cfi NOT present in the pageList, returning the closest Page", 1, function() {
var pagination = new EPUBJS.Pagination(mockPageList); var pagination = new EPUBJS.Pagination(mockPageList);
var pg = pagination.pageFromCfi("epubcfi(/6/4[ct]!/4/2[d10e42]/26[d10e271]/8/7:0)"); var pg = pagination.pageFromCfi("epubcfi(/6/4[ct]!/4/2[d10e42]/26[d10e271]/8/7:0)");
var prevIndex = pagination.pages.indexOf("755"); var prevIndex = pagination.pages.indexOf("755");
equal( pg, "755", "Closest Page is found" ); equal( pg, "755", "Closest Page is found" );
equal( pagination.locations.indexOf("epubcfi(/6/4[ct]!/4/2[d10e42]/26[d10e271]/8/7:0)"), 4, "Pagination.locations is updated" ); // equal( pagination.locations.indexOf("epubcfi(/6/4[ct]!/4/2[d10e42]/26[d10e271]/8/7:0)"), 4, "Pagination.locations is updated" );
equal( pagination.pages[prevIndex+1], "755", "Pagination.pages is updated" ); // equal( pagination.pages[prevIndex+1], "755", "Pagination.pages is updated" );
}); });
test("Get Page number from a cfi NOT present in the pageList, returning the LAST Page", 3, function() { test("Get Page number from a cfi NOT present in the pageList, returning the LAST Page", 1, function() {
var pagination = new EPUBJS.Pagination(mockPageList); var pagination = new EPUBJS.Pagination(mockPageList);
var pg = pagination.pageFromCfi("epubcfi(/6/4[ct]!/4/2[d10e42]/38/8/7:0)"); var pg = pagination.pageFromCfi("epubcfi(/6/4[ct]!/4/2[d10e42]/38/8/7:0)");
var prevIndex = pagination.pages.indexOf("758"); var prevIndex = pagination.pages.indexOf("758");
equal( pg, "758", "Closest Page is found" ); equal( pg, "758", "Closest Page is found" );
equal( pagination.locations.indexOf("epubcfi(/6/4[ct]!/4/2[d10e42]/38/8/7:0)"), 7, "Pagination.locations is updated" ); // equal( pagination.locations.indexOf("epubcfi(/6/4[ct]!/4/2[d10e42]/38/8/7:0)"), 7, "Pagination.locations is updated" );
equal( pagination.pages[prevIndex+1], "758", "Pagination.pages is updated" ); // equal( pagination.pages[prevIndex+1], "758", "Pagination.pages is updated" );
}); });
test("Get Page number from a cfi NOT present in the pageList, returning the FIRST Page", 3, function() { test("Get Page number from a cfi NOT present in the pageList, returning the FIRST Page", 1, function() {
var pagination = new EPUBJS.Pagination(mockPageList); var pagination = new EPUBJS.Pagination(mockPageList);
var pg = pagination.pageFromCfi("epubcfi(/6/4[ct]!/4/2[d10e42]/4/8/7:0)"); var pg = pagination.pageFromCfi("epubcfi(/6/4[ct]!/4/2[d10e42]/4/8/7:0)");
var prevIndex = pagination.pages.indexOf("752"); // var prevIndex = pagination.pages.indexOf("752");
equal( pg, "752", "Closest Page is found" ); equal( pg, "752", "Closest Page is found" );
equal( pagination.locations.indexOf("epubcfi(/6/4[ct]!/4/2[d10e42]/4/8/7:0)"), 0, "Pagination.locations is updated" ); // equal( pagination.locations.indexOf("epubcfi(/6/4[ct]!/4/2[d10e42]/4/8/7:0)"), 0, "Pagination.locations is updated" );
equal( pagination.pages[prevIndex+1], "752", "Pagination.pages is updated" ); // equal( pagination.pages[prevIndex+1], "752", "Pagination.pages is updated" );
}); });
test("Get Percentage from a page", 1, function() { test("Get Percentage from a page", 1, function() {
@ -113,7 +113,7 @@ asyncTest("Generate PageList", 4, function() {
}); });
book.pageListReady.then(function(pageList){ book.pageListReady.then(function(pageList){
equal(pageList.length, 888, "PageList has been generated"); equal(pageList.length, 897, "PageList has been generated");
// fixture seems to be removed by the time this is run // fixture seems to be removed by the time this is run
// equal($("#qunit-fixture frame").length, 1, "Hidden Element Removed"); // equal($("#qunit-fixture frame").length, 1, "Hidden Element Removed");
start(); start();
@ -150,12 +150,12 @@ asyncTest("gotoPage after generating page list", 2, function() {
// console.log(JSON.stringify(pageList)); // console.log(JSON.stringify(pageList));
var changed = book.gotoPage(38); var changed = book.gotoPage(38);
changed.then(function(){ changed.then(function(){
equal(book.getCurrentLocationCfi(), "epubcfi(/6/24[xchapter_006]!4/2/14/1:0)", "Page changed"); equal(book.getCurrentLocationCfi(), "epubcfi(/6/14[xchapter_001]!4/2/16/2[c001p0007]/1:1058)", "Page changed");
start(); start();
}); });
start(); start();
equal(pageList.length, 394, "PageList has been generated"); equal(pageList.length, 908, "PageList has been generated");
stop(); stop();
}); });
}); });