diff --git a/web/document_outline_view.js b/web/document_outline_view.js
deleted file mode 100644
index 5a3ccd315..000000000
--- a/web/document_outline_view.js
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
-/* Copyright 2012 Mozilla Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-'use strict';
-
-var DocumentOutlineView = function documentOutlineView(options) {
- var outline = options.outline;
- var outlineView = options.outlineView;
- while (outlineView.firstChild) {
- outlineView.removeChild(outlineView.firstChild);
- }
-
- if (!outline) {
- return;
- }
-
- var linkService = options.linkService;
-
- function bindItemLink(domObj, item) {
- domObj.href = linkService.getDestinationHash(item.dest);
- domObj.onclick = function documentOutlineViewOnclick(e) {
- linkService.navigateTo(item.dest);
- return false;
- };
- }
-
- var queue = [{parent: outlineView, items: outline}];
- while (queue.length > 0) {
- var levelData = queue.shift();
- var i, n = levelData.items.length;
- for (i = 0; i < n; i++) {
- var item = levelData.items[i];
- var div = document.createElement('div');
- div.className = 'outlineItem';
- var a = document.createElement('a');
- bindItemLink(a, item);
- a.textContent = item.title;
- div.appendChild(a);
-
- if (item.items.length > 0) {
- var itemsDiv = document.createElement('div');
- itemsDiv.className = 'outlineItems';
- div.appendChild(itemsDiv);
- queue.push({parent: itemsDiv, items: item.items});
- }
-
- levelData.parent.appendChild(div);
- }
- }
-};
diff --git a/web/pdf_outline_view.js b/web/pdf_outline_view.js
new file mode 100644
index 000000000..41995a885
--- /dev/null
+++ b/web/pdf_outline_view.js
@@ -0,0 +1,96 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
+/* Copyright 2012 Mozilla Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+'use strict';
+
+/**
+ * @typedef {Object} PDFOutlineViewOptions
+ * @property {HTMLDivElement} container - The viewer element.
+ * @property {Array} outline - An array of outline objects.
+ * @property {IPDFLinkService} linkService - The navigation/linking service.
+ */
+
+/**
+ * @class
+ */
+var PDFOutlineView = (function PDFOutlineViewClosure() {
+ /**
+ * @constructs PDFOutlineView
+ * @param {PDFOutlineViewOptions} options
+ */
+ function PDFOutlineView(options) {
+ this.container = options.container;
+ this.outline = options.outline;
+ this.linkService = options.linkService;
+ }
+
+ PDFOutlineView.prototype = {
+ reset: function PDFOutlineView_reset() {
+ var container = this.container;
+ while (container.firstChild) {
+ container.removeChild(container.firstChild);
+ }
+ },
+
+ /**
+ * @private
+ */
+ _bindLink: function PDFOutlineView_bindLink(element, item) {
+ var linkService = this.linkService;
+ element.href = linkService.getDestinationHash(item.dest);
+ element.onclick = function goToDestination(e) {
+ linkService.navigateTo(item.dest);
+ return false;
+ };
+ },
+
+ render: function PDFOutlineView_render() {
+ var outline = this.outline;
+
+ this.reset();
+
+ if (!outline) {
+ return;
+ }
+
+ var queue = [{ parent: this.container, items: this.outline }];
+ while (queue.length > 0) {
+ var levelData = queue.shift();
+ for (var i = 0, len = levelData.items.length; i < len; i++) {
+ var item = levelData.items[i];
+ var div = document.createElement('div');
+ div.className = 'outlineItem';
+ var element = document.createElement('a');
+ this._bindLink(element, item);
+ element.textContent = item.title;
+ div.appendChild(element);
+
+ if (item.items.length > 0) {
+ var itemsDiv = document.createElement('div');
+ itemsDiv.className = 'outlineItems';
+ div.appendChild(itemsDiv);
+ queue.push({ parent: itemsDiv, items: item.items });
+ }
+
+ levelData.parent.appendChild(div);
+ }
+ }
+ }
+ };
+
+ return PDFOutlineView;
+})();
diff --git a/web/viewer.html b/web/viewer.html
index 1aa78dda1..1a6a406cb 100644
--- a/web/viewer.html
+++ b/web/viewer.html
@@ -75,7 +75,7 @@ http://sourceforge.net/adobe/cmap/wiki/License/
-
+
diff --git a/web/viewer.js b/web/viewer.js
index d47962d01..ac3a49079 100644
--- a/web/viewer.js
+++ b/web/viewer.js
@@ -19,7 +19,7 @@
PDFHistory, Preferences, SidebarView, ViewHistory, Stats,
PDFThumbnailViewer, URL, noContextMenuHandler, SecondaryToolbar,
PasswordPrompt, PresentationMode, HandTool, Promise,
- DocumentProperties, DocumentOutlineView, DocumentAttachmentsView,
+ DocumentProperties, PDFOutlineView, DocumentAttachmentsView,
OverlayManager, PDFFindController, PDFFindBar, getVisibleElements,
watchScroll, PDFViewer, PDFRenderingQueue, PresentationModeState,
RenderingStates, DEFAULT_SCALE, UNKNOWN_SCALE,
@@ -86,6 +86,7 @@ var mozL10n = document.mozL10n || document.webL10n;
//#include document_properties.js
//#include pdf_viewer.js
//#include pdf_thumbnail_viewer.js
+//#include pdf_outline_view.js
var PDFViewerApplication = {
initialBookmark: document.location.hash.substring(1),
@@ -965,15 +966,16 @@ var PDFViewerApplication = {
var promises = [pagesPromise, this.animationStartedPromise];
Promise.all(promises).then(function() {
pdfDocument.getOutline().then(function(outline) {
- var outlineView = document.getElementById('outlineView');
- self.outline = new DocumentOutlineView({
+ var container = document.getElementById('outlineView');
+ self.outline = new PDFOutlineView({
+ container: container,
outline: outline,
- outlineView: outlineView,
linkService: self
});
+ self.outline.render();
document.getElementById('viewOutline').disabled = !outline;
- if (!outline && !outlineView.classList.contains('hidden')) {
+ if (!outline && !container.classList.contains('hidden')) {
self.switchSidebarView('thumbs');
}
if (outline &&
@@ -1390,7 +1392,6 @@ var PDFViewerApplication = {
window.PDFView = PDFViewerApplication; // obsolete name, using it as an alias
//#endif
-//#include document_outline_view.js
//#include document_attachments_view.js
//#if CHROME