Return page numbers as "n{index}" if no page number is defined for that index. Show...

diff --git a/GnuBook/GnuBook.js b/GnuBook/GnuBook.js
index 2e60e9e..2da738c 100644 (file)
--- a/GnuBook/GnuBook.js
+++ b/GnuBook/GnuBook.js
@@ -818,7 +818,7 @@ GnuBook.prototype.prepareTwoPageView = function() {
 
 // prepareTwoPagePopUp()
 //
-// This function prepares the "View leaf n" popup that shows while the mouse is
+// This function prepares the "View Page n" popup that shows while the mouse is
 // over the left/right "stack of sheets" edges.  It also binds the mouse
 // events for these divs.
 //______________________________________________________________________________
@@ -859,7 +859,7 @@ GnuBook.prototype.prepareTwoPagePopUp = function() {
     $(this.leafEdgeR).bind('mousemove', this, function(e) {
 
         var jumpIndex = e.data.jumpIndexForRightEdgePageX(e.pageX);
-        $(e.data.twoPagePopUp).text('View Leaf '+jumpIndex);
+        $(e.data.twoPagePopUp).text('View Page '+ e.data.getPageNum(jumpIndex));
         
         $(e.data.twoPagePopUp).css({
             left: e.pageX +5+ 'px',
@@ -870,7 +870,7 @@ GnuBook.prototype.prepareTwoPagePopUp = function() {
     $(this.leafEdgeL).bind('mousemove', this, function(e) {
     
         var jumpIndex = e.data.jumpIndexForLeftEdgePageX(e.pageX);
-        $(e.data.twoPagePopUp).text('View Leaf '+jumpIndex);
+        $(e.data.twoPagePopUp).text('View Page '+ e.data.getPageNum(jumpIndex));
         
         $(e.data.twoPagePopUp).css({
             left: e.pageX - $(e.data.twoPagePopUp).width() - 30 + 'px',
@@ -2108,6 +2108,7 @@ GnuBook.prototype.updateFromParams = function(params) {
             this.jumpToIndex(params.index);
         }
     } else if ('undefined' != typeof(params.page)) {
+        // $$$ this assumes page numbers are unique
         if (params.page != this.getPageNum(this.currentIndex())) {
             this.jumpToPage(params.page);
         }

diff --git a/GnuBookIA/datanode/GnuBookJSIA.php b/GnuBookIA/datanode/GnuBookJSIA.php
index aa6182c..ec659d4 100755 (executable)
--- a/GnuBookIA/datanode/GnuBookJSIA.php
+++ b/GnuBookIA/datanode/GnuBookJSIA.php
@@ -180,7 +180,12 @@ gb.getPageSide = function(index) {
 }
 
 gb.getPageNum = function(index) {
-    return this.pageNums[index];
+    var pageNum = this.pageNums[index];
+    if (pageNum) {
+        return pageNum;
+    } else {
+        return 'n' + index;
+    }
 }
 
 gb.leafNumToIndex = function(leafNum) {