fragmentFromParams doesn't try to specify page/index if none is given. Updated share UI.

diff --git a/BookReader/BookReader.js b/BookReader/BookReader.js
index 60ceea9..02b759f 100644 (file)
--- a/BookReader/BookReader.js
+++ b/BookReader/BookReader.js
@@ -4317,8 +4317,10 @@ BookReader.prototype.fragmentFromParams = function(params) {
     if ('undefined' != typeof(params.page)) {
         fragments.push('page', params.page);
     } else {
-        // Don't have page numbering -- use index instead
-        fragments.push('page', 'n' + params.index);
+        if ('undefined' != typeof(params.index)) {
+            // Don't have page numbering but we do have the index
+            fragments.push('page', 'n' + params.index);
+        }
     }
     
     // $$$ highlight
@@ -5092,6 +5094,10 @@ BookReader.prototype.ttsStartPolling = function () {
 
 BookReader.prototype.makeShareDiv = function()
 {
+    var pageView = document.location + '';
+    var bookView = (pageView + '').replace(/#.*/,'');
+    var embedLink = this.getEmbedURL({ 'mode': this.constMode1up } );
+    
     var html = [
         '<div class="BRfloat" id="shareThis">',
             '<div class="BRfloatHead">',
@@ -5102,11 +5108,11 @@ BookReader.prototype.makeShareDiv = function()
             '<form method="post" action="">',
                 '<fieldset>',
                     '<label for="pageview">Link to this page view:</label>',
-                    '<input type="text" name="pageview" id="pageview" value="http://thisisthelinktothispageview"/>',
+                    '<input type="text" name="pageview" id="pageview" value="' + pageView + '"/>',
                 '</fieldset>',
                 '<fieldset>',
                     '<label for="booklink">Link to the book:</label>',
-                    '<input type="text" name="booklink" id="booklink" value="http://thisisthelinktothisbook"/>',
+                    '<input type="text" name="booklink" id="booklink" value="' + bookView + '"/>',
                 '</fieldset>',
                 '<fieldset>',
                     '<label for="iframe">Embed a mini Book Reader:</label>',
@@ -5124,7 +5130,7 @@ BookReader.prototype.makeShareDiv = function()
                             'Open to this page?',
                         '</label>',
                     '</fieldset>',
-                    '<textarea cols="30" rows="4" name="iframe" id="iframe"><iframe src="http://thisisthestreamlink" width="480" height="480"></iframe></textarea>',
+                    '<textarea cols="30" rows="4" name="iframe" id="iframe"><iframe src="' + embedLink + '" width="480" height="480"></iframe></textarea>',
                     '<p class="meta"><strong>NOTE:</strong> We\'ve tested EMBED on blogspot.com blogs as well as self-hosted Wordpress blogs. This feature will NOT work on wordpress.com blogs.</p>',
                 '</fieldset>',
                 '<fieldset class="center">',

diff --git a/BookReaderIA/datanode/BookReaderJSIA.php b/BookReaderIA/datanode/BookReaderJSIA.php
index 016e988..571ec68 100644 (file)
--- a/BookReaderIA/datanode/BookReaderJSIA.php
+++ b/BookReaderIA/datanode/BookReaderJSIA.php
@@ -313,13 +313,16 @@ br.cleanupMetadata = function() {
 // getEmbedURL
 //________
 // Returns a URL for an embedded version of the current book
-br.getEmbedURL = function() {
+br.getEmbedURL = function(viewParams) {
     // We could generate a URL hash fragment here but for now we just leave at defaults
     var url = 'http://' + window.location.host + '/stream/'+this.bookId;
     if (this.subPrefix != this.bookId) { // Only include if needed
         url += '/' + this.subPrefix;
     }
     url += '?ui=embed';
+    if (viewParams) {
+        url += '#' + this.fragmentFromParams(viewParams);
+    }
     return url;
 }