Xpath not used if unavailable, location percent returned from 0-1 (no…

… rounding)
futurepress · Aug 7, 2015 · 2b88e70 · 2b88e70
1 parent 63aca34
commit 2b88e70
Show file tree

Hide file tree

Showing 15 changed files with 1,884 additions and 1,818 deletions.
diff --git a/build/epub.js b/build/epub.js
diff --git a/build/epub.js.map b/build/epub.js.map
diff --git a/build/epub.min.js b/build/epub.min.js
diff --git a/build/epub.min.map b/build/epub.min.map
diff --git a/build/epub_no_underscore.js b/build/epub_no_underscore.js
diff --git a/build/epub_no_underscore.js.map b/build/epub_no_underscore.js.map
diff --git a/examples/basic.html b/examples/basic.html
@@ -69,7 +69,7 @@
          <script>
             "use strict";
 
-            var Book = ePub("../reader/moby-dick/");
+            var Book = ePub("../books/moby-dick/");
 
         </script>
     </head>

diff --git a/examples/locations.html b/examples/locations.html
@@ -125,7 +125,7 @@
             book.ready.all.then(function(){
               // Load in stored locations from json or local storage
               var key = book.generateBookKey()+'-locations';
-              var stored = false;//localStorage.getItem(key);
+              var stored = localStorage.getItem(key);
               if (stored) {
                  return book.locations.load(stored);
               } else {
@@ -166,17 +166,18 @@
                 controls.appendChild(slider);
 
                 currentPage.addEventListener("change", function(){
-                  var cfi = book.locations.cfiFromPercentage(currentPage.value);
+                  var cfi = book.locations.cfiFromPercentage(currentPage.value/100);
                   book.gotoCfi(cfi);
                 }, false);
 
                 // Listen for location changed event, get percentage from CFI
                 book.on('renderer:locationChanged', function(location){
                     var percent = book.locations.percentageFromCfi(location);
+                    var percentage = Math.floor(percent * 100);
                     if(!mouseDown) {
-                        slider.value = percent;
+                        slider.value = percentage;
                     }
-                    currentPage.value = percent;
+                    currentPage.value = percentage;
                 });
 
                 // Save out the generated locations to JSON

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "EpubJS",
-  "version": "0.2.6",
+  "version": "0.2.7",
   "repository": "https://github.com/futurepress/epub.js",
   "devDependencies": {
     "colors": "~0.6.2",

diff --git a/reader/js/epub.js.map b/reader/js/epub.js.map