get chapter links to start working

common/static/js/pdfviewer.js

@@ -27,7 +27,20 @@ PDFJS.disableWorker = true;
         var pdfViewer = this;
 
         var pdfDocument = null;
-        var url = options['url'];
+        var url = null;
+        if (options.url) {
+            url = options.url;
+        }
+        var chapter_urls = null;
+        if (options.chapters) {
+            chapter_urls = options.chapters;
+        }
+        var chapterNum = 1;
+        if (options.chapterNum) {
+            chapterNum = options.chapterNum;
+            // TODO: this should only be specified if there are 
+            // chapters, and it should be in-bounds.
+        }
         var pageNum = 1;
         if (options.pageNum) {
             pageNum = options.pageNum;
@@ -268,10 +281,11 @@ PDFJS.disableWorker = true;
         // Asynchronously download PDF as an ArrayBuffer
         //
         loadUrl = function pdfViewLoadUrl(url_to_load) {
-          PDFJS.getDocument(url).then(
+            PDFJS.getDocument(url_to_load).then(
                 function getDocument(_pdfDocument) {
                     pdfDocument = _pdfDocument;
                     // display the current page with a default scale value:
+		    currentScale = UNKNOWN_SCALE;
                     parseScale(DEFAULT_SCALE_VALUE);
                 }, 
                 function getDocumentError(message, exception) {
@@ -282,7 +296,10 @@ PDFJS.disableWorker = true;
                 });
             }; 
 
-        loadUrl(url);
+        loadChapterUrl = function pdfViewLoadChapterUrl(chapter_index) {
+            var chapter_url = chapter_urls[chapter_index];
+            loadUrl(chapter_url);
+        }
 
         $("#previous").click(function(event) {
             prevPage();
@@ -303,12 +320,33 @@ PDFJS.disableWorker = true;
             parseScale(this.value);
         });
 
+
         $('#pageNumber').change(function(event) {
             var newPageVal = parseInt(this.value);
             if (newPageVal) {
                 renderPage(newPageVal);
             }
         });
+
+        // define navigation links for chapters:  
+        if (chapter_urls != null) {
+            var loadChapterUrlHelper = function(i) {
+                return function(event) {
+                    loadChapterUrl(i);
+                };
+            };
+            for (var index = 1; index <= chapter_urls.length; index += 1) {
+                $("#pdfchapter-" + index).click(loadChapterUrlHelper(index));
+            }   
+        }
+
+        // finally, load the appropriate page
+        if (url != null) {
+            loadUrl(url);
+        } else {
+            loadChapterUrl(chapterNum);
+        }       
+            
         return pdfViewer;
     }
 })(jQuery);

lms/djangoapps/staticbook/views.py

@@ -66,5 +66,4 @@ def pdf_index(request, course_id, book_index, chapter=None, page=None):
                                'textbook': textbook,
                                'chapter': chapter,
                                'page': page,
-                               'chapter': chapter,
                                'staff_access': staff_access})

lms/templates/static_pdfbook.html

@@ -17,45 +17,27 @@
 <%block name="js_extra">
   <script type="text/javascript">
 
-%if 'url' in textbook:
-    var url = "${textbook['url']}";
-
-    $(document).ready(function() {
-        $('#outerContainer').PDFViewer( { 
-            % if page is not None:
-            'pageNum' : ${page},
-            % endif
-            'url' : url
-        });
-    });
-%else:
-
-    var my_pdfviewer = null;
-
-    function load_url(url_to_load, page_to_load) {
-//        $('#outerContainer').PDFViewer( { 
-//            'pageNum' : page_to_load,
-//            'url' : url_to_load
-//        });
-       my_pdfviewer.loadUrl(url_to_load, page_to_load);
-    }
-    // since we have no url, we must rely on chapter display, 
-    // so make sure we have a value.
-    var url = "${ textbook['chapters'][chapter-1 if chapter is not None else 0]['url'] }";
-
     $(document).ready(function() {
-        // load_url(url, ${page if page is not None else 1});
-        var my_pdfviewer = $('#outerContainer').PDFViewer( { 
-            'pageNum' : ${page if page is not None else 1},
-            'url' : url
+        var options = {};
+        %if 'url' in textbook:
+            options.url = "${textbook['url']}";
+        %endif
+        %if 'chapters' in textbook:
+            var chptrs = [];
+            %for chap in textbook['chapters']:
+                chptrs.push("${chap['url']}");
+            %endfor
+            options.chapters = chptrs;
+        %endif
+        %if chapter is not None:
+            options.chapterNum : ${chapter};
+        %endif
+        %if page is not None:
+            options.pageNum : ${page};
+        %endif
+    
+        $('#outerContainer').PDFViewer(options);
     });
-        if (my_pdfviewer) {
-           
-        }
- 
-    } );
-%endif
-
   </script>  
 </%block>
 
@@ -121,25 +103,21 @@
 %if 'chapters' in textbook:
     <section aria-label="Textbook Navigation" class="book-sidebar">
 
-      <ul id="pdfbooknav" class="treeview-booknav">
-          <%def name="print_entry(entry)">
-              <li>
-                  <a href="javascript:load_url(${entry.get('url')}, 1)">
+      <div id="pdfbooknav" class="treeview-booknav">
+          <%def name="print_entry(entry, index_value)">
+              <div id="pdfchapter-${index_value}">
                 <span class="chapter">
                   ${entry.get('title')}
                 </span>
-                  </a>
-              </li>
+              </div>
           </%def>
 
+          <% index = 0 %>
           % for entry in textbook['chapters']:
-            ${print_entry(entry)}
+            <% index += 1 %>
+            ${print_entry(entry, index)}
           % endfor
-        
-        ## Don't delete this empty list item. Without it, Jquery.TreeView won't
-        ## render the last list item as expandable.
-        <li></li> 
-      </ul>
+      </div>
     </section>
 %endif