diff --git a/src/main/java/com/emr/controller/FontController.java b/src/main/java/com/emr/controller/FontController.java
index 2b14770..1016b95 100644
--- a/src/main/java/com/emr/controller/FontController.java
+++ b/src/main/java/com/emr/controller/FontController.java
@@ -260,7 +260,6 @@ public class FontController {
                     boolean flag = false;
                     boolean nurseflag = false;
                     for(Archive_Detail detail : list){
-                        if(StringUtils.isNotBlank(detail.getSubassort()) && assortName.equals(detail.getSubassort())){
                             String assortid = detail.getAssortid();
                             if(StringUtils.isNotBlank(assortid) && assortid.equals(assortId)){
                                 //是病程记录
@@ -306,7 +305,6 @@ public class FontController {
                                 treeList.add(tree2);
                                 id++;
                             }
-                        }
                     }
                     tree1.setName(assortName + "("+count+")");
                     tree1.setChecked("true");
diff --git a/src/main/java/com/emr/dao/Archive_DetailMapper.java b/src/main/java/com/emr/dao/Archive_DetailMapper.java
index ee24438..6bf80d5 100644
--- a/src/main/java/com/emr/dao/Archive_DetailMapper.java
+++ b/src/main/java/com/emr/dao/Archive_DetailMapper.java
@@ -34,4 +34,6 @@ public interface Archive_DetailMapper {
     List<Archive_Detail> selectByCol2(Archive_Detail record);
 
     List<Archive_Detail> selectTypeTreeByPatientIdAndAssortIds(@Param("patientId")String patientId, @Param("assortIds")String assortIds);
+
+    List<Archive_Detail> selectByIdStr1(Archive_Detail record);
 }
\ No newline at end of file
diff --git a/src/main/java/com/emr/service/ipml/Archive_DetailServiceImpl.java b/src/main/java/com/emr/service/ipml/Archive_DetailServiceImpl.java
index 973a62f..c6cc49e 100644
--- a/src/main/java/com/emr/service/ipml/Archive_DetailServiceImpl.java
+++ b/src/main/java/com/emr/service/ipml/Archive_DetailServiceImpl.java
@@ -96,7 +96,7 @@ public class Archive_DetailServiceImpl implements Archive_DetailService {
 
     @Override
     public void selectByIdStrFont(HttpServletResponse response, HttpSession session, Archive_Detail detail) {
-        List<Archive_Detail> arList = archiveDetailMapper.selectByIdStr(detail);
+        List<Archive_Detail> arList = archiveDetailMapper.selectByIdStr1(detail);
         List<String> pdfList = mulFile2OneById(response, arList);
         //存至session
         session.setAttribute("showRecord",pdfList);
diff --git a/src/main/resources/config/jdbc.properties b/src/main/resources/config/jdbc.properties
index 0eb961c..3b38ede 100644
--- a/src/main/resources/config/jdbc.properties
+++ b/src/main/resources/config/jdbc.properties
@@ -5,11 +5,11 @@
 #jdbc.mysql.password=root
 
 jdbc.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver
-jdbc.url=jdbc\:sqlserver\://127.0.0.1:1433;databaseName=emr_record_zj
-#jdbc.url=jdbc\:sqlserver\://10.6.1.127:1433;databaseName=DB_PrivilegeManagement_GYFY
+#jdbc.url=jdbc\:sqlserver\://127.0.0.1:1433;databaseName=emr_record_zj
+jdbc.url=jdbc\:sqlserver\://10.6.1.127:1433;databaseName=DB_PrivilegeManagement_GYFY
 jdbc.username=sa
-#jdbc.password=123456
-jdbc.password=xjgs+docus911
+jdbc.password=123456
+#jdbc.password=xjgs+docus911
 #hibernate config
 hibernate.dialect=org.hibernate.dialect.SQLServerDialect
 hibernate.show_sql=true
@@ -20,10 +20,10 @@ hibernate.current_session_context_class=thread
 hibernate.jdbc.batch_size=50  
 hibernate.enable_lazy_load_no_trans=true  
 #ͼƬ��ַ
-pictureUrl=C:\\Users\\HIPAA\\Desktop\\test\\uploadImage
+pictureUrl=D:\\JSsoftworking\\zhangjiang\\pdf
 #pictureUrl=src\\main\\webapp
 #�����Զ�����PDF��ַ
-autoPdfUrl=C:/Users/HIPAA/Desktop/test/autoPdf
+autoPdfUrl=D:\\JSsoftworking\\zhangjiang\\autoPdf
 #�����ϴ�PDF��ַ
 pdfUrl=C:\\Users\\HIPAA\\Desktop\\test\\localPdf
 #PDF�ļ������ڻ����б���ַ
@@ -47,7 +47,7 @@ powerGetUserList=http://127.0.0.1:8081/power/font/getUserList?userName=admin
 allAddortIds = 00000000
 
 #pdf\u6C34\u5370
-pdfWater = \u4F5B\u5C71\u5E02\u9AD8\u660E\u4EBA\u6C11\u533B\u9662
+pdfWater = \u5e7f\u4e1c\u533b\u79d1\u5927\u5b66\u9644\u5c5e\u533b\u9662
 
 #�˵��ӿ�http://120.27.212.36:8888/power/font/getMenusByUserIdAndSysFlag
 #powerUrl=http://120.27.212.36:8888/power/font/getMenusByUserIdAndSysFlag
diff --git a/src/main/resources/config/spring-shiro.xml b/src/main/resources/config/spring-shiro.xml
index 76f9a79..ab66894 100644
--- a/src/main/resources/config/spring-shiro.xml
+++ b/src/main/resources/config/spring-shiro.xml
@@ -20,6 +20,7 @@
                 /test=anon
                 /login=anon
                 /static/**=anon
+                /font/**=anon
                 /jspf/**=anon
                 /img/**=anon
                 /styles/**=anon
diff --git a/src/main/resources/mapper/Archive_DetailMapper.xml b/src/main/resources/mapper/Archive_DetailMapper.xml
index e9e4b5a..be4a67a 100644
--- a/src/main/resources/mapper/Archive_DetailMapper.xml
+++ b/src/main/resources/mapper/Archive_DetailMapper.xml
@@ -115,6 +115,18 @@
     </if>
     ORDER BY page_number
   </select>
+  <select id="selectByIdStr1" parameterType="com.emr.entity.Archive_Detail" resultMap="BaseResultMap">
+    select
+    PDF_PATH,archive_detail.AssortID,archive_detail.title
+    from archive_detail
+    left join zd_assort
+    on zd_assort.assort_id = archive_detail.AssortID
+    where 1=1 and flag=0
+    <if test="title != null and title!=''">
+      and id in (${title})
+    </if>
+    order by zd_assort.assort_sort,archive_detail.UpLoadDateTime
+  </select>
   <select id="selectByColm" parameterType="com.emr.entity.Archive_Detail" resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List"/>
diff --git a/src/main/webapp/static/js/showRecord/showRecordIframe.js b/src/main/webapp/static/js/showRecord/showRecordIframe.js
index bf5c1cc..8d934bd 100644
--- a/src/main/webapp/static/js/showRecord/showRecordIframe.js
+++ b/src/main/webapp/static/js/showRecord/showRecordIframe.js
@@ -65,16 +65,16 @@ var menu = {
 //加载树
 $().ready(function(data){
 	menu.loadMenuTree();
-	//判断是否是护理按需采集，是显示刷新按钮
-	var typeFlag = parent.$("#typeFlag").val();
-	if(typeFlag == 1){
-		$("#freshBtnDiv").show();
-	}else if(typeFlag == 2){
-		var delPower = parent.$("#delPower").val();
-		if(delPower == 1){
-			$("#delBtnDiv").show();
-		}
-	}
+	// //判断是否是护理按需采集，是显示刷新按钮
+	// var typeFlag = parent.$("#typeFlag").val();
+	// if(typeFlag == 1){
+	// 	$("#freshBtnDiv").show();
+	// }else if(typeFlag == 2){
+	// 	var delPower = parent.$("#delPower").val();
+	// 	if(delPower == 1){
+	// 		$("#delBtnDiv").show();
+	// 	}
+	// }
 });
 
 //获取获取树选中节点，赋值隐藏域并加载pdf
@@ -129,7 +129,7 @@ function onloadPdf(){
 					toastr.error(data.msg);
 				}
 			}
-		})
+		});
 	}
 	/*$("#iframe1").attr("src",path+"/static/pdfjs/web/viewer.html?file="+path+"/font/getPdfToPdf/"+patientId+"/"+detailIds);*/
 
diff --git a/src/main/webapp/static/pdfjs/web/viewer.html b/src/main/webapp/static/pdfjs/web/viewer.html
index 3416046..c773c28 100644
--- a/src/main/webapp/static/pdfjs/web/viewer.html
+++ b/src/main/webapp/static/pdfjs/web/viewer.html
@@ -18,7 +18,7 @@ Adobe CMap resources are covered by their own copyright and license:
 http://sourceforge.net/adobe/cmap/wiki/License/
 -->
 <html dir="ltr" mozdisallowselectionprint moznomarginboxes>
-  <head>
+<head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
     <meta name="google" content="notranslate">
@@ -30,191 +30,246 @@ http://sourceforge.net/adobe/cmap/wiki/License/
     <script src="compatibility.js"></script>
 
 
-
-<!-- This snippet is used in production (included from viewer.html) -->
-<link rel="resource" type="application/l10n" href="locale/locale.properties"/>
-<script src="l10n.js"></script>
-<script src="../build/pdf.js"></script>
-
+    <!-- This snippet is used in production (included from viewer.html) -->
+    <link rel="resource" type="application/l10n" href="locale/locale.properties"/>
+    <link rel="shortcut icon" href="../../favicon.ico">
+    <script type="text/javascript" src="../../js/jquery-3.3.1.js"></script>
+    <script type="text/javascript"
+            src="../../bootstrap-3.3.7/bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
+    <script src="l10n.js"></script>
+    <script src="../build/pdf.js"></script>
 
 
     <script src="debugger.js"></script>
-    <script src="viewer.js"></script>
-
-  </head>
-
-  <body tabindex="1" class="loadingInProgress">
-    <div id="outerContainer" class="sidebarOpen">
+    <script src="viewer.js?time=2020-10-16_1"></script>
+
+    <style>
+        .loading {
+            width: 160px;
+            height: 56px;
+            position: absolute;
+            top: 50%;
+            left: 50%;
+            line-height: 56px;
+            color: #fff;
+            padding-left: 60px;
+            font-size: 15px;
+            background: #000;
+            opacity: 0.7;
+            z-index: 9999;
+            -moz-border-radius: 20px;
+            -webkit-border-radius: 20px;
+            border-radius: 20px;
+            filter: progid:DXImageTransform.Microsoft.Alpha(opacity=70);
+        }
+    </style>
+</head>
+
+<body tabindex="1" class="loadingInProgress" onkeydown="disabledPrint()">
+<div id="myModal" class="modal fade" data-keyboard="false"
+     data-backdrop="static" data-role="dialog"
+     aria-labelledby="myModalLabel" aria-hidden="true">
+    <div id="loading" class="loading">加载中。。。</div>
+</div>
+<div id="outerContainer">
 
-      <div id="sidebarContainer">
+    <div id="sidebarContainer">
         <div id="toolbarSidebar">
-          <div class="splitToolbarButton toggled">
-            <button id="viewThumbnail" class="toolbarButton group toggled" title="Show Thumbnails" tabindex="2" data-l10n-id="thumbs">
-               <span data-l10n-id="thumbs_label">Thumbnails</span>
-            </button>
-            <button id="viewOutline" class="toolbarButton group" title="Show Document Outline" tabindex="3" data-l10n-id="outline">
-               <span data-l10n-id="outline_label">Document Outline</span>
-            </button>
-            <button id="viewAttachments" class="toolbarButton group" title="Show Attachments" tabindex="4" data-l10n-id="attachments">
-               <span data-l10n-id="attachments_label">Attachments</span>
-            </button>
-          </div>
+            <div class="splitToolbarButton toggled">
+                <button id="viewThumbnail" class="toolbarButton group toggled" title="Show Thumbnails" tabindex="2"
+                        data-l10n-id="thumbs">
+                    <span data-l10n-id="thumbs_label">Thumbnails</span>
+                </button>
+                <button id="viewOutline" class="toolbarButton group" title="Show Document Outline" tabindex="3"
+                        data-l10n-id="outline">
+                    <span data-l10n-id="outline_label">Document Outline</span>
+                </button>
+                <button id="viewAttachments" class="toolbarButton group" title="Show Attachments" tabindex="4"
+                        data-l10n-id="attachments">
+                    <span data-l10n-id="attachments_label">Attachments</span>
+                </button>
+            </div>
         </div>
         <div id="sidebarContent">
-          <div id="thumbnailView">
-          </div>
-          <div id="outlineView" class="hidden">
-          </div>
-          <div id="attachmentsView" class="hidden">
-          </div>
+            <div id="thumbnailView">
+            </div>
+            <div id="outlineView" class="hidden">
+            </div>
+            <div id="attachmentsView" class="hidden">
+            </div>
         </div>
-      </div>  <!-- sidebarContainer -->
+    </div>  <!-- sidebarContainer -->
 
-      <div id="mainContainer">
+    <div id="mainContainer">
         <div class="findbar hidden doorHanger hiddenSmallView" id="findbar">
-          <label for="findInput" class="toolbarLabel" data-l10n-id="find_label">Find:</label>
-          <input id="findInput" class="toolbarField" tabindex="91">
-          <div class="splitToolbarButton">
-            <button class="toolbarButton findPrevious" title="" id="findPrevious" tabindex="92" data-l10n-id="find_previous">
-              <span data-l10n-id="find_previous_label">Previous</span>
-            </button>
-            <div class="splitToolbarButtonSeparator"></div>
-            <button class="toolbarButton findNext" title="" id="findNext" tabindex="93" data-l10n-id="find_next">
-              <span data-l10n-id="find_next_label">Next</span>
-            </button>
-          </div>
-          <input type="checkbox" id="findHighlightAll" class="toolbarField">
-          <label for="findHighlightAll" class="toolbarLabel" tabindex="94" data-l10n-id="find_highlight">Highlight all</label>
-          <input type="checkbox" id="findMatchCase" class="toolbarField">
-          <label for="findMatchCase" class="toolbarLabel" tabindex="95" data-l10n-id="find_match_case_label">Match case</label>
-          <span id="findMsg" class="toolbarLabel"></span>
+            <label for="findInput" class="toolbarLabel" data-l10n-id="find_label">Find:</label>
+            <input id="findInput" class="toolbarField" tabindex="91">
+            <div class="splitToolbarButton">
+                <button class="toolbarButton findPrevious" title="" id="findPrevious" tabindex="92"
+                        data-l10n-id="find_previous">
+                    <span data-l10n-id="find_previous_label">Previous</span>
+                </button>
+                <div class="splitToolbarButtonSeparator"></div>
+                <button class="toolbarButton findNext" title="" id="findNext" tabindex="93" data-l10n-id="find_next">
+                    <span data-l10n-id="find_next_label">Next</span>
+                </button>
+            </div>
+            <input type="checkbox" id="findHighlightAll" class="toolbarField">
+            <label for="findHighlightAll" class="toolbarLabel" tabindex="94" data-l10n-id="find_highlight">Highlight
+                all</label>
+            <input type="checkbox" id="findMatchCase" class="toolbarField">
+            <label for="findMatchCase" class="toolbarLabel" tabindex="95" data-l10n-id="find_match_case_label">Match
+                case</label>
+            <span id="findMsg" class="toolbarLabel"></span>
         </div>  <!-- findbar -->
 
         <div id="secondaryToolbar" class="secondaryToolbar hidden doorHangerRight">
-          <div id="secondaryToolbarButtonContainer">
-            <button id="secondaryPresentationMode" class="secondaryToolbarButton presentationMode visibleLargeView" title="Switch to Presentation Mode" tabindex="51" data-l10n-id="presentation_mode">
-              <span data-l10n-id="presentation_mode_label">Presentation Mode</span>
-            </button>
-
-            <!--<button id="secondaryOpenFile" class="secondaryToolbarButton openFile visibleLargeView" title="Open File" tabindex="52" data-l10n-id="open_file">
-              <span data-l10n-id="open_file_label">Open</span>
-            </button>-->
-
-            <button id="secondaryPrint" class="secondaryToolbarButton print visibleMediumView" title="Print" tabindex="53" data-l10n-id="print">
-              <span data-l10n-id="print_label">Print</span>
-            </button>
-
-            <button id="secondaryDownload" class="secondaryToolbarButton download visibleMediumView" title="Download" tabindex="54" data-l10n-id="download">
-              <span data-l10n-id="download_label">Download</span>
-            </button>
-
-            <a href="#" id="secondaryViewBookmark" class="secondaryToolbarButton bookmark visibleSmallView" title="Current view (copy or open in new window)" tabindex="55" data-l10n-id="bookmark">
-              <span data-l10n-id="bookmark_label">Current View</span>
-            </a>
-
-            <div class="horizontalToolbarSeparator visibleLargeView"></div>
-
-            <button id="firstPage" class="secondaryToolbarButton firstPage" title="Go to First Page" tabindex="56" data-l10n-id="first_page">
-              <span data-l10n-id="first_page_label">Go to First Page</span>
-            </button>
-            <button id="lastPage" class="secondaryToolbarButton lastPage" title="Go to Last Page" tabindex="57" data-l10n-id="last_page">
-              <span data-l10n-id="last_page_label">Go to Last Page</span>
-            </button>
-
-            <div class="horizontalToolbarSeparator"></div>
+            <div id="secondaryToolbarButtonContainer">
+                <button id="secondaryPresentationMode" class="secondaryToolbarButton presentationMode visibleLargeView"
+                        title="Switch to Presentation Mode" tabindex="51" data-l10n-id="presentation_mode">
+                    <span data-l10n-id="presentation_mode_label">Presentation Mode</span>
+                </button>
+                <button id="secondaryOpenFile" class="secondaryToolbarButton openFile visibleLargeView"
+                        title="Open File" tabindex="52" data-l10n-id="open_file">
+                    <span data-l10n-id="open_file_label">Open</span>
+                </button>
+                <button id="secondaryPrint" class="secondaryToolbarButton print visibleMediumView" title="Print"
+                        tabindex="53" data-l10n-id="print">
+                    <span data-l10n-id="print_label">Print</span>
+                </button>
 
-            <button id="pageRotateCw" class="secondaryToolbarButton rotateCw" title="Rotate Clockwise" tabindex="58" data-l10n-id="page_rotate_cw">
-              <span data-l10n-id="page_rotate_cw_label">Rotate Clockwise</span>
-            </button>
-            <button id="pageRotateCcw" class="secondaryToolbarButton rotateCcw" title="Rotate Counterclockwise" tabindex="59" data-l10n-id="page_rotate_ccw">
-              <span data-l10n-id="page_rotate_ccw_label">Rotate Counterclockwise</span>
-            </button>
+                <button id="secondaryDownload" class="secondaryToolbarButton download visibleMediumView"
+                        title="Download" tabindex="54" data-l10n-id="download">
+                    <span data-l10n-id="download_label">Download</span>
+                </button>
 
-            <div class="horizontalToolbarSeparator"></div>
+                <a href="#" id="secondaryViewBookmark" class="secondaryToolbarButton bookmark visibleSmallView"
+                   title="Current view (copy or open in new window)" tabindex="55" data-l10n-id="bookmark">
+                    <span data-l10n-id="bookmark_label">Current View</span>
+                </a>
 
-            <button id="toggleHandTool" class="secondaryToolbarButton handTool" title="Enable hand tool" tabindex="60" data-l10n-id="hand_tool_enable">
-              <span data-l10n-id="hand_tool_enable_label">Enable hand tool</span>
-            </button>
+                <div class="horizontalToolbarSeparator visibleLargeView"></div>
 
-            <div class="horizontalToolbarSeparator"></div>
+                <button id="firstPage" class="secondaryToolbarButton firstPage" title="Go to First Page" tabindex="56"
+                        data-l10n-id="first_page">
+                    <span data-l10n-id="first_page_label">Go to First Page</span>
+                </button>
+                <button id="lastPage" class="secondaryToolbarButton lastPage" title="Go to Last Page" tabindex="57"
+                        data-l10n-id="last_page">
+                    <span data-l10n-id="last_page_label">Go to Last Page</span>
+                </button>
 
-            <button id="documentProperties" class="secondaryToolbarButton documentProperties" title="Document Properties…" tabindex="61" data-l10n-id="document_properties">
-              <span data-l10n-id="document_properties_label">Document Properties…</span>
-            </button>
-          </div>
-        </div>  <!-- secondaryToolbar -->
+                <div class="horizontalToolbarSeparator"></div>
 
-        <div class="toolbar">
-          <div id="toolbarContainer">
-            <div id="toolbarViewer">
-              <div id="toolbarViewerLeft">
-                <button id="sidebarToggle" class="toolbarButton" title="Toggle Sidebar" tabindex="11" data-l10n-id="toggle_sidebar">
-                  <span data-l10n-id="toggle_sidebar_label">Toggle Sidebar</span>
+                <button id="pageRotateCw" class="secondaryToolbarButton rotateCw" title="Rotate Clockwise" tabindex="58"
+                        data-l10n-id="page_rotate_cw">
+                    <span data-l10n-id="page_rotate_cw_label">Rotate Clockwise</span>
                 </button>
-                <div class="toolbarButtonSpacer"></div>
-                <button id="viewFind" class="toolbarButton group hiddenSmallView" title="Find in Document" tabindex="12" data-l10n-id="findbar">
-                   <span data-l10n-id="findbar_label">Find</span>
-                </button>
-                <div class="splitToolbarButton">
-                  <button class="toolbarButton pageUp" title="Previous Page" id="previous" tabindex="13" data-l10n-id="previous">
-                    <span data-l10n-id="previous_label">Previous</span>
-                  </button>
-                  <div class="splitToolbarButtonSeparator"></div>
-                  <button class="toolbarButton pageDown" title="Next Page" id="next" tabindex="14" data-l10n-id="next">
-                    <span data-l10n-id="next_label">Next</span>
-                  </button>
-                </div>
-                <label id="pageNumberLabel" class="toolbarLabel" for="pageNumber" data-l10n-id="page_label">Page: </label>
-                <input type="number" id="pageNumber" class="toolbarField pageNumber" value="1" size="4" min="1" tabindex="15">
-                <span id="numPages" class="toolbarLabel"></span>
-              </div>
-              <div id="toolbarViewerRight">
-                <button id="presentationMode" class="toolbarButton presentationMode hiddenLargeView" title="Switch to Presentation Mode" tabindex="31" data-l10n-id="presentation_mode">
-                  <span data-l10n-id="presentation_mode_label">Presentation Mode</span>
+                <button id="pageRotateCcw" class="secondaryToolbarButton rotateCcw" title="Rotate Counterclockwise"
+                        tabindex="59" data-l10n-id="page_rotate_ccw">
+                    <span data-l10n-id="page_rotate_ccw_label">Rotate Counterclockwise</span>
                 </button>
 
-                <!--<button id="openFile" class="toolbarButton openFile hiddenLargeView" title="Open File" tabindex="32" data-l10n-id="open_file">
-                  <span data-l10n-id="open_file_label">Open</span>
-                </button>-->
+                <div class="horizontalToolbarSeparator"></div>
 
-                <button id="print" class="toolbarButton print hiddenMediumView" title="Print" tabindex="33" data-l10n-id="print">
-                  <span data-l10n-id="print_label">Print</span>
+                <button id="toggleHandTool" class="secondaryToolbarButton handTool" title="Enable hand tool"
+                        tabindex="60" data-l10n-id="hand_tool_enable">
+                    <span data-l10n-id="hand_tool_enable_label">Enable hand tool</span>
                 </button>
 
-                <button id="download" class="toolbarButton download hiddenMediumView" title="Download" tabindex="34" data-l10n-id="download">
-                  <span data-l10n-id="download_label">Download</span>
-                </button>
-                <a href="#" id="viewBookmark" class="toolbarButton bookmark hiddenSmallView" title="Current view (copy or open in new window)" tabindex="35" data-l10n-id="bookmark">
-                  <span data-l10n-id="bookmark_label">Current View</span>
-                </a>
+                <div class="horizontalToolbarSeparator"></div>
 
-                <div class="verticalToolbarSeparator hiddenSmallView"></div>
+                <!--<button id="documentProperties" class="secondaryToolbarButton documentProperties" title="Document Properties…" tabindex="61" data-l10n-id="document_properties">
+                  <span data-l10n-id="document_properties_label">Document Properties…</span>
+                </button>-->
+            </div>
+        </div>  <!-- secondaryToolbar -->
 
-                <button id="secondaryToolbarToggle" class="toolbarButton" title="Tools" tabindex="36" data-l10n-id="tools">
-                  <span data-l10n-id="tools_label">Tools</span>
-                </button>
-              </div>
-              <div class="outerCenter">
-                <div class="innerCenter" id="toolbarViewerMiddle">
-                  <div class="splitToolbarButton">
-                    <button id="zoomOut" class="toolbarButton zoomOut" title="Zoom Out" tabindex="21" data-l10n-id="zoom_out">
-                      <span data-l10n-id="zoom_out_label">Zoom Out</span>
-                    </button>
-                    <div class="splitToolbarButtonSeparator"></div>
-                    <button id="zoomIn" class="toolbarButton zoomIn" title="Zoom In" tabindex="22" data-l10n-id="zoom_in">
-                      <span data-l10n-id="zoom_in_label">Zoom In</span>
-                     </button>
-                  </div>
-                  <span id="scaleSelectContainer" class="dropdownToolbarButton">
+        <div class="toolbar">
+            <div id="toolbarContainer">
+                <div id="toolbarViewer">
+                    <div id="toolbarViewerLeft">
+                        <button id="sidebarToggle" class="toolbarButton" title="Toggle Sidebar" tabindex="11"
+                                data-l10n-id="toggle_sidebar">
+                            <span data-l10n-id="toggle_sidebar_label">Toggle Sidebar</span>
+                        </button>
+                        <div class="toolbarButtonSpacer"></div>
+                        <button id="viewFind" class="toolbarButton group hiddenSmallView" title="Find in Document"
+                                tabindex="12" data-l10n-id="findbar">
+                            <span data-l10n-id="findbar_label">Find</span>
+                        </button>
+                        <div class="splitToolbarButton">
+                            <button class="toolbarButton pageUp" title="Previous Page" id="previous" tabindex="13"
+                                    data-l10n-id="previous">
+                                <span data-l10n-id="previous_label">Previous</span>
+                            </button>
+                            <div class="splitToolbarButtonSeparator"></div>
+                            <button class="toolbarButton pageDown" title="Next Page" id="next" tabindex="14"
+                                    data-l10n-id="next">
+                                <span data-l10n-id="next_label">Next</span>
+                            </button>
+                        </div>
+                        <label id="pageNumberLabel" class="toolbarLabel" for="pageNumber" data-l10n-id="page_label">Page: </label>
+                        <input type="number" id="pageNumber" class="toolbarField pageNumber" value="1" size="4" min="1"
+                               tabindex="15">
+                        <span id="numPages" class="toolbarLabel"></span>
+                    </div>
+                    <div id="toolbarViewerRight">
+                        <button id="presentationMode" class="toolbarButton presentationMode hiddenLargeView"
+                                title="Switch to Presentation Mode" tabindex="31" data-l10n-id="presentation_mode">
+                            <span data-l10n-id="presentation_mode_label">Presentation Mode</span>
+                        </button>
+
+                        <!--<button id="openFile" class="toolbarButton openFile hiddenLargeView" title="Open File" tabindex="32" data-l10n-id="open_file">
+                          <span data-l10n-id="open_file_label">Open</span>
+                        </button>-->
+
+                        <button id="print" class="toolbarButton print hiddenMediumView" title="Print" tabindex="33"
+                                data-l10n-id="print" style="display: none">
+                            <span data-l10n-id="print_label">Print</span>
+                        </button>
+
+                        <!--<button id="download" class="toolbarButton download hiddenMediumView" title="Download" tabindex="34" data-l10n-id="download">
+                          <span data-l10n-id="download_label">Download</span>
+                        </button>-->
+                        <a href="#" id="viewBookmark" class="toolbarButton bookmark hiddenSmallView"
+                           title="Current view (copy or open in new window)" tabindex="35" data-l10n-id="bookmark">
+                            <span data-l10n-id="bookmark_label">Current View</span>
+                        </a>
+
+                        <div class="verticalToolbarSeparator hiddenSmallView"></div>
+
+                        <button id="secondaryToolbarToggle" class="toolbarButton" title="Tools" tabindex="36"
+                                data-l10n-id="tools">
+                            <span data-l10n-id="tools_label">Tools</span>
+                        </button>
+                    </div>
+                    <div class="outerCenter">
+                        <div class="innerCenter" id="toolbarViewerMiddle">
+                            <div class="splitToolbarButton">
+                                <button id="zoomOut" class="toolbarButton zoomOut" title="Zoom Out" tabindex="21"
+                                        data-l10n-id="zoom_out">
+                                    <span data-l10n-id="zoom_out_label">Zoom Out</span>
+                                </button>
+                                <div class="splitToolbarButtonSeparator"></div>
+                                <button id="zoomIn" class="toolbarButton zoomIn" title="Zoom In" tabindex="22"
+                                        data-l10n-id="zoom_in">
+                                    <span data-l10n-id="zoom_in_label">Zoom In</span>
+                                </button>
+                            </div>
+                            <span id="scaleSelectContainer" class="dropdownToolbarButton">
                      <select id="scaleSelect" title="Zoom" tabindex="23" data-l10n-id="zoom">
-                      <option id="pageAutoOption" title="" value="auto" selected="selected" data-l10n-id="page_scale_auto">Automatic Zoom</option>
+                      <option id="pageAutoOption" title="" value="auto"
+                              data-l10n-id="page_scale_auto">Automatic Zoom</option>
                       <option id="pageActualOption" title="" value="page-actual" data-l10n-id="page_scale_actual">Actual Size</option>
-                      <option id="pageFitOption" title="" value="page-fit" data-l10n-id="page_scale_fit">Fit Page</option>
+                      <option id="pageFitOption" title="" value="page-fit"
+                              data-l10n-id="page_scale_fit">Fit Page</option>
                       <option id="pageWidthOption" title="" value="page-width" data-l10n-id="page_scale_width">Full Width</option>
                       <option id="customScaleOption" title="" value="custom"></option>
                       <option title="" value="0.5" data-l10n-id="page_scale_percent" data-l10n-args='{ "scale": 50 }'>50%</option>
                       <option title="" value="0.75" data-l10n-id="page_scale_percent" data-l10n-args='{ "scale": 75 }'>75%</option>
-                      <option title="" value="1" data-l10n-id="page_scale_percent" data-l10n-args='{ "scale": 100 }'>100%</option>
+                      <option title="" value="1" data-l10n-id="page_scale_percent" data-l10n-args='{ "scale": 100 }'
+                              selected="selected">100%</option>
                       <option title="" value="1.25" data-l10n-id="page_scale_percent" data-l10n-args='{ "scale": 125 }'>125%</option>
                       <option title="" value="1.5" data-l10n-id="page_scale_percent" data-l10n-args='{ "scale": 150 }'>150%</option>
                       <option title="" value="2" data-l10n-id="page_scale_percent" data-l10n-args='{ "scale": 200 }'>200%</option>
@@ -222,199 +277,311 @@ http://sourceforge.net/adobe/cmap/wiki/License/
                       <option title="" value="4" data-l10n-id="page_scale_percent" data-l10n-args='{ "scale": 400 }'>400%</option>
                     </select>
                   </span>
+                        </div>
+                    </div>
                 </div>
-              </div>
-            </div>
-            <div id="loadingBar">
-              <div class="progress">
-                <div class="glimmer">
+                <div id="loadingBar">
+                    <div class="progress">
+                        <div class="glimmer">
+                        </div>
+                    </div>
                 </div>
-              </div>
             </div>
-          </div>
         </div>
 
         <menu type="context" id="viewerContextMenu">
-          <menuitem id="contextFirstPage" label="First Page"
-                    data-l10n-id="first_page"></menuitem>
-          <menuitem id="contextLastPage" label="Last Page"
-                    data-l10n-id="last_page"></menuitem>
-          <menuitem id="contextPageRotateCw" label="Rotate Clockwise"
-                    data-l10n-id="page_rotate_cw"></menuitem>
-          <menuitem id="contextPageRotateCcw" label="Rotate Counter-Clockwise"
-                    data-l10n-id="page_rotate_ccw"></menuitem>
+            <menuitem id="contextFirstPage" label="First Page"
+                      data-l10n-id="first_page"></menuitem>
+            <menuitem id="contextLastPage" label="Last Page"
+                      data-l10n-id="last_page"></menuitem>
+            <menuitem id="contextPageRotateCw" label="Rotate Clockwise"
+                      data-l10n-id="page_rotate_cw"></menuitem>
+            <menuitem id="contextPageRotateCcw" label="Rotate Counter-Clockwise"
+                      data-l10n-id="page_rotate_ccw"></menuitem>
         </menu>
 
         <div id="viewerContainer" tabindex="0">
-          <div id="viewer" class="pdfViewer"></div>
+            <div id="viewer" class="pdfViewer"></div>
         </div>
 
         <div id="errorWrapper" hidden='true'>
-          <div id="errorMessageLeft">
-            <span id="errorMessage"></span>
-            <button id="errorShowMore" data-l10n-id="error_more_info">
-              More Information
-            </button>
-            <button id="errorShowLess" data-l10n-id="error_less_info" hidden='true'>
-              Less Information
-            </button>
-          </div>
-          <div id="errorMessageRight">
-            <button id="errorClose" data-l10n-id="error_close">
-              Close
-            </button>
-          </div>
-          <div class="clearBoth"></div>
-          <textarea id="errorMoreInfo" hidden='true' readonly="readonly"></textarea>
+            <div id="errorMessageLeft">
+                <span id="errorMessage"></span>
+                <button id="errorShowMore" data-l10n-id="error_more_info">
+                    More Information
+                </button>
+                <button id="errorShowLess" data-l10n-id="error_less_info" hidden='true'>
+                    Less Information
+                </button>
+            </div>
+            <div id="errorMessageRight">
+                <button id="errorClose" data-l10n-id="error_close">
+                    Close
+                </button>
+            </div>
+            <div class="clearBoth"></div>
+            <textarea id="errorMoreInfo" hidden='true' readonly="readonly"></textarea>
         </div>
-      </div> <!-- mainContainer -->
+    </div> <!-- mainContainer -->
 
-      <div id="overlayContainer" class="hidden">
+    <div id="overlayContainer" class="hidden">
         <div id="passwordOverlay" class="container hidden">
-          <div class="dialog">
-            <div class="row">
-              <p id="passwordText" data-l10n-id="password_label">Enter the password to open this PDF file:</p>
-            </div>
-            <div class="row">
-              <input type="password" id="password" class="toolbarField" />
-            </div>
-            <div class="buttonRow">
-              <button id="passwordCancel" class="overlayButton"><span data-l10n-id="password_cancel">Cancel</span></button>
-              <button id="passwordSubmit" class="overlayButton"><span data-l10n-id="password_ok">OK</span></button>
+            <div class="dialog">
+                <div class="row">
+                    <p id="passwordText" data-l10n-id="password_label">Enter the password to open this PDF file:</p>
+                </div>
+                <div class="row">
+                    <input type="password" id="password" class="toolbarField"/>
+                </div>
+                <div class="buttonRow">
+                    <button id="passwordCancel" class="overlayButton"><span data-l10n-id="password_cancel">Cancel</span>
+                    </button>
+                    <button id="passwordSubmit" class="overlayButton"><span data-l10n-id="password_ok">OK</span>
+                    </button>
+                </div>
             </div>
-          </div>
         </div>
         <div id="documentPropertiesOverlay" class="container hidden">
-          <div class="dialog">
-            <div class="row">
-              <span data-l10n-id="document_properties_file_name">File name:</span> <p id="fileNameField">-</p>
-            </div>
-            <div class="row">
-              <span data-l10n-id="document_properties_file_size">File size:</span> <p id="fileSizeField">-</p>
-            </div>
-            <div class="separator"></div>
-            <div class="row">
-              <span data-l10n-id="document_properties_title">Title:</span> <p id="titleField">-</p>
-            </div>
-            <div class="row">
-              <span data-l10n-id="document_properties_author">Author:</span> <p id="authorField">-</p>
-            </div>
-            <div class="row">
-              <span data-l10n-id="document_properties_subject">Subject:</span> <p id="subjectField">-</p>
-            </div>
-            <div class="row">
-              <span data-l10n-id="document_properties_keywords">Keywords:</span> <p id="keywordsField">-</p>
-            </div>
-            <div class="row">
-              <span data-l10n-id="document_properties_creation_date">Creation Date:</span> <p id="creationDateField">-</p>
-            </div>
-            <div class="row">
-              <span data-l10n-id="document_properties_modification_date">Modification Date:</span> <p id="modificationDateField">-</p>
-            </div>
-            <div class="row">
-              <span data-l10n-id="document_properties_creator">Creator:</span> <p id="creatorField">-</p>
-            </div>
-            <div class="separator"></div>
-            <div class="row">
-              <span data-l10n-id="document_properties_producer">PDF Producer:</span> <p id="producerField">-</p>
-            </div>
-            <div class="row">
-              <span data-l10n-id="document_properties_version">PDF Version:</span> <p id="versionField">-</p>
-            </div>
-            <div class="row">
-              <span data-l10n-id="document_properties_page_count">Page Count:</span> <p id="pageCountField">-</p>
-            </div>
-            <div class="buttonRow">
-              <button id="documentPropertiesClose" class="overlayButton"><span data-l10n-id="document_properties_close">Close</span></button>
+            <div class="dialog">
+                <div class="row">
+                    <span data-l10n-id="document_properties_file_name">File name:</span>
+                    <p id="fileNameField">-</p>
+                </div>
+                <div class="row">
+                    <span data-l10n-id="document_properties_file_size">File size:</span>
+                    <p id="fileSizeField">-</p>
+                </div>
+                <div class="separator"></div>
+                <div class="row">
+                    <span data-l10n-id="document_properties_title">Title:</span>
+                    <p id="titleField">-</p>
+                </div>
+                <div class="row">
+                    <span data-l10n-id="document_properties_author">Author:</span>
+                    <p id="authorField">-</p>
+                </div>
+                <div class="row">
+                    <span data-l10n-id="document_properties_subject">Subject:</span>
+                    <p id="subjectField">-</p>
+                </div>
+                <div class="row">
+                    <span data-l10n-id="document_properties_keywords">Keywords:</span>
+                    <p id="keywordsField">-</p>
+                </div>
+                <div class="row">
+                    <span data-l10n-id="document_properties_creation_date">Creation Date:</span>
+                    <p id="creationDateField">-</p>
+                </div>
+                <div class="row">
+                    <span data-l10n-id="document_properties_modification_date">Modification Date:</span>
+                    <p id="modificationDateField">-</p>
+                </div>
+                <div class="row">
+                    <span data-l10n-id="document_properties_creator">Creator:</span>
+                    <p id="creatorField">-</p>
+                </div>
+                <div class="separator"></div>
+                <div class="row">
+                    <span data-l10n-id="document_properties_producer">PDF Producer:</span>
+                    <p id="producerField">-</p>
+                </div>
+                <div class="row">
+                    <span data-l10n-id="document_properties_version">PDF Version:</span>
+                    <p id="versionField">-</p>
+                </div>
+                <div class="row">
+                    <span data-l10n-id="document_properties_page_count">Page Count:</span>
+                    <p id="pageCountField">-</p>
+                </div>
+                <div class="buttonRow">
+                    <button id="documentPropertiesClose" class="overlayButton"><span
+                            data-l10n-id="document_properties_close">Close</span></button>
+                </div>
             </div>
-          </div>
         </div>
-      </div>  <!-- overlayContainer -->
+    </div>  <!-- overlayContainer -->
 
-    </div> <!-- outerContainer -->
-    <div id="printContainer"></div>
+</div> <!-- outerContainer -->
+<div id="printContainer"></div>
 <div id="mozPrintCallback-shim" hidden>
-  <style>
-@media print {
-  #printContainer div {
-    page-break-after: always;
-    page-break-inside: avoid;
-  }
-}
-  </style>
-  <style scoped>
-#mozPrintCallback-shim {
-  position: fixed;
-  top: 0;
-  left: 0;
-  height: 100%;
-  width: 100%;
-  z-index: 9999999;
-
-  display: block;
-  text-align: center;
-  background-color: rgba(0, 0, 0, 0.5);
-}
-#mozPrintCallback-shim[hidden] {
-  display: none;
-}
-@media print {
-  #mozPrintCallback-shim {
-    display: none;
-  }
-}
-
-#mozPrintCallback-shim .mozPrintCallback-dialog-box {
-  display: inline-block;
-  margin: -50px auto 0;
-  position: relative;
-  top: 45%;
-  left: 0;
-  min-width: 220px;
-  max-width: 400px;
-
-  padding: 9px;
-
-  border: 1px solid hsla(0, 0%, 0%, .5);
-  border-radius: 2px;
-  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
-
-  background-color: #474747;
-
-  color: hsl(0, 0%, 85%);
-  font-size: 16px;
-  line-height: 20px;
-}
-#mozPrintCallback-shim .progress-row {
-  clear: both;
-  padding: 1em 0;
-}
-#mozPrintCallback-shim progress {
-  width: 100%;
-}
-#mozPrintCallback-shim .relative-progress {
-  clear: both;
-  float: right;
-}
-#mozPrintCallback-shim .progress-actions {
-  clear: both;
-}
-  </style>
-  <div class="mozPrintCallback-dialog-box">
-    <!-- TODO: Localise the following strings -->
-    Preparing document for printing...
-    <div class="progress-row">
-      <progress value="0" max="100"></progress>
-      <span class="relative-progress">0%</span>
-    </div>
-    <div class="progress-actions">
-      <input type="button" value="Cancel" class="mozPrintCallback-cancel">
+    <style>
+        @media print {
+            #printContainer div {
+                page-break-after: always;
+                page-break-inside: avoid;
+            }
+        }
+    </style>
+    <style scoped>
+        #mozPrintCallback-shim {
+            position: fixed;
+            top: 0;
+            left: 0;
+            height: 100%;
+            width: 100%;
+            z-index: 9999999;
+
+            display: block;
+            text-align: center;
+            background-color: rgba(0, 0, 0, 0.5);
+        }
+
+        #mozPrintCallback-shim[hidden] {
+            display: none;
+        }
+
+        @media print {
+            #mozPrintCallback-shim {
+                display: none;
+            }
+        }
+
+        #mozPrintCallback-shim .mozPrintCallback-dialog-box {
+            display: inline-block;
+            margin: -50px auto 0;
+            position: relative;
+            top: 45%;
+            left: 0;
+            min-width: 220px;
+            max-width: 400px;
+
+            padding: 9px;
+
+            border: 1px solid hsla(0, 0%, 0%, .5);
+            border-radius: 2px;
+            box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
+
+            background-color: #474747;
+
+            color: hsl(0, 0%, 85%);
+            font-size: 16px;
+            line-height: 20px;
+        }
+
+        #mozPrintCallback-shim .progress-row {
+            clear: both;
+            padding: 1em 0;
+        }
+
+        #mozPrintCallback-shim progress {
+            width: 100%;
+        }
+
+        #mozPrintCallback-shim .relative-progress {
+            clear: both;
+            float: right;
+        }
+
+        #mozPrintCallback-shim .progress-actions {
+            clear: both;
+        }
+    </style>
+    <div class="mozPrintCallback-dialog-box">
+        &lt;!&ndash; TODO: Localise the following strings &ndash;&gt;
+        Preparing document for printing...
+        <div class="progress-row">
+            <progress value="0" max="100"></progress>
+            <span class="relative-progress">0%</span>
+        </div>
+        <div class="progress-actions">
+            <input type="button" value="Cancel" class="mozPrintCallback-cancel">
+        </div>
     </div>
-  </div>
 </div>
-<script>
 
+</body>
+<script>
+    $("#loading").css("background", "url(../../img/load.gif) no-repeat 10px 50%");
+    var interval = setInterval('loadPdf()', 1000);
+
+    function loadPdf() {
+        if (PDFViewerApplication.pdfDocument == null) {
+            $('#myModal').modal('show');
+        } else {
+            clearInterval(interval);
+            $('#myModal').remove();
+        }
+    }
+
+    $(function () {
+        //获取父页面打印权限显示打印按钮
+        var print = parent.$("#print").val();
+        if (print == 1) {
+            $("#print").show();
+        }
+    })
+    //屏蔽鼠标右键
+    document.oncontextmenu = function (e) {
+        var e = e || window.event;
+        e.returnValue = false;
+        return false;
+    }
+
+    //禁止快捷键打印
+    function disabledPrint() {
+        if (event.keyCode == 80 && event.ctrlKey) {
+            event.keyCode = 0;
+            event.returnValue = false;
+        }
+        if (event.ctrlKey && event.keyCode == 83) {
+            event.preventDefault();
+            event.returnValue = false;
+            return false;
+        }
+    }
+
+    var pageNum = 1;
+    var scrollFunc = function (e) {
+        //当前页码
+        var currentPageNum = document.getElementById('pageNumber').value;
+        if (pageNum != currentPageNum) {
+            pageNum = currentPageNum;
+            //获取分类key
+            var key = getQueryVariable("key");
+            if(key) {
+                //获取用户id
+                var userId = window.opener.$("#userId").val();
+                //设置页码缓存
+                var localStorageKey = 'page_' + userId + '_' + key;
+                //获取页面上
+                var list = window.opener.table2List;
+                var page = 0;
+                for (var i = 0; i < list.length; i++) {
+                    //跳过根节点
+                    if (list[i].id != 0) {
+                        //获取detailsIds集合
+                        var ids = list[i].ids;
+                        //获取页码集合
+                        var pageCounts = list[i].pageCounts;
+                        //遍历ids
+                        var idArr = ids.split(",");
+                        var pageCountArr = pageCounts.split(",");
+                        for (var j = 0; j < idArr.length; j++) {
+                            //计算页码
+                            var pageCount = Number(pageCountArr[j]);
+                            for (var l = 0; l < pageCount; l++) {
+                                //累加页码
+                                page += 1;
+                                if (page == Number(pageNum)) {
+                                    //设置缓存
+                                    var localStorageValue = idArr[j] + "_" + (l + 1) + "_" + new Date().getTime();
+                                    localStorage.setItem(localStorageKey, localStorageValue);
+                                    breakFlag = true;
+                                    //退出循环
+                                    return;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+    /*注册事件*/
+    if (document.addEventListener) {
+        document.addEventListener('DOMMouseScroll', scrollFunc, false);
+    }
+    window.onmousewheel = document.onmousewheel = scrollFunc;
 </script>
-  </body>
 </html>
 
diff --git a/src/main/webapp/static/pdfjs/web/viewer.js b/src/main/webapp/static/pdfjs/web/viewer.js
index 5253185..cb46f89 100644
--- a/src/main/webapp/static/pdfjs/web/viewer.js
+++ b/src/main/webapp/static/pdfjs/web/viewer.js
@@ -38,15 +38,15 @@ var PAGE_NUMBER_LOADING_INDICATOR = 'visiblePageIsLoading';
 var DISABLE_AUTO_FETCH_LOADING_BAR_TIMEOUT = 5000;
 
 PDFJS.imageResourcesPath = './images/';
-  PDFJS.workerSrc = '../build/pdf.worker.js';
-  PDFJS.cMapUrl = '../web/cmaps/';
-  PDFJS.cMapPacked = true;
+PDFJS.workerSrc = '../build/pdf.worker.js';
+PDFJS.cMapUrl = '../web/cmaps/';
+PDFJS.cMapPacked = true;
 
 var mozL10n = document.mozL10n || document.webL10n;
 
 
 var CSS_UNITS = 96.0 / 72.0;
-var DEFAULT_SCALE = 'auto';
+var DEFAULT_SCALE = '1';
 var UNKNOWN_SCALE = 0;
 var MAX_AUTO_SCALE = 1.25;
 var SCROLLBAR_PADDING = 40;
@@ -107,24 +107,24 @@ function getFileName(url) {
   var anchor = url.indexOf('#');
   var query = url.indexOf('?');
   var end = Math.min(
-    anchor > 0 ? anchor : url.length,
-    query > 0 ? query : url.length);
+      anchor > 0 ? anchor : url.length,
+      query > 0 ? query : url.length);
   return url.substring(url.lastIndexOf('/', end) + 1, end);
 }
 
 /**
  * Returns scale factor for the canvas. It makes sense for the HiDPI displays.
  * @return {Object} The object with horizontal (sx) and vertical (sy)
-                    scales. The scaled property is set to false if scaling is
-                    not required, true otherwise.
+ scales. The scaled property is set to false if scaling is
+ not required, true otherwise.
  */
 function getOutputScale(ctx) {
   var devicePixelRatio = window.devicePixelRatio || 1;
   var backingStoreRatio = ctx.webkitBackingStorePixelRatio ||
-                          ctx.mozBackingStorePixelRatio ||
-                          ctx.msBackingStorePixelRatio ||
-                          ctx.oBackingStorePixelRatio ||
-                          ctx.backingStorePixelRatio || 1;
+      ctx.mozBackingStorePixelRatio ||
+      ctx.msBackingStorePixelRatio ||
+      ctx.oBackingStorePixelRatio ||
+      ctx.backingStorePixelRatio || 1;
   var pixelRatio = devicePixelRatio / backingStoreRatio;
   return {
     sx: pixelRatio,
@@ -250,7 +250,7 @@ function getVisibleElements(scrollEl, views, sortByVisibility) {
   function isElementBottomBelowViewTop(view) {
     var element = view.div;
     var elementBottom =
-      element.offsetTop + element.clientTop + element.clientHeight;
+        element.offsetTop + element.clientTop + element.clientHeight;
     return elementBottom > top;
   }
 
@@ -258,7 +258,7 @@ function getVisibleElements(scrollEl, views, sortByVisibility) {
   var currentHeight, viewHeight, hiddenHeight, percentHeight;
   var currentWidth, viewWidth;
   var firstVisibleElementInd = (views.length === 0) ? 0 :
-    binarySearchFirstItem(views, isElementBottomBelowViewTop);
+      binarySearchFirstItem(views, isElementBottomBelowViewTop);
 
   for (var i = firstVisibleElementInd, ii = views.length; i < ii; i++) {
     view = views[i];
@@ -276,7 +276,7 @@ function getVisibleElements(scrollEl, views, sortByVisibility) {
       continue;
     }
     hiddenHeight = Math.max(0, top - currentHeight) +
-      Math.max(0, currentHeight + viewHeight - bottom);
+        Math.max(0, currentHeight + viewHeight - bottom);
     percentHeight = ((viewHeight - hiddenHeight) * 100 / viewHeight) | 0;
 
     visible.push({
@@ -322,15 +322,15 @@ function getPDFFileNameFromURL(url) {
   var reFilename = /[^\/?#=]+\.pdf\b(?!.*\.pdf\b)/i;
   var splitURI = reURI.exec(url);
   var suggestedFilename = reFilename.exec(splitURI[1]) ||
-                           reFilename.exec(splitURI[2]) ||
-                           reFilename.exec(splitURI[3]);
+      reFilename.exec(splitURI[2]) ||
+      reFilename.exec(splitURI[3]);
   if (suggestedFilename) {
     suggestedFilename = suggestedFilename[0];
     if (suggestedFilename.indexOf('%') !== -1) {
       // URL-encoded %2Fpath%2Fto%2Ffile.pdf should be file.pdf
       try {
         suggestedFilename =
-          reFilename.exec(decodeURIComponent(suggestedFilename))[0];
+            reFilename.exec(decodeURIComponent(suggestedFilename))[0];
       } catch(e) { // Possible (extremely rare) errors:
         // URIError "Malformed URI", e.g. for "%AA.pdf"
         // TypeError "null has no properties", e.g. for "%2F.pdf"
@@ -395,7 +395,7 @@ var ProgressBar = (function ProgressBarClosure() {
         var scrollbarWidth = container.offsetWidth - viewer.offsetWidth;
         if (scrollbarWidth > 0) {
           this.bar.setAttribute('style', 'width: calc(100% - ' +
-                                         scrollbarWidth + 'px);');
+              scrollbarWidth + 'px);');
         }
       }
     },
@@ -465,11 +465,11 @@ var Preferences = {
   initialize: function preferencesInitialize() {
     return this.initializedPromise =
         this._readFromStorage(DEFAULT_PREFERENCES).then(function(prefObj) {
-      this.isInitializedPromiseResolved = true;
-      if (prefObj) {
-        this.prefs = prefObj;
-      }
-    }.bind(this));
+          this.isInitializedPromiseResolved = true;
+          if (prefObj) {
+            this.prefs = prefObj;
+          }
+        }.bind(this));
   },
 
   /**
@@ -543,12 +543,12 @@ var Preferences = {
           value = value.toString();
         } else {
           throw new Error('Preferences_set: \'' + value + '\' is a \"' +
-                          valueType + '\", expected \"' + defaultType + '\".');
+              valueType + '\", expected \"' + defaultType + '\".');
         }
       } else {
         if (valueType === 'number' && (value | 0) !== value) {
           throw new Error('Preferences_set: \'' + value +
-                          '\' must be an \"integer\".');
+              '\' must be an \"integer\".');
         }
       }
       this.prefs[name] = value;
@@ -778,7 +778,7 @@ var DownloadManager = (function DownloadManagerClosure() {
                                                         contentType) {
       if (navigator.msSaveBlob) { // IE10 and above
         return navigator.msSaveBlob(new Blob([data], { type: contentType }),
-                                    filename);
+            filename);
       }
 
       var blobUrl = PDFJS.createObjectURL(data, contentType);
@@ -828,29 +828,29 @@ var ViewHistory = (function ViewHistoryClosure() {
     this.isInitializedPromiseResolved = false;
     this.initializedPromise =
         this._readFromStorage().then(function (databaseStr) {
-      this.isInitializedPromiseResolved = true;
+          this.isInitializedPromiseResolved = true;
 
-      var database = JSON.parse(databaseStr || '{}');
-      if (!('files' in database)) {
-        database.files = [];
-      }
-      if (database.files.length >= VIEW_HISTORY_MEMORY) {
-        database.files.shift();
-      }
-      var index;
-      for (var i = 0, length = database.files.length; i < length; i++) {
-        var branch = database.files[i];
-        if (branch.fingerprint === this.fingerprint) {
-          index = i;
-          break;
-        }
-      }
-      if (typeof index !== 'number') {
-        index = database.files.push({fingerprint: this.fingerprint}) - 1;
-      }
-      this.file = database.files[index];
-      this.database = database;
-    }.bind(this));
+          var database = JSON.parse(databaseStr || '{}');
+          if (!('files' in database)) {
+            database.files = [];
+          }
+          if (database.files.length >= VIEW_HISTORY_MEMORY) {
+            database.files.shift();
+          }
+          var index;
+          for (var i = 0, length = database.files.length; i < length; i++) {
+            var branch = database.files[i];
+            if (branch.fingerprint === this.fingerprint) {
+              index = i;
+              break;
+            }
+          }
+          if (typeof index !== 'number') {
+            index = database.files.push({fingerprint: this.fingerprint}) - 1;
+          }
+          this.file = database.files[index];
+          this.database = database;
+        }.bind(this));
   }
 
   ViewHistory.prototype = {
@@ -925,9 +925,8 @@ var PDFFindBar = (function PDFFindBarClosure() {
 
     if (this.findController === null) {
       throw new Error('PDFFindBar cannot be used without a ' +
-                      'PDFFindController instance.');
+          'PDFFindController instance.');
     }
-
     // Add event listeners to the DOM elements.
     var self = this;
     this.toggleButton.addEventListener('click', function() {
@@ -1001,10 +1000,10 @@ var PDFFindBar = (function PDFFindBarClosure() {
         case FindStates.FIND_WRAPPED:
           if (previous) {
             findMsg = mozL10n.get('find_reached_top', null,
-              'Reached top of document, continued from bottom');
+                'Reached top of document, continued from bottom');
           } else {
             findMsg = mozL10n.get('find_reached_bottom', null,
-              'Reached end of document, continued from top');
+                'Reached end of document, continued from top');
           }
           break;
       }
@@ -1193,22 +1192,22 @@ var PDFFindController = (function PDFFindControllerClosure() {
       var self = this;
       function extractPageText(pageIndex) {
         self.pdfViewer.getPageTextContent(pageIndex).then(
-          function textContentResolved(textContent) {
-            var textItems = textContent.items;
-            var str = [];
+            function textContentResolved(textContent) {
+              var textItems = textContent.items;
+              var str = [];
 
-            for (var i = 0, len = textItems.length; i < len; i++) {
-              str.push(textItems[i].str);
-            }
+              for (var i = 0, len = textItems.length; i < len; i++) {
+                str.push(textItems[i].str);
+              }
 
-            // Store the pageContent as a string.
-            self.pageContents.push(str.join(''));
+              // Store the pageContent as a string.
+              self.pageContents.push(str.join(''));
 
-            extractTextPromisesResolves[pageIndex](pageIndex);
-            if ((pageIndex + 1) < self.pdfViewer.pagesCount) {
-              extractPageText(pageIndex + 1);
+              extractTextPromisesResolves[pageIndex](pageIndex);
+              if ((pageIndex + 1) < self.pdfViewer.pagesCount) {
+                extractPageText(pageIndex + 1);
+              }
             }
-          }
         );
       }
       extractPageText(0);
@@ -1305,7 +1304,7 @@ var PDFFindController = (function PDFFindControllerClosure() {
           // the next match on the page.
           this.hadMatch = true;
           offset.matchIdx = (previous ? offset.matchIdx - 1 :
-                                        offset.matchIdx + 1);
+              offset.matchIdx + 1);
           this.updateMatch(true);
           return;
         }
@@ -1421,12 +1420,12 @@ var PDFFindController = (function PDFFindControllerClosure() {
     updateUIState: function PDFFindController_updateUIState(state, previous) {
       if (this.integratedFind) {
         FirefoxCom.request('updateFindControlState',
-                           { result: state, findPrevious: previous });
+            { result: state, findPrevious: previous });
         return;
       }
       if (this.findBar === null) {
         throw new Error('PDFFindController is not initialized with a ' +
-                        'PDFFindBar instance.');
+            'PDFFindBar instance.');
       }
       this.findBar.updateUIState(state, previous);
     }
@@ -1505,9 +1504,9 @@ var PDFHistory = {
         // update the previous entry in the browser history.
         if (self.uid === 0) {
           var previousParams = (self.previousHash && self.currentBookmark &&
-                                self.previousHash !== self.currentBookmark) ?
-            { hash: self.currentBookmark, page: self.currentPage } :
-            { page: 1 };
+              self.previousHash !== self.currentBookmark) ?
+              { hash: self.currentBookmark, page: self.currentPage } :
+              { page: 1 };
           self.historyUnlocked = false;
           self.allowHashChange = false;
           window.history.back();
@@ -1524,7 +1523,7 @@ var PDFHistory = {
       var previousParams = self._getPreviousParams(null, true);
       if (previousParams) {
         var replacePrevious = (!self.current.dest &&
-                               self.current.hash !== self.previousHash);
+            self.current.hash !== self.previousHash);
         self._pushToHistory(previousParams, false, replacePrevious);
         self._updatePreviousBookmark();
       }
@@ -1548,8 +1547,8 @@ var PDFHistory = {
 
   _isStateObjectDefined: function pdfHistory_isStateObjectDefined(state) {
     return (state && state.uid >= 0 &&
-            state.fingerprint && this.fingerprint === state.fingerprint &&
-            state.target && state.target.hash) ? true : false;
+        state.fingerprint && this.fingerprint === state.fingerprint &&
+        state.target && state.target.hash) ? true : false;
   },
 
   _pushOrReplaceState: function pdfHistory_pushOrReplaceState(stateObj,
@@ -1610,9 +1609,9 @@ var PDFHistory = {
     }
     if (params.dest && !params.hash) {
       params.hash = (this.current.hash && this.current.dest &&
-                     this.current.dest === params.dest) ?
-        this.current.hash :
-        this.linkService.getDestinationHash(params.dest).split('#')[1];
+          this.current.dest === params.dest) ?
+          this.current.hash :
+          this.linkService.getDestinationHash(params.dest).split('#')[1];
     }
     if (params.page) {
       params.page |= 0;
@@ -1657,7 +1656,7 @@ var PDFHistory = {
         this._pushToHistory(params, true);
       }
     } else if (this.current.page && params.page &&
-               this.current.page !== params.page) {
+        this.current.page !== params.page) {
       this._pushToHistory(params, true);
     }
   },
@@ -1717,12 +1716,12 @@ var PDFHistory = {
       var previousParams = this._getPreviousParams();
       if (previousParams) {
         var replacePrevious = (!this.current.dest &&
-                               this.current.hash !== this.previousHash);
+            this.current.hash !== this.previousHash);
         this._pushToHistory(previousParams, false, replacePrevious);
       }
     }
     this._pushOrReplaceState(this._stateObj(params),
-                             (overwrite || this.uid === 0));
+        (overwrite || this.uid === 0));
     this.currentUid = this.uid++;
     this.current = params;
     this.updatePreviousBookmark = true;
@@ -1730,7 +1729,7 @@ var PDFHistory = {
 
   _goTo: function pdfHistory_goTo(state) {
     if (!(this.initialized && this.historyUnlocked &&
-          this._isStateObjectDefined(state))) {
+        this._isStateObjectDefined(state))) {
       return;
     }
     if (!this.reInitialized && state.uid < this.currentUid) {
@@ -1897,7 +1896,7 @@ var SecondaryToolbar = {
       return;
     }
     this.buttonContainer.setAttribute('style',
-      'max-height: ' + (this.newContainerHeight - SCROLLBAR_PADDING) + 'px;');
+        'max-height: ' + (this.newContainerHeight - SCROLLBAR_PADDING) + 'px;');
     this.previousContainerHeight = this.newContainerHeight;
   },
 
@@ -2044,14 +2043,14 @@ var PDFPresentationMode = (function PDFPresentationModeClosure() {
 
       if (Math.abs(this.mouseScrollDelta) >= PAGE_SWITCH_THRESHOLD) {
         var pageSwitchDirection = (this.mouseScrollDelta > 0) ?
-          PageSwitchDirection.UP : PageSwitchDirection.DOWN;
+            PageSwitchDirection.UP : PageSwitchDirection.DOWN;
         var page = PDFViewerApplication.page;
         this._resetMouseScrollState();
 
         // If we're at the first/last page, we don't need to do anything.
         if ((page === 1 && pageSwitchDirection === PageSwitchDirection.UP) ||
             (page === PDFViewerApplication.pagesCount &&
-             pageSwitchDirection === PageSwitchDirection.DOWN)) {
+                pageSwitchDirection === PageSwitchDirection.DOWN)) {
           return;
         }
         PDFViewerApplication.page = (page + pageSwitchDirection);
@@ -2061,9 +2060,9 @@ var PDFPresentationMode = (function PDFPresentationModeClosure() {
 
     get isFullscreen() {
       return !!(document.fullscreenElement ||
-                document.mozFullScreen ||
-                document.webkitIsFullScreen ||
-                document.msFullscreenElement);
+          document.mozFullScreen ||
+          document.webkitIsFullScreen ||
+          document.msFullscreenElement);
     },
 
     /**
@@ -2102,11 +2101,11 @@ var PDFPresentationMode = (function PDFPresentationModeClosure() {
      */
     _resetSwitchInProgress:
         function PDFPresentationMode_resetSwitchInProgress() {
-      if (this.switchInProgress) {
-        clearTimeout(this.switchInProgress);
-        delete this.switchInProgress;
-      }
-    },
+          if (this.switchInProgress) {
+            clearTimeout(this.switchInProgress);
+            delete this.switchInProgress;
+          }
+        },
 
     /**
      * @private
@@ -2178,7 +2177,7 @@ var PDFPresentationMode = (function PDFPresentationModeClosure() {
         // Enable clicking of links in presentation mode. Please note:
         // Only links pointing to destinations in the current PDF document work.
         var isInternalLink = (evt.target.href &&
-                              evt.target.classList.contains('internalLink'));
+            evt.target.classList.contains('internalLink'));
         if (!isInternalLink) {
           // Unless an internal link was clicked, advance one page.
           evt.preventDefault();
@@ -2227,9 +2226,9 @@ var PDFPresentationMode = (function PDFPresentationModeClosure() {
      */
     _resetMouseScrollState:
         function PDFPresentationMode_resetMouseScrollState() {
-      this.mouseScrollTimeStamp = 0;
-      this.mouseScrollDelta = 0;
-    },
+          this.mouseScrollTimeStamp = 0;
+          this.mouseScrollDelta = 0;
+        },
 
     /**
      * @private
@@ -2251,16 +2250,16 @@ var PDFPresentationMode = (function PDFPresentationModeClosure() {
      */
     _removeWindowListeners:
         function PDFPresentationMode_removeWindowListeners() {
-      window.removeEventListener('mousemove', this.showControlsBind);
-      window.removeEventListener('mousedown', this.mouseDownBind);
-      window.removeEventListener('keydown', this.resetMouseScrollStateBind);
-      window.removeEventListener('contextmenu', this.contextMenuBind);
-
-      delete this.showControlsBind;
-      delete this.mouseDownBind;
-      delete this.resetMouseScrollStateBind;
-      delete this.contextMenuBind;
-    },
+          window.removeEventListener('mousemove', this.showControlsBind);
+          window.removeEventListener('mousedown', this.mouseDownBind);
+          window.removeEventListener('keydown', this.resetMouseScrollStateBind);
+          window.removeEventListener('contextmenu', this.contextMenuBind);
+
+          delete this.showControlsBind;
+          delete this.mouseDownBind;
+          delete this.resetMouseScrollStateBind;
+          delete this.contextMenuBind;
+        },
 
     /**
      * @private
@@ -2278,30 +2277,30 @@ var PDFPresentationMode = (function PDFPresentationModeClosure() {
      */
     _addFullscreenChangeListeners:
         function PDFPresentationMode_addFullscreenChangeListeners() {
-      this.fullscreenChangeBind = this._fullscreenChange.bind(this);
+          this.fullscreenChangeBind = this._fullscreenChange.bind(this);
 
-      window.addEventListener('fullscreenchange', this.fullscreenChangeBind);
-      window.addEventListener('mozfullscreenchange', this.fullscreenChangeBind);
-      window.addEventListener('webkitfullscreenchange',
-                              this.fullscreenChangeBind);
-      window.addEventListener('MSFullscreenChange', this.fullscreenChangeBind);
-    },
+          window.addEventListener('fullscreenchange', this.fullscreenChangeBind);
+          window.addEventListener('mozfullscreenchange', this.fullscreenChangeBind);
+          window.addEventListener('webkitfullscreenchange',
+              this.fullscreenChangeBind);
+          window.addEventListener('MSFullscreenChange', this.fullscreenChangeBind);
+        },
 
     /**
      * @private
      */
     _removeFullscreenChangeListeners:
         function PDFPresentationMode_removeFullscreenChangeListeners() {
-      window.removeEventListener('fullscreenchange', this.fullscreenChangeBind);
-      window.removeEventListener('mozfullscreenchange',
-                                 this.fullscreenChangeBind);
-      window.removeEventListener('webkitfullscreenchange',
-                              this.fullscreenChangeBind);
-      window.removeEventListener('MSFullscreenChange',
-                                 this.fullscreenChangeBind);
-
-      delete this.fullscreenChangeBind;
-    }
+          window.removeEventListener('fullscreenchange', this.fullscreenChangeBind);
+          window.removeEventListener('mozfullscreenchange',
+              this.fullscreenChangeBind);
+          window.removeEventListener('webkitfullscreenchange',
+              this.fullscreenChangeBind);
+          window.removeEventListener('MSFullscreenChange',
+              this.fullscreenChangeBind);
+
+          delete this.fullscreenChangeBind;
+        }
   };
 
   return PDFPresentationMode;
@@ -2411,7 +2410,7 @@ var GrabToPan = (function GrabToPanClosure() {
       // Use matchesSelector to check whether the clicked element
       // is (a child of) an input element / link
       return node[matchesSelector](
-        'a[href], a[href] *, input, textarea, button, button *, select, option'
+          'a[href], a[href] *, input, textarea, button, button *, select, option'
       );
     },
 
@@ -2504,7 +2503,7 @@ var GrabToPan = (function GrabToPanClosure() {
   var isChrome15OrOpera15plus = chrome && (chrome.webstore || chrome.app);
   //                                       ^ Chrome 15+       ^ Opera 15+
   var isSafari6plus = /Apple/.test(navigator.vendor) &&
-                      /Version\/([6-9]\d*|[1-5]\d+)/.test(navigator.userAgent);
+      /Version\/([6-9]\d*|[1-5]\d+)/.test(navigator.userAgent);
 
   /**
    * Whether the left mouse is not pressed.
@@ -2541,14 +2540,14 @@ var HandTool = {
         }
         if (isActive) {
           toggleHandTool.title =
-            mozL10n.get('hand_tool_disable.title', null, 'Disable hand tool');
+              mozL10n.get('hand_tool_disable.title', null, 'Disable hand tool');
           toggleHandTool.firstElementChild.textContent =
-            mozL10n.get('hand_tool_disable_label', null, 'Disable hand tool');
+              mozL10n.get('hand_tool_disable_label', null, 'Disable hand tool');
         } else {
           toggleHandTool.title =
-            mozL10n.get('hand_tool_enable.title', null, 'Enable hand tool');
+              mozL10n.get('hand_tool_enable.title', null, 'Enable hand tool');
           toggleHandTool.firstElementChild.textContent =
-            mozL10n.get('hand_tool_enable_label', null, 'Enable hand tool');
+              mozL10n.get('hand_tool_enable_label', null, 'Enable hand tool');
         }
       }
     });
@@ -2625,9 +2624,9 @@ var OverlayManager = {
         throw new Error('The overlay is already registered.');
       }
       this.overlays[name] = { element: element,
-                              container: container,
-                              callerCloseMethod: (callerCloseMethod || null),
-                              canForceClose: (canForceClose || false) };
+        container: container,
+        callerCloseMethod: (callerCloseMethod || null),
+        canForceClose: (canForceClose || false) };
       resolve();
     }.bind(this));
   },
@@ -2743,7 +2742,7 @@ var PasswordPrompt = {
 
     // Attach the event listeners.
     this.passwordSubmit.addEventListener('click',
-      this.verifyPassword.bind(this));
+        this.verifyPassword.bind(this));
 
     this.passwordCancel.addEventListener('click', this.close.bind(this));
 
@@ -2761,11 +2760,11 @@ var PasswordPrompt = {
       this.passwordField.focus();
 
       var promptString = mozL10n.get('password_label', null,
-        'Enter the password to open this PDF file.');
+          'Enter the password to open this PDF file.');
 
       if (this.reason === PDFJS.PasswordResponses.INCORRECT_PASSWORD) {
         promptString = mozL10n.get('password_invalid', null,
-          'Invalid password. Please try again.');
+            'Invalid password. Please try again.');
       }
 
       this.passwordText.textContent = promptString;
@@ -2829,7 +2828,7 @@ var PDFDocumentProperties = (function PDFDocumentPropertiesClosure() {
      */
     open: function PDFDocumentProperties_open() {
       Promise.all([OverlayManager.open(this.overlayName),
-                   this.dataAvailablePromise]).then(function () {
+        this.dataAvailablePromise]).then(function () {
         this._getProperties();
       }.bind(this));
     },
@@ -2865,10 +2864,10 @@ var PDFDocumentProperties = (function PDFDocumentPropertiesClosure() {
      */
     setDocumentAndUrl:
         function PDFDocumentProperties_setDocumentAndUrl(pdfDocument, url) {
-      this.pdfDocument = pdfDocument;
-      this.url = url;
-      this.resolveDataAvailable();
-    },
+          this.pdfDocument = pdfDocument;
+          this.url = url;
+          this.resolveDataAvailable();
+        },
 
     /**
      * @private
@@ -2987,8 +2986,8 @@ var PDFDocumentProperties = (function PDFDocumentPropertiesClosure() {
       var dateString = date.toLocaleDateString();
       var timeString = date.toLocaleTimeString();
       return mozL10n.get('document_properties_date_string',
-                         {date: dateString, time: timeString},
-                         '{{date}}, {{time}}');
+          {date: dateString, time: timeString},
+          '{{date}}, {{time}}');
     }
   };
 
@@ -3048,8 +3047,8 @@ var PDFRenderingQueue = (function PDFRenderingQueueClosure() {
      */
     setThumbnailViewer:
         function PDFRenderingQueue_setThumbnailViewer(pdfThumbnailViewer) {
-      this.pdfThumbnailViewer = pdfThumbnailViewer;
-    },
+          this.pdfThumbnailViewer = pdfThumbnailViewer;
+        },
 
     /**
      * @param {IRenderableView} view
@@ -3119,7 +3118,7 @@ var PDFRenderingQueue = (function PDFRenderingQueueClosure() {
       } else {
         var previousPageIndex = visible.first.id - 2;
         if (views[previousPageIndex] &&
-          !this.isViewFinished(views[previousPageIndex])) {
+            !this.isViewFinished(views[previousPageIndex])) {
           return views[previousPageIndex];
         }
       }
@@ -3242,7 +3241,7 @@ var PDFPageView = (function PDFPageViewClosure() {
       this.pdfPageRotate = pdfPage.rotate;
       var totalRotation = (this.rotation + this.pdfPageRotate) % 360;
       this.viewport = pdfPage.getViewport(this.scale * CSS_UNITS,
-                                          totalRotation);
+          totalRotation);
       this.stats = pdfPage.stats;
       this.reset();
     },
@@ -3269,7 +3268,7 @@ var PDFPageView = (function PDFPageViewClosure() {
       var childNodes = div.childNodes;
       var currentZoomLayer = this.zoomLayer || null;
       var currentAnnotationNode = (keepAnnotations && this.annotationLayer &&
-                                   this.annotationLayer.div) || null;
+          this.annotationLayer.div) || null;
       for (var i = childNodes.length - 1; i >= 0; i--) {
         var node = childNodes[i];
         if (currentZoomLayer === node || currentAnnotationNode === node) {
@@ -3330,7 +3329,7 @@ var PDFPageView = (function PDFPageViewClosure() {
 
       if (this.canvas &&
           (PDFJS.useOnlyCssZoom ||
-            (this.hasRestrictedScaling && isScalingRestricted))) {
+              (this.hasRestrictedScaling && isScalingRestricted))) {
         this.cssTransform(this.canvas, true);
         return;
       } else if (this.canvas && !this.zoomLayer) {
@@ -3358,9 +3357,9 @@ var PDFPageView = (function PDFPageViewClosure() {
       var height = this.viewport.height;
       var div = this.div;
       canvas.style.width = canvas.parentNode.style.width = div.style.width =
-        Math.floor(width) + 'px';
+          Math.floor(width) + 'px';
       canvas.style.height = canvas.parentNode.style.height = div.style.height =
-        Math.floor(height) + 'px';
+          Math.floor(height) + 'px';
       // The canvas may have been originally rotated, rotate relative to that.
       var relativeRotation = this.viewport.rotation - canvas._viewport.rotation;
       var absRotation = Math.abs(relativeRotation);
@@ -3371,7 +3370,7 @@ var PDFPageView = (function PDFPageViewClosure() {
         scaleY = width / height;
       }
       var cssTransform = 'rotate(' + relativeRotation + 'deg) ' +
-        'scale(' + scaleX + ',' + scaleY + ')';
+          'scale(' + scaleX + ',' + scaleY + ')';
       CustomStyle.setProp('transform', canvas, cssTransform);
 
       if (this.textLayer) {
@@ -3381,7 +3380,7 @@ var PDFPageView = (function PDFPageViewClosure() {
         // one orientation then rotating overall.
         var textLayerViewport = this.textLayer.viewport;
         var textRelativeRotation = this.viewport.rotation -
-          textLayerViewport.rotation;
+            textLayerViewport.rotation;
         var textAbsRotation = Math.abs(textRelativeRotation);
         var scale = width / textLayerViewport.width;
         if (textAbsRotation === 90 || textAbsRotation === 270) {
@@ -3508,8 +3507,8 @@ var PDFPageView = (function PDFPageViewClosure() {
         }
 
         textLayer = this.textLayerFactory.createTextLayerBuilder(textLayerDiv,
-                                                                 this.id - 1,
-                                                                 this.viewport);
+            this.id - 1,
+            this.viewport);
       }
       this.textLayer = textLayer;
 
@@ -3602,26 +3601,26 @@ var PDFPageView = (function PDFPageViewClosure() {
       var renderTask = this.renderTask = this.pdfPage.render(renderContext);
 
       this.renderTask.promise.then(
-        function pdfPageRenderCallback() {
-          pageViewDrawCallback(null);
-          if (textLayer) {
-            self.pdfPage.getTextContent().then(
-              function textContentResolved(textContent) {
-                textLayer.setTextContent(textContent);
-                textLayer.render(TEXT_LAYER_RENDER_DELAY);
-              }
-            );
+          function pdfPageRenderCallback() {
+            pageViewDrawCallback(null);
+            if (textLayer) {
+              self.pdfPage.getTextContent().then(
+                  function textContentResolved(textContent) {
+                    textLayer.setTextContent(textContent);
+                    textLayer.render(TEXT_LAYER_RENDER_DELAY);
+                  }
+              );
+            }
+          },
+          function pdfPageRenderError(error) {
+            pageViewDrawCallback(error);
           }
-        },
-        function pdfPageRenderError(error) {
-          pageViewDrawCallback(error);
-        }
       );
 
       if (this.annotationsLayerFactory) {
         if (!this.annotationLayer) {
           this.annotationLayer = this.annotationsLayerFactory.
-            createAnnotationsLayerBuilder(div, this.pdfPage);
+          createAnnotationsLayerBuilder(div, this.pdfPage);
         }
         this.annotationLayer.setupAnnotations(this.viewport);
       }
@@ -3651,7 +3650,7 @@ var PDFPageView = (function PDFPageViewClosure() {
       canvas.style.height = (PRINT_OUTPUT_SCALE * 100) + '%';
 
       var cssScale = 'scale(' + (1 / PRINT_OUTPUT_SCALE) + ', ' +
-                                (1 / PRINT_OUTPUT_SCALE) + ')';
+          (1 / PRINT_OUTPUT_SCALE) + ')';
       CustomStyle.setProp('transform' , canvas, cssScale);
       CustomStyle.setProp('transformOrigin' , canvas, '0% 0%');
 
@@ -3671,7 +3670,7 @@ var PDFPageView = (function PDFPageViewClosure() {
         ctx.restore();
         // Used by the mozCurrentTransform polyfill in src/display/canvas.js.
         ctx._transformMatrix =
-          [PRINT_OUTPUT_SCALE, 0, 0, PRINT_OUTPUT_SCALE, 0, 0];
+            [PRINT_OUTPUT_SCALE, 0, 0, PRINT_OUTPUT_SCALE, 0, 0];
         ctx.scale(PRINT_OUTPUT_SCALE, PRINT_OUTPUT_SCALE);
 
         var renderContext = {
@@ -3906,7 +3905,7 @@ var TextLayerBuilder = (function TextLayerBuilderClosure() {
       var bidiTexts = this.textContent.items;
       var end = bidiTexts.length - 1;
       var queryLen = (this.findController === null ?
-                      0 : this.findController.state.query.length);
+          0 : this.findController.state.query.length);
       var ret = [];
 
       for (var m = 0, len = matches.length; m < len; m++) {
@@ -3961,11 +3960,11 @@ var TextLayerBuilder = (function TextLayerBuilderClosure() {
       var prevEnd = null;
       var pageIdx = this.pageIdx;
       var isSelectedPage = (this.findController === null ?
-        false : (pageIdx === this.findController.selected.pageIdx));
+          false : (pageIdx === this.findController.selected.pageIdx));
       var selectedMatchIdx = (this.findController === null ?
-                              -1 : this.findController.selected.matchIdx);
+          -1 : this.findController.selected.matchIdx);
       var highlightAll = (this.findController === null ?
-                          false : this.findController.state.highlightAll);
+          false : this.findController.state.highlightAll);
       var infinity = {
         divIdx: -1,
         offset: undefined
@@ -4009,7 +4008,7 @@ var TextLayerBuilder = (function TextLayerBuilderClosure() {
 
         if (this.findController) {
           this.findController.updateMatchPosition(pageIdx, i, textDivs,
-                                                  begin.divIdx, end.divIdx);
+              begin.divIdx, end.divIdx);
         }
 
         // Match inside new div.
@@ -4026,10 +4025,10 @@ var TextLayerBuilder = (function TextLayerBuilderClosure() {
 
         if (begin.divIdx === end.divIdx) {
           appendTextToDiv(begin.divIdx, begin.offset, end.offset,
-                          'highlight' + highlightSuffix);
+              'highlight' + highlightSuffix);
         } else {
           appendTextToDiv(begin.divIdx, begin.offset, infinity.offset,
-                          'highlight begin' + highlightSuffix);
+              'highlight begin' + highlightSuffix);
           for (var n0 = begin.divIdx + 1, n1 = end.divIdx; n0 < n1; n0++) {
             textDivs[n0].className = 'highlight middle' + highlightSuffix;
           }
@@ -4074,7 +4073,7 @@ var TextLayerBuilder = (function TextLayerBuilderClosure() {
       // Convert the matches on the page controller into the match format
       // used for the textLayer.
       this.matches = this.convertMatches(this.findController === null ?
-        [] : (this.findController.pageMatches[this.pageIdx] || []));
+          [] : (this.findController.pageMatches[this.pageIdx] || []));
       this.renderMatches(this.matches);
     }
   };
@@ -4133,104 +4132,104 @@ var AnnotationsLayerBuilder = (function AnnotationsLayerBuilderClosure() {
      */
     setupAnnotations:
         function AnnotationsLayerBuilder_setupAnnotations(viewport) {
-      function bindLink(link, dest) {
-        link.href = linkService.getDestinationHash(dest);
-        link.onclick = function annotationsLayerBuilderLinksOnclick() {
-          if (dest) {
-            linkService.navigateTo(dest);
+          function bindLink(link, dest) {
+            link.href = linkService.getDestinationHash(dest);
+            link.onclick = function annotationsLayerBuilderLinksOnclick() {
+              if (dest) {
+                linkService.navigateTo(dest);
+              }
+              return false;
+            };
+            if (dest) {
+              link.className = 'internalLink';
+            }
           }
-          return false;
-        };
-        if (dest) {
-          link.className = 'internalLink';
-        }
-      }
 
-      function bindNamedAction(link, action) {
-        link.href = linkService.getAnchorUrl('');
-        link.onclick = function annotationsLayerBuilderNamedActionOnClick() {
-          linkService.executeNamedAction(action);
-          return false;
-        };
-        link.className = 'internalLink';
-      }
+          function bindNamedAction(link, action) {
+            link.href = linkService.getAnchorUrl('');
+            link.onclick = function annotationsLayerBuilderNamedActionOnClick() {
+              linkService.executeNamedAction(action);
+              return false;
+            };
+            link.className = 'internalLink';
+          }
 
-      var linkService = this.linkService;
-      var pdfPage = this.pdfPage;
-      var self = this;
+          var linkService = this.linkService;
+          var pdfPage = this.pdfPage;
+          var self = this;
+
+          pdfPage.getAnnotations().then(function (annotationsData) {
+            viewport = viewport.clone({ dontFlip: true });
+            var transform = viewport.transform;
+            var transformStr = 'matrix(' + transform.join(',') + ')';
+            var data, element, i, ii;
+
+            if (self.div) {
+              // If an annotationLayer already exists, refresh its children's
+              // transformation matrices
+              for (i = 0, ii = annotationsData.length; i < ii; i++) {
+                data = annotationsData[i];
+                element = self.div.querySelector(
+                    '[data-annotation-id="' + data.id + '"]');
+                if (element) {
+                  CustomStyle.setProp('transform', element, transformStr);
+                }
+              }
+              // See PDFPageView.reset()
+              self.div.removeAttribute('hidden');
+            } else {
+              for (i = 0, ii = annotationsData.length; i < ii; i++) {
+                data = annotationsData[i];
+                if (!data || !data.hasHtml) {
+                  continue;
+                }
 
-      pdfPage.getAnnotations().then(function (annotationsData) {
-        viewport = viewport.clone({ dontFlip: true });
-        var transform = viewport.transform;
-        var transformStr = 'matrix(' + transform.join(',') + ')';
-        var data, element, i, ii;
-
-        if (self.div) {
-          // If an annotationLayer already exists, refresh its children's
-          // transformation matrices
-          for (i = 0, ii = annotationsData.length; i < ii; i++) {
-            data = annotationsData[i];
-            element = self.div.querySelector(
-                '[data-annotation-id="' + data.id + '"]');
-            if (element) {
-              CustomStyle.setProp('transform', element, transformStr);
-            }
-          }
-          // See PDFPageView.reset()
-          self.div.removeAttribute('hidden');
-        } else {
-          for (i = 0, ii = annotationsData.length; i < ii; i++) {
-            data = annotationsData[i];
-            if (!data || !data.hasHtml) {
-              continue;
-            }
+                element = PDFJS.AnnotationUtils.getHtmlElement(data,
+                    pdfPage.commonObjs);
+                element.setAttribute('data-annotation-id', data.id);
+                if (typeof mozL10n !== 'undefined') {
+                  mozL10n.translate(element);
+                }
 
-            element = PDFJS.AnnotationUtils.getHtmlElement(data,
-              pdfPage.commonObjs);
-            element.setAttribute('data-annotation-id', data.id);
-            if (typeof mozL10n !== 'undefined') {
-              mozL10n.translate(element);
-            }
+                var rect = data.rect;
+                var view = pdfPage.view;
+                rect = PDFJS.Util.normalizeRect([
+                  rect[0],
+                  view[3] - rect[1] + view[1],
+                  rect[2],
+                  view[3] - rect[3] + view[1]
+                ]);
+                element.style.left = rect[0] + 'px';
+                element.style.top = rect[1] + 'px';
+                element.style.position = 'absolute';
+
+                CustomStyle.setProp('transform', element, transformStr);
+                var transformOriginStr = -rect[0] + 'px ' + -rect[1] + 'px';
+                CustomStyle.setProp('transformOrigin', element, transformOriginStr);
+
+                if (data.subtype === 'Link' && !data.url) {
+                  var link = element.getElementsByTagName('a')[0];
+                  if (link) {
+                    if (data.action) {
+                      bindNamedAction(link, data.action);
+                    } else {
+                      bindLink(link, ('dest' in data) ? data.dest : null);
+                    }
+                  }
+                }
 
-            var rect = data.rect;
-            var view = pdfPage.view;
-            rect = PDFJS.Util.normalizeRect([
-              rect[0],
-                view[3] - rect[1] + view[1],
-              rect[2],
-                view[3] - rect[3] + view[1]
-            ]);
-            element.style.left = rect[0] + 'px';
-            element.style.top = rect[1] + 'px';
-            element.style.position = 'absolute';
-
-            CustomStyle.setProp('transform', element, transformStr);
-            var transformOriginStr = -rect[0] + 'px ' + -rect[1] + 'px';
-            CustomStyle.setProp('transformOrigin', element, transformOriginStr);
-
-            if (data.subtype === 'Link' && !data.url) {
-              var link = element.getElementsByTagName('a')[0];
-              if (link) {
-                if (data.action) {
-                  bindNamedAction(link, data.action);
-                } else {
-                  bindLink(link, ('dest' in data) ? data.dest : null);
+                if (!self.div) {
+                  var annotationLayerDiv = document.createElement('div');
+                  annotationLayerDiv.className = 'annotationLayer';
+                  self.pageDiv.appendChild(annotationLayerDiv);
+                  self.div = annotationLayerDiv;
                 }
-              }
-            }
 
-            if (!self.div) {
-              var annotationLayerDiv = document.createElement('div');
-              annotationLayerDiv.className = 'annotationLayer';
-              self.pageDiv.appendChild(annotationLayerDiv);
-              self.div = annotationLayerDiv;
+                self.div.appendChild(element);
+              }
             }
-
-            self.div.appendChild(element);
-          }
-        }
-      });
-    },
+          });
+        },
 
     hide: function () {
       if (!this.div) {
@@ -4603,7 +4602,7 @@ var PDFViewer = (function pdfViewer() {
             !(this.isInPresentationMode || this.isChangingPresentationMode)) {
           page = this._location.pageNumber;
           dest = [null, { name: 'XYZ' }, this._location.left,
-                  this._location.top, null];
+            this._location.top, null];
         }
         this.scrollPageIntoView(page, dest);
       }
@@ -4625,13 +4624,13 @@ var PDFViewer = (function pdfViewer() {
           return;
         }
         var hPadding = (this.isInPresentationMode || this.removePageBorders) ?
-          0 : SCROLLBAR_PADDING;
+            0 : SCROLLBAR_PADDING;
         var vPadding = (this.isInPresentationMode || this.removePageBorders) ?
-          0 : VERTICAL_PADDING;
+            0 : VERTICAL_PADDING;
         var pageWidthScale = (this.container.clientWidth - hPadding) /
-                             currentPage.width * currentPage.scale;
+            currentPage.width * currentPage.scale;
         var pageHeightScale = (this.container.clientHeight - vPadding) /
-                              currentPage.height * currentPage.scale;
+            currentPage.height * currentPage.scale;
         switch (value) {
           case 'page-actual':
             scale = 1;
@@ -4650,12 +4649,12 @@ var PDFViewer = (function pdfViewer() {
             // For pages in landscape mode, fit the page height to the viewer
             // *unless* the page would thus become too wide to fit horizontally.
             var horizontalScale = isLandscape ?
-              Math.min(pageHeightScale, pageWidthScale) : pageWidthScale;
+                Math.min(pageHeightScale, pageWidthScale) : pageWidthScale;
             scale = Math.min(MAX_AUTO_SCALE, horizontalScale);
             break;
           default:
             console.error('pdfViewSetScale: \'' + value +
-              '\' is an unknown zoom value.');
+                '\' is an unknown zoom value.');
             return;
         }
         this._setScaleUpdatePages(scale, value, noScroll, true);
@@ -4691,9 +4690,9 @@ var PDFViewer = (function pdfViewer() {
       var width = 0, height = 0, widthScale, heightScale;
       var changeOrientation = (pageView.rotation % 180 === 0 ? false : true);
       var pageWidth = (changeOrientation ? pageView.height : pageView.width) /
-        pageView.scale / CSS_UNITS;
+          pageView.scale / CSS_UNITS;
       var pageHeight = (changeOrientation ? pageView.width : pageView.height) /
-        pageView.scale / CSS_UNITS;
+          pageView.scale / CSS_UNITS;
       var scale = 0;
       switch (dest[1].name) {
         case 'XYZ':
@@ -4733,9 +4732,9 @@ var PDFViewer = (function pdfViewer() {
           var vPadding = this.removePageBorders ? 0 : VERTICAL_PADDING;
 
           widthScale = (viewerContainer.clientWidth - hPadding) /
-            width / CSS_UNITS;
+              width / CSS_UNITS;
           heightScale = (viewerContainer.clientHeight - vPadding) /
-            height / CSS_UNITS;
+              height / CSS_UNITS;
           scale = Math.min(Math.abs(widthScale), Math.abs(heightScale));
           break;
         default:
@@ -4767,8 +4766,8 @@ var PDFViewer = (function pdfViewer() {
       var currentScale = this._currentScale;
       var currentScaleValue = this._currentScaleValue;
       var normalizedScaleValue =
-        parseFloat(currentScaleValue) === currentScale ?
-        Math.round(currentScale * 10000) / 100 : currentScaleValue;
+          parseFloat(currentScaleValue) === currentScale ?
+              Math.round(currentScale * 10000) / 100 : currentScaleValue;
 
       var pageNumber = firstPage.id;
       var pdfOpenParams = '#page=' + pageNumber;
@@ -4776,8 +4775,8 @@ var PDFViewer = (function pdfViewer() {
       var currentPageView = this._pages[pageNumber - 1];
       var container = this.container;
       var topLeft = currentPageView.getPagePoint(
-        (container.scrollLeft - firstPage.x),
-        (container.scrollTop - firstPage.y));
+          (container.scrollLeft - firstPage.x),
+          (container.scrollTop - firstPage.y));
       var intLeft = Math.round(topLeft[0]);
       var intTop = Math.round(topLeft[1]);
       pdfOpenParams += ',' + intLeft + ',' + intTop;
@@ -4858,7 +4857,7 @@ var PDFViewer = (function pdfViewer() {
 
     get isHorizontalScrollbarEnabled() {
       return (this.isInPresentationMode ?
-        false : (this.container.scrollWidth > this.container.clientWidth));
+          false : (this.container.scrollWidth > this.container.clientWidth));
     },
 
     _getVisiblePages: function () {
@@ -4898,10 +4897,10 @@ var PDFViewer = (function pdfViewer() {
       }
       var promise = this.pdfDocument.getPage(pageNumber).then(
           function (pdfPage) {
-        pageView.setPdfPage(pdfPage);
-        this._pagesRequests[pageNumber] = null;
-        return pdfPage;
-      }.bind(this));
+            pageView.setPdfPage(pdfPage);
+            this._pagesRequests[pageNumber] = null;
+            return pdfPage;
+          }.bind(this));
       this._pagesRequests[pageNumber] = promise;
       return promise;
     },
@@ -4909,8 +4908,8 @@ var PDFViewer = (function pdfViewer() {
     forceRendering: function (currentlyVisiblePages) {
       var visiblePages = currentlyVisiblePages || this._getVisiblePages();
       var pageView = this.renderingQueue.getHighestPriority(visiblePages,
-                                                            this._pages,
-                                                            this.scroll.down);
+          this._pages,
+          this.scroll.down);
       if (pageView) {
         this._ensurePdfPageLoaded(pageView).then(function () {
           this.renderingQueue.renderView(pageView);
@@ -5174,28 +5173,28 @@ var PDFThumbnailView = (function PDFThumbnailViewClosure() {
      */
     _getPageDrawContext:
         function PDFThumbnailView_getPageDrawContext(noCtxScale) {
-      var canvas = document.createElement('canvas');
-      canvas.id = this.renderingId;
-
-      canvas.className = 'thumbnailImage';
-      canvas.setAttribute('aria-label', mozL10n.get('thumb_page_canvas',
-        {page: this.id}, 'Thumbnail of Page {{page}}'));
-
-      this.canvas = canvas;
-      this.div.setAttribute('data-loaded', true);
-      this.ring.appendChild(canvas);
-
-      var ctx = canvas.getContext('2d');
-      var outputScale = getOutputScale(ctx);
-      canvas.width = (this.canvasWidth * outputScale.sx) | 0;
-      canvas.height = (this.canvasHeight * outputScale.sy) | 0;
-      canvas.style.width = this.canvasWidth + 'px';
-      canvas.style.height = this.canvasHeight + 'px';
-      if (!noCtxScale && outputScale.scaled) {
-        ctx.scale(outputScale.sx, outputScale.sy);
-      }
-      return ctx;
-    },
+          var canvas = document.createElement('canvas');
+          canvas.id = this.renderingId;
+
+          canvas.className = 'thumbnailImage';
+          canvas.setAttribute('aria-label', mozL10n.get('thumb_page_canvas',
+              {page: this.id}, 'Thumbnail of Page {{page}}'));
+
+          this.canvas = canvas;
+          this.div.setAttribute('data-loaded', true);
+          this.ring.appendChild(canvas);
+
+          var ctx = canvas.getContext('2d');
+          var outputScale = getOutputScale(ctx);
+          canvas.width = (this.canvasWidth * outputScale.sx) | 0;
+          canvas.height = (this.canvasHeight * outputScale.sy) | 0;
+          canvas.style.width = this.canvasWidth + 'px';
+          canvas.style.height = this.canvasHeight + 'px';
+          if (!noCtxScale && outputScale.scaled) {
+            ctx.scale(outputScale.sx, outputScale.sy);
+          }
+          return ctx;
+        },
 
     draw: function PDFThumbnailView_draw() {
       if (this.renderingState !== RenderingStates.INITIAL) {
@@ -5256,12 +5255,12 @@ var PDFThumbnailView = (function PDFThumbnailViewClosure() {
       var renderTask = this.renderTask = this.pdfPage.render(renderContext);
 
       renderTask.promise.then(
-        function pdfPageRenderCallback() {
-          thumbnailDrawCallback(null);
-        },
-        function pdfPageRenderError(error) {
-          thumbnailDrawCallback(error);
-        }
+          function pdfPageRenderCallback() {
+            thumbnailDrawCallback(null);
+          },
+          function pdfPageRenderError(error) {
+            thumbnailDrawCallback(error);
+          }
       );
       return promise;
     },
@@ -5282,7 +5281,7 @@ var PDFThumbnailView = (function PDFThumbnailViewClosure() {
 
       if (img.width <= 2 * canvas.width) {
         ctx.drawImage(img, 0, 0, img.width, img.height,
-                      0, 0, canvas.width, canvas.height);
+            0, 0, canvas.width, canvas.height);
         return;
       }
       // drawImage does an awful job of rescaling the image, doing it gradually.
@@ -5297,16 +5296,16 @@ var PDFThumbnailView = (function PDFThumbnailViewClosure() {
         reducedHeight >>= 1;
       }
       reducedImageCtx.drawImage(img, 0, 0, img.width, img.height,
-                                0, 0, reducedWidth, reducedHeight);
+          0, 0, reducedWidth, reducedHeight);
       while (reducedWidth > 2 * canvas.width) {
         reducedImageCtx.drawImage(reducedImage,
-                                  0, 0, reducedWidth, reducedHeight,
-                                  0, 0, reducedWidth >> 1, reducedHeight >> 1);
+            0, 0, reducedWidth, reducedHeight,
+            0, 0, reducedWidth >> 1, reducedHeight >> 1);
         reducedWidth >>= 1;
         reducedHeight >>= 1;
       }
       ctx.drawImage(reducedImage, 0, 0, reducedWidth, reducedHeight,
-                    0, 0, canvas.width, canvas.height);
+          0, 0, canvas.width, canvas.height);
     }
   };
 
@@ -5364,27 +5363,27 @@ var PDFThumbnailViewer = (function PDFThumbnailViewerClosure() {
 
     scrollThumbnailIntoView:
         function PDFThumbnailViewer_scrollThumbnailIntoView(page) {
-      var selected = document.querySelector('.thumbnail.selected');
-      if (selected) {
-        selected.classList.remove('selected');
-      }
-      var thumbnail = document.getElementById('thumbnailContainer' + page);
-      if (thumbnail) {
-        thumbnail.classList.add('selected');
-      }
-      var visibleThumbs = this._getVisibleThumbs();
-      var numVisibleThumbs = visibleThumbs.views.length;
-
-      // If the thumbnail isn't currently visible, scroll it into view.
-      if (numVisibleThumbs > 0) {
-        var first = visibleThumbs.first.id;
-        // Account for only one thumbnail being visible.
-        var last = (numVisibleThumbs > 1 ? visibleThumbs.last.id : first);
-        if (page <= first || page >= last) {
-          scrollIntoView(thumbnail, { top: THUMBNAIL_SCROLL_MARGIN });
-        }
-      }
-    },
+          var selected = document.querySelector('.thumbnail.selected');
+          if (selected) {
+            selected.classList.remove('selected');
+          }
+          var thumbnail = document.getElementById('thumbnailContainer' + page);
+          if (thumbnail) {
+            thumbnail.classList.add('selected');
+          }
+          var visibleThumbs = this._getVisibleThumbs();
+          var numVisibleThumbs = visibleThumbs.views.length;
+
+          // If the thumbnail isn't currently visible, scroll it into view.
+          if (numVisibleThumbs > 0) {
+            var first = visibleThumbs.first.id;
+            // Account for only one thumbnail being visible.
+            var last = (numVisibleThumbs > 1 ? visibleThumbs.last.id : first);
+            if (page <= first || page >= last) {
+              scrollIntoView(thumbnail, { top: THUMBNAIL_SCROLL_MARGIN });
+            }
+          }
+        },
 
     get pagesRotation() {
       return this._pagesRotation;
@@ -5456,35 +5455,35 @@ var PDFThumbnailViewer = (function PDFThumbnailViewerClosure() {
      */
     _ensurePdfPageLoaded:
         function PDFThumbnailViewer_ensurePdfPageLoaded(thumbView) {
-      if (thumbView.pdfPage) {
-        return Promise.resolve(thumbView.pdfPage);
-      }
-      var pageNumber = thumbView.id;
-      if (this._pagesRequests[pageNumber]) {
-        return this._pagesRequests[pageNumber];
-      }
-      var promise = this.pdfDocument.getPage(pageNumber).then(
-        function (pdfPage) {
-          thumbView.setPdfPage(pdfPage);
-          this._pagesRequests[pageNumber] = null;
-          return pdfPage;
-        }.bind(this));
-      this._pagesRequests[pageNumber] = promise;
-      return promise;
-    },
+          if (thumbView.pdfPage) {
+            return Promise.resolve(thumbView.pdfPage);
+          }
+          var pageNumber = thumbView.id;
+          if (this._pagesRequests[pageNumber]) {
+            return this._pagesRequests[pageNumber];
+          }
+          var promise = this.pdfDocument.getPage(pageNumber).then(
+              function (pdfPage) {
+                thumbView.setPdfPage(pdfPage);
+                this._pagesRequests[pageNumber] = null;
+                return pdfPage;
+              }.bind(this));
+          this._pagesRequests[pageNumber] = promise;
+          return promise;
+        },
 
     ensureThumbnailVisible:
         function PDFThumbnailViewer_ensureThumbnailVisible(page) {
-      // Ensure that the thumbnail of the current page is visible
-      // when switching from another view.
-      scrollIntoView(document.getElementById('thumbnailContainer' + page));
-    },
+          // Ensure that the thumbnail of the current page is visible
+          // when switching from another view.
+          scrollIntoView(document.getElementById('thumbnailContainer' + page));
+        },
 
     forceRendering: function () {
       var visibleThumbs = this._getVisibleThumbs();
       var thumbView = this.renderingQueue.getHighestPriority(visibleThumbs,
-                                                             this.thumbnails,
-                                                             this.scroll.down);
+          this.thumbnails,
+          this.scroll.down);
       if (thumbView) {
         this._ensurePdfPageLoaded(thumbView).then(function () {
           this.renderingQueue.renderView(thumbView);
@@ -5685,7 +5684,7 @@ var PDFViewerApplication = {
   initialized: false,
   fellback: false,
   pdfDocument: null,
-  sidebarOpen: true,
+  sidebarOpen: false,
   printing: false,
   /** @type {PDFViewer} */
   pdfViewer: null,
@@ -5783,7 +5782,7 @@ var PDFViewerApplication = {
       toolbar: document.getElementById('secondaryToolbar'),
       toggleButton: document.getElementById('secondaryToolbarToggle'),
       presentationModeButton:
-        document.getElementById('secondaryPresentationMode'),
+          document.getElementById('secondaryPresentationMode'),
       openFile: document.getElementById('secondaryOpenFile'),
       print: document.getElementById('secondaryPrint'),
       download: document.getElementById('secondaryDownload'),
@@ -5917,7 +5916,7 @@ var PDFViewerApplication = {
   get supportsFullscreen() {
     var doc = document.documentElement;
     var support = !!(doc.requestFullscreen || doc.mozRequestFullScreen ||
-                     doc.webkitRequestFullScreen || doc.msRequestFullscreen);
+        doc.webkitRequestFullScreen || doc.msRequestFullscreen);
 
     if (document.fullscreenEnabled === false ||
         document.mozFullScreenEnabled === false ||
@@ -6004,7 +6003,7 @@ var PDFViewerApplication = {
     }
     this.close();
 
-    var parameters = {password: password};
+    var parameters = {password: password,rangeChunkSize:65536*160};
     if (typeof file === 'string') { // URL
       this.setTitleUsingUrl(file);
       parameters.url = file;
@@ -6035,35 +6034,35 @@ var PDFViewerApplication = {
     }
 
     PDFJS.getDocument(parameters, pdfDataRangeTransport, passwordNeeded,
-                      getDocumentProgress).then(
-      function getDocumentCallback(pdfDocument) {
-        self.load(pdfDocument, scale);
-        self.loading = false;
-      },
-      function getDocumentError(exception) {
-        var message = exception && exception.message;
-        var loadingErrorMessage = mozL10n.get('loading_error', null,
-          'An error occurred while loading the PDF.');
-
-        if (exception instanceof PDFJS.InvalidPDFException) {
-          // change error message also for other builds
-          loadingErrorMessage = mozL10n.get('invalid_file_error', null,
-                                            'Invalid or corrupted PDF file.');
-        } else if (exception instanceof PDFJS.MissingPDFException) {
-          // special message for missing PDF's
-          loadingErrorMessage = mozL10n.get('missing_file_error', null,
-                                            'Missing PDF file.');
-        } else if (exception instanceof PDFJS.UnexpectedResponseException) {
-          loadingErrorMessage = mozL10n.get('unexpected_response_error', null,
-                                            'Unexpected server response.');
-        }
+        getDocumentProgress).then(
+        function getDocumentCallback(pdfDocument) {
+          self.load(pdfDocument, scale);
+          self.loading = false;
+        },
+        function getDocumentError(exception) {
+          var message = exception && exception.message;
+          var loadingErrorMessage = mozL10n.get('loading_error', null,
+              'An error occurred while loading the PDF.');
+
+          if (exception instanceof PDFJS.InvalidPDFException) {
+            // change error message also for other builds
+            loadingErrorMessage = mozL10n.get('invalid_file_error', null,
+                'Invalid or corrupted PDF file.');
+          } else if (exception instanceof PDFJS.MissingPDFException) {
+            // special message for missing PDF's
+            loadingErrorMessage = mozL10n.get('missing_file_error', null,
+                'Missing PDF file.');
+          } else if (exception instanceof PDFJS.UnexpectedResponseException) {
+            loadingErrorMessage = mozL10n.get('unexpected_response_error', null,
+                'Unexpected server response.');
+          }
 
-        var moreInfo = {
-          message: message
-        };
-        self.error(loadingErrorMessage, moreInfo);
-        self.loading = false;
-      }
+          var moreInfo = {
+            message: message
+          };
+          self.error(loadingErrorMessage, moreInfo);
+          self.loading = false;
+        }
     );
 
     if (args && args.length) {
@@ -6096,11 +6095,11 @@ var PDFViewerApplication = {
     }
 
     this.pdfDocument.getData().then(
-      function getDataSuccess(data) {
-        var blob = PDFJS.createBlob(data, 'application/pdf');
-        downloadManager.download(blob, url, filename);
-      },
-      downloadByUrl // Error occurred try downloading with just the url.
+        function getDataSuccess(data) {
+          var blob = PDFJS.createBlob(data, 'application/pdf');
+          downloadManager.download(blob, url, filename);
+        },
+        downloadByUrl // Error occurred try downloading with just the url.
     ).then(null, downloadByUrl);
   },
 
@@ -6115,8 +6114,8 @@ var PDFViewerApplication = {
       self.pendingRefStr = null;
       // dest array looks like that: <page-ref> </XYZ|FitXXX> <args..>
       var pageNumber = destRef instanceof Object ?
-        self.pagesRefMap[destRef.num + ' ' + destRef.gen + ' R'] :
-        (destRef + 1);
+          self.pagesRefMap[destRef.num + ' ' + destRef.gen + ' R'] :
+          (destRef + 1);
       if (pageNumber) {
         if (pageNumber > self.pagesCount) {
           pageNumber = self.pagesCount;
@@ -6199,8 +6198,8 @@ var PDFViewerApplication = {
     if (dest instanceof Array) {
       var destRef = dest[0]; // see navigateTo method for dest format
       var pageNumber = destRef instanceof Object ?
-        this.pagesRefMap[destRef.num + ' ' + destRef.gen + ' R'] :
-        (destRef + 1);
+          this.pagesRefMap[destRef.num + ' ' + destRef.gen + ' R'] :
+          (destRef + 1);
       if (pageNumber) {
         var pdfOpenParams = this.getAnchorUrl('#page=' + pageNumber);
         var destKind = dest[1];
@@ -6240,26 +6239,26 @@ var PDFViewerApplication = {
    */
   error: function pdfViewError(message, moreInfo) {
     var moreInfoText = mozL10n.get('error_version_info',
-      {version: PDFJS.version || '?', build: PDFJS.build || '?'},
-      'PDF.js v{{version}} (build: {{build}})') + '\n';
+        {version: PDFJS.version || '?', build: PDFJS.build || '?'},
+        'PDF.js v{{version}} (build: {{build}})') + '\n';
     if (moreInfo) {
       moreInfoText +=
-        mozL10n.get('error_message', {message: moreInfo.message},
-        'Message: {{message}}');
+          mozL10n.get('error_message', {message: moreInfo.message},
+              'Message: {{message}}');
       if (moreInfo.stack) {
         moreInfoText += '\n' +
-          mozL10n.get('error_stack', {stack: moreInfo.stack},
-          'Stack: {{stack}}');
+            mozL10n.get('error_stack', {stack: moreInfo.stack},
+                'Stack: {{stack}}');
       } else {
         if (moreInfo.filename) {
           moreInfoText += '\n' +
-            mozL10n.get('error_file', {file: moreInfo.filename},
-            'File: {{file}}');
+              mozL10n.get('error_file', {file: moreInfo.filename},
+                  'File: {{file}}');
         }
         if (moreInfo.lineNumber) {
           moreInfoText += '\n' +
-            mozL10n.get('error_line', {line: moreInfo.lineNumber},
-            'Line: {{line}}');
+              mozL10n.get('error_line', {line: moreInfo.lineNumber},
+                  'Line: {{line}}');
         }
       }
     }
@@ -6343,7 +6342,7 @@ var PDFViewerApplication = {
 
     var pagesCount = pdfDocument.numPages;
     document.getElementById('numPages').textContent =
-      mozL10n.get('page_of', {pageCount: pagesCount}, 'of {{pageCount}}');
+        mozL10n.get('page_of', {pageCount: pagesCount}, 'of {{pageCount}}');
     document.getElementById('pageNumber').max = pagesCount;
 
     var id = this.documentFingerprint = pdfDocument.fingerprint;
@@ -6386,17 +6385,16 @@ var PDFViewerApplication = {
             store.get('exists', false)) {
           var pageNum = store.get('page', '1');
           var zoom = self.preferenceDefaultZoomValue ||
-                     store.get('zoom', self.pdfViewer.currentScale);
+              store.get('zoom', self.pdfViewer.currentScale);
           var left = store.get('scrollLeft', '0');
           var top = store.get('scrollTop', '0');
 
           storedHash = 'page=' + pageNum + '&zoom=' + zoom + ',' +
-                       left + ',' + top;
+              left + ',' + top;
         } else if (self.preferenceDefaultZoomValue) {
           storedHash = 'page=1&zoom=' + self.preferenceDefaultZoomValue;
         }
         self.setInitialView(storedHash, scale);
-
         // Make all navigation keys work on document load,
         // unless the viewer is embedded in a web page.
         if (!self.isViewerEmbedded) {
@@ -6482,7 +6480,7 @@ var PDFViewerApplication = {
       self.documentInfo = info;
       self.metadata = metadata;
 
-      
+
 
       var pdfTitle;
       if (metadata && metadata.has('dc:title')) {
@@ -6515,9 +6513,13 @@ var PDFViewerApplication = {
     // When opening a new file (when one is already loaded in the viewer):
     // Reset 'currentPageNumber', since otherwise the page's scale will be wrong
     // if 'currentPageNumber' is larger than the number of pages in the file.
+    //获取url中的page,跳转页数
+    var page = getQueryVariable("page");
+    if(!page){
+      page = 1;
+    }
     document.getElementById('pageNumber').value =
-      this.pdfViewer.currentPageNumber = 1;
-
+        this.pdfViewer.currentPageNumber = page;
     if (PDFHistory.initialDestination) {
       this.navigateTo(PDFHistory.initialDestination);
       PDFHistory.initialDestination = null;
@@ -6582,28 +6584,28 @@ var PDFViewerApplication = {
           // If the zoomArg is a number, it has to get divided by 100. If it's
           // a string, it should stay as it is.
           dest = [null, { name: 'XYZ' },
-                  zoomArgs.length > 1 ? (zoomArgs[1] | 0) : null,
-                  zoomArgs.length > 2 ? (zoomArgs[2] | 0) : null,
-                  (zoomArgNumber ? zoomArgNumber / 100 : zoomArg)];
+            zoomArgs.length > 1 ? (zoomArgs[1] | 0) : null,
+            zoomArgs.length > 2 ? (zoomArgs[2] | 0) : null,
+            (zoomArgNumber ? zoomArgNumber / 100 : zoomArg)];
         } else {
           if (zoomArg === 'Fit' || zoomArg === 'FitB') {
             dest = [null, { name: zoomArg }];
           } else if ((zoomArg === 'FitH' || zoomArg === 'FitBH') ||
-                     (zoomArg === 'FitV' || zoomArg === 'FitBV')) {
+              (zoomArg === 'FitV' || zoomArg === 'FitBV')) {
             dest = [null, { name: zoomArg },
-                    zoomArgs.length > 1 ? (zoomArgs[1] | 0) : null];
+              zoomArgs.length > 1 ? (zoomArgs[1] | 0) : null];
           } else if (zoomArg === 'FitR') {
             if (zoomArgs.length !== 5) {
               console.error('pdfViewSetHash: ' +
-                            'Not enough parameters for \'FitR\'.');
+                  'Not enough parameters for \'FitR\'.');
             } else {
               dest = [null, { name: zoomArg },
-                      (zoomArgs[1] | 0), (zoomArgs[2] | 0),
-                      (zoomArgs[3] | 0), (zoomArgs[4] | 0)];
+                (zoomArgs[1] | 0), (zoomArgs[2] | 0),
+                (zoomArgs[3] | 0), (zoomArgs[4] | 0)];
             }
           } else {
             console.error('pdfViewSetHash: \'' + zoomArg +
-                          '\' is not a valid zoom value.');
+                '\' is not a valid zoom value.');
           }
         }
       }
@@ -6616,7 +6618,7 @@ var PDFViewerApplication = {
         if (params.pagemode === 'thumbs' || params.pagemode === 'bookmarks' ||
             params.pagemode === 'attachments') {
           this.switchSidebarView((params.pagemode === 'bookmarks' ?
-                                  'outline' : params.pagemode), true);
+              'outline' : params.pagemode), true);
         } else if (params.pagemode === 'none' && this.sidebarOpen) {
           document.getElementById('sidebarToggle').click();
         }
@@ -6767,15 +6769,15 @@ var PDFViewerApplication = {
     this.pageStyleSheet = document.createElement('style');
     var pageSize = this.pdfViewer.getPageView(0).pdfPage.getViewport(1);
     this.pageStyleSheet.textContent =
-      // "size:<width> <height>" is what we need. But also add "A4" because
-      // Firefox incorrectly reports support for the other value.
-      '@supports ((size:A4) and (size:1pt 1pt)) {' +
-      '@page { size: ' + pageSize.width + 'pt ' + pageSize.height + 'pt;}' +
-      // The canvas and each ancestor node must have a height of 100% to make
-      // sure that each canvas is printed on exactly one page.
-      '#printContainer {height:100%}' +
-      '#printContainer > div {width:100% !important;height:100% !important;}' +
-      '}';
+        // "size:<width> <height>" is what we need. But also add "A4" because
+        // Firefox incorrectly reports support for the other value.
+        '@supports ((size:A4) and (size:1pt 1pt)) {' +
+        '@page { size: ' + pageSize.width + 'pt ' + pageSize.height + 'pt;}' +
+        // The canvas and each ancestor node must have a height of 100% to make
+        // sure that each canvas is printed on exactly one page.
+        '#printContainer {height:100%}' +
+        '#printContainer > div {width:100% !important;height:100% !important;}' +
+        '}';
     body.appendChild(this.pageStyleSheet);
 
     for (i = 0, ii = this.pagesCount; i < ii; ++i) {
@@ -6857,10 +6859,6 @@ function webViewerInitialized() {
   var queryString = document.location.search.substring(1);
   var params = PDFViewerApplication.parseQueryString(queryString);
   var file = 'file' in params ? params.file : DEFAULT_URL;
-  var filePath='fileUrl' in params?params.fileUrl:'';
-  if(filePath!=''){
-    file=file+"&fileUrl="+filePath;
-  }
 
   var fileInput = document.createElement('input');
   fileInput.id = 'fileInput';
@@ -6912,7 +6910,7 @@ function webViewerInitialized() {
     }
     if ('ignorecurrentpositiononzoom' in hashParams) {
       IGNORE_CURRENT_POSITION_ON_ZOOM =
-        (hashParams['ignorecurrentpositiononzoom'] === 'true');
+          (hashParams['ignorecurrentpositiononzoom'] === 'true');
     }
     if ('locale' in hashParams) {
       locale = hashParams['locale'];
@@ -6947,9 +6945,9 @@ function webViewerInitialized() {
   }
 
   if (!PDFViewerApplication.supportsFullscreen) {
-    document.getElementById('presentationMode').classList.add('hidden');
+    //document.getElementById('presentationMode').classList.add('hidden');
     document.getElementById('secondaryPresentationMode').
-      classList.add('hidden');
+    classList.add('hidden');
   }
 
   if (PDFViewerApplication.supportsIntegratedFind) {
@@ -6958,7 +6956,7 @@ function webViewerInitialized() {
 
   // Listen for unsupported features to trigger the fallback UI.
   PDFJS.UnsupportedManager.listen(
-    PDFViewerApplication.fallback.bind(PDFViewerApplication));
+      PDFViewerApplication.fallback.bind(PDFViewerApplication));
 
   // Suppress context menus for some controls
   document.getElementById('scaleSelect').oncontextmenu = noContextMenuHandler;
@@ -6975,52 +6973,52 @@ function webViewerInitialized() {
   }, true);
 
   document.getElementById('sidebarToggle').addEventListener('click',
-    function() {
-      this.classList.toggle('toggled');
-      outerContainer.classList.add('sidebarMoving');
-      outerContainer.classList.toggle('sidebarOpen');
-      PDFViewerApplication.sidebarOpen =
-        outerContainer.classList.contains('sidebarOpen');
-      if (PDFViewerApplication.sidebarOpen) {
-        PDFViewerApplication.refreshThumbnailViewer();
-      }
-      PDFViewerApplication.forceRendering();
-    });
+      function() {
+        this.classList.toggle('toggled');
+        outerContainer.classList.add('sidebarMoving');
+        outerContainer.classList.toggle('sidebarOpen');
+        PDFViewerApplication.sidebarOpen =
+            outerContainer.classList.contains('sidebarOpen');
+        if (PDFViewerApplication.sidebarOpen) {
+          PDFViewerApplication.refreshThumbnailViewer();
+        }
+        PDFViewerApplication.forceRendering();
+      });
 
   document.getElementById('viewThumbnail').addEventListener('click',
-    function() {
-      PDFViewerApplication.switchSidebarView('thumbs');
-    });
+      function() {
+        PDFViewerApplication.switchSidebarView('thumbs');
+      });
 
   document.getElementById('viewOutline').addEventListener('click',
-    function() {
-      PDFViewerApplication.switchSidebarView('outline');
-    });
+      function() {
+        PDFViewerApplication.switchSidebarView('outline');
+      });
 
   document.getElementById('viewAttachments').addEventListener('click',
-    function() {
-      PDFViewerApplication.switchSidebarView('attachments');
-    });
+      function() {
+        PDFViewerApplication.switchSidebarView('attachments');
+      });
 
   document.getElementById('previous').addEventListener('click',
-    function() {
-      PDFViewerApplication.page--;
-    });
+      function() {
+        PDFViewerApplication.page--;
+      });
 
   document.getElementById('next').addEventListener('click',
-    function() {
-      PDFViewerApplication.page++;
-    });
+      function() {
+        PDFViewerApplication.page++;
+      });
 
   document.getElementById('zoomIn').addEventListener('click',
-    function() {
-      PDFViewerApplication.zoomIn();
-    });
+      function() {
+        PDFViewerApplication.zoomIn();
+      });
 
   document.getElementById('zoomOut').addEventListener('click',
-    function() {
-      PDFViewerApplication.zoomOut();
-    });
+      function() {
+        PDFViewerApplication.zoomOut();
+      });
 
   document.getElementById('pageNumber').addEventListener('click', function() {
     this.select();
@@ -7036,21 +7034,21 @@ function webViewerInitialized() {
   });
 
   document.getElementById('scaleSelect').addEventListener('change',
-    function() {
-      PDFViewerApplication.setScale(this.value, false);
-    });
+      function() {
+        PDFViewerApplication.setScale(this.value, false);
+      });
 
   document.getElementById('presentationMode').addEventListener('click',
     SecondaryToolbar.presentationModeClick.bind(SecondaryToolbar));
 
   /**document.getElementById('openFile').addEventListener('click',
-    SecondaryToolbar.openFileClick.bind(SecondaryToolbar));*/
+   SecondaryToolbar.openFileClick.bind(SecondaryToolbar));*/
 
-  document.getElementById('print').addEventListener('click',
+  /*document.getElementById('print').addEventListener('click',
     SecondaryToolbar.printClick.bind(SecondaryToolbar));
 
   document.getElementById('download').addEventListener('click',
-    SecondaryToolbar.downloadClick.bind(SecondaryToolbar));
+    SecondaryToolbar.downloadClick.bind(SecondaryToolbar));*/
 
 
   if (file && file.lastIndexOf('file:', 0) === 0) {
@@ -7068,7 +7066,7 @@ function webViewerInitialized() {
       xhr.send();
     } catch (e) {
       PDFViewerApplication.error(mozL10n.get('loading_error', null,
-        'An error occurred while loading the PDF.'), e);
+          'An error occurred while loading the PDF.'), e);
     }
     return;
   }
@@ -7087,7 +7085,7 @@ document.addEventListener('pagerendered', function (e) {
 
   if (PDFViewerApplication.sidebarOpen) {
     var thumbnailView = PDFViewerApplication.pdfThumbnailViewer.
-                        getThumbnail(pageIndex);
+    getThumbnail(pageIndex);
     thumbnailView.setImage(pageView);
   }
 
@@ -7097,7 +7095,7 @@ document.addEventListener('pagerendered', function (e) {
 
   if (pageView.error) {
     PDFViewerApplication.error(mozL10n.get('rendering_error', null,
-      'An error occurred while rendering the page.'), pageView.error);
+        'An error occurred while rendering the page.'), pageView.error);
   }
 
   // If the page is still visible when it has finished rendering,
@@ -7119,8 +7117,8 @@ window.addEventListener('presentationmodechanged', function (e) {
   var active = e.detail.active;
   var switchInProgress = e.detail.switchInProgress;
   PDFViewerApplication.pdfViewer.presentationModeState =
-    switchInProgress ? PresentationModeState.CHANGING :
-    active ? PresentationModeState.FULLSCREEN : PresentationModeState.NORMAL;
+      switchInProgress ? PresentationModeState.CHANGING :
+          active ? PresentationModeState.FULLSCREEN : PresentationModeState.NORMAL;
 });
 
 function updateViewarea() {
@@ -7148,7 +7146,7 @@ window.addEventListener('updateviewarea', function (evt) {
     });
   });
   var href = PDFViewerApplication.getAnchorUrl(location.pdfOpenParams);
-  document.getElementById('viewBookmark').href = href;
+  //document.getElementById('viewBookmark').href = href;
   document.getElementById('secondaryViewBookmark').href = href;
 
   // Update the current bookmark in the browsing history.
@@ -7157,7 +7155,7 @@ window.addEventListener('updateviewarea', function (evt) {
   // Show/hide the loading indicator in the page number input element.
   var pageNumberInput = document.getElementById('pageNumber');
   var currentPage =
-    PDFViewerApplication.pdfViewer.getPageView(PDFViewerApplication.page - 1);
+      PDFViewerApplication.pdfViewer.getPageView(PDFViewerApplication.page - 1);
 
   if (currentPage.renderingState === RenderingStates.FINISHED) {
     pageNumberInput.classList.remove(PAGE_NUMBER_LOADING_INDICATOR);
@@ -7169,9 +7167,9 @@ window.addEventListener('updateviewarea', function (evt) {
 window.addEventListener('resize', function webViewerResize(evt) {
   if (PDFViewerApplication.initialized &&
       (document.getElementById('pageAutoOption').selected ||
-       /* Note: the scale is constant for |pageActualOption|. */
-       document.getElementById('pageFitOption').selected ||
-       document.getElementById('pageWidthOption').selected)) {
+          /* Note: the scale is constant for |pageActualOption|. */
+          document.getElementById('pageFitOption').selected ||
+          document.getElementById('pageWidthOption').selected)) {
     var selectedScale = document.getElementById('scaleSelect').value;
     PDFViewerApplication.setScale(selectedScale, false);
   }
@@ -7213,7 +7211,7 @@ window.addEventListener('change', function webViewerChange(evt) {
   // URL does not reflect proper document location - hiding some icons.
   document.getElementById('viewBookmark').setAttribute('hidden', 'true');
   document.getElementById('secondaryViewBookmark').
-    setAttribute('hidden', 'true');
+  setAttribute('hidden', 'true');
   document.getElementById('download').setAttribute('hidden', 'true');
   document.getElementById('secondaryDownload').setAttribute('hidden', 'true');
 }, true);
@@ -7249,9 +7247,9 @@ window.addEventListener('localized', function localized(evt) {
       select.setAttribute('style', 'min-width: inherit;');
       var width = select.clientWidth + SCALE_SELECT_CONTAINER_PADDING;
       select.setAttribute('style', 'min-width: ' +
-                                   (width + SCALE_SELECT_PADDING) + 'px;');
+          (width + SCALE_SELECT_PADDING) + 'px;');
       container.setAttribute('style', 'min-width: ' + width + 'px; ' +
-                                      'max-width: ' + width + 'px;');
+          'max-width: ' + width + 'px;');
     }
 
     // Set the 'max-height' CSS property of the secondary toolbar.
@@ -7268,9 +7266,9 @@ window.addEventListener('scalechange', function scalechange(evt) {
 
   if (!PDFViewerApplication.updateScaleControls &&
       (document.getElementById('pageAutoOption').selected ||
-       document.getElementById('pageActualOption').selected ||
-       document.getElementById('pageFitOption').selected ||
-       document.getElementById('pageWidthOption').selected)) {
+          document.getElementById('pageActualOption').selected ||
+          document.getElementById('pageFitOption').selected ||
+          document.getElementById('pageWidthOption').selected)) {
     updateViewarea();
     return;
   }
@@ -7285,7 +7283,7 @@ window.addEventListener('scalechange', function scalechange(evt) {
   if (!predefinedValueFound) {
     var customScale = Math.round(evt.scale * 10000) / 100;
     customScaleOption.textContent =
-      mozL10n.get('page_scale_percent', { scale: customScale }, '{{scale}}%');
+        mozL10n.get('page_scale_percent', { scale: customScale }, '{{scale}}%');
     customScaleOption.selected = true;
   }
   updateViewarea();
@@ -7329,13 +7327,13 @@ window.addEventListener('pagechange', function pagechange(evt) {
 function handleMouseWheel(evt) {
   var MOUSE_WHEEL_DELTA_FACTOR = 40;
   var ticks = (evt.type === 'DOMMouseScroll') ? -evt.detail :
-              evt.wheelDelta / MOUSE_WHEEL_DELTA_FACTOR;
+      evt.wheelDelta / MOUSE_WHEEL_DELTA_FACTOR;
   var direction = (ticks < 0) ? 'zoomOut' : 'zoomIn';
 
   if (PDFViewerApplication.pdfViewer.isInPresentationMode) {
     evt.preventDefault();
     PDFViewerApplication.scrollPresentationMode(ticks *
-                                                MOUSE_WHEEL_DELTA_FACTOR);
+        MOUSE_WHEEL_DELTA_FACTOR);
   } else if (evt.ctrlKey || evt.metaKey) {
     // Only zoom the pages, not the entire viewer.
     evt.preventDefault();
@@ -7360,9 +7358,9 @@ window.addEventListener('keydown', function keydown(evt) {
 
   var handled = false;
   var cmd = (evt.ctrlKey ? 1 : 0) |
-            (evt.altKey ? 2 : 0) |
-            (evt.shiftKey ? 4 : 0) |
-            (evt.metaKey ? 8 : 0);
+      (evt.altKey ? 2 : 0) |
+      (evt.shiftKey ? 4 : 0) |
+      (evt.metaKey ? 8 : 0);
 
   var pdfViewer = PDFViewerApplication.pdfViewer;
   var isViewerInPresentationMode = pdfViewer && pdfViewer.isInPresentationMode;
@@ -7381,7 +7379,7 @@ window.addEventListener('keydown', function keydown(evt) {
       case 71: // g
         if (!PDFViewerApplication.supportsIntegratedFind) {
           PDFViewerApplication.findBar.dispatchEvent('again',
-                                                     cmd === 5 || cmd === 12);
+              cmd === 5 || cmd === 12);
           handled = true;
         }
         break;
@@ -7417,14 +7415,14 @@ window.addEventListener('keydown', function keydown(evt) {
   }
 
   // CTRL or META without shift
-  if (cmd === 1 || cmd === 8) {
-    switch (evt.keyCode) {
-      case 83: // s
-        PDFViewerApplication.download();
-        handled = true;
-        break;
-    }
-  }
+  /* if (cmd === 1 || cmd === 8) {
+     switch (evt.keyCode) {
+       case 83: // s
+         PDFViewerApplication.download();
+         handled = true;
+         break;
+     }
+   }*/
 
   // CTRL+ALT or Option+Command
   if (cmd === 3 || cmd === 10) {
@@ -7606,8 +7604,17 @@ window.addEventListener('afterprint', function afterPrint(evt) {
   // Waiting for first animation.
   PDFViewerApplication.animationStartedPromise = new Promise(
       function (resolve) {
-    window.requestAnimationFrame(resolve);
-  });
+        window.requestAnimationFrame(resolve);
+      });
 })();
+function getQueryVariable(variable){
+  var query = window.location.search.substring(1);
+  var vars = query.split("&");
+  for (var i=0;i<vars.length;i++) {
+    var pair = vars[i].split("=");
+    if(pair[0] == variable){return pair[1];}
+  }
+  return(false);
+}