From 6f48c4d399d4e7adbe14e7855d883bd28b549d4c Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <bruederli@kolabsys.com>
Date: Fri, 7 Mar 2014 11:47:39 +0100
Subject: [PATCH] Minimize modifications to the original viewer files from
 pdf.js

---
 plugins/pdfviewer/pdfjs-viewer.diff | 50 +++--------------------------
 plugins/pdfviewer/viewer/viewer.js  | 16 ++++-----
 2 files changed, 12 insertions(+), 54 deletions(-)

diff --git a/plugins/pdfviewer/pdfjs-viewer.diff b/plugins/pdfviewer/pdfjs-viewer.diff
index 8da1baa9..30687703 100644
--- a/plugins/pdfviewer/pdfjs-viewer.diff
+++ b/plugins/pdfviewer/pdfjs-viewer.diff
@@ -1,5 +1,5 @@
---- viewer/viewer.html.orig	2014-01-20 16:22:49.000000000 +0100
-+++ viewer/viewer.html	2014-01-20 16:38:37.000000000 +0100
+--- viewer/viewer.html.orig	2014-03-07 11:40:58.000000000 +0100
++++ viewer/viewer.html	2014-03-07 11:44:02.000000000 +0100
 @@ -31,12 +31,12 @@
  <!-- This snippet is used in production, see Makefile -->
  <link rel="resource" type="application/l10n" href="locale/locale.properties"/>
@@ -61,8 +61,8 @@
                    <span data-l10n-id="bookmark_label">Current View</span>
                  </a>
  
---- viewer/viewer.js.orig	2014-01-20 16:22:49.000000000 +0100
-+++ viewer/viewer.js	2014-01-20 16:32:24.000000000 +0100
+--- viewer/viewer.js.orig	2014-03-07 11:40:40.000000000 +0100
++++ viewer/viewer.js	2014-03-07 11:32:44.000000000 +0100
 @@ -23,7 +23,7 @@
  
  'use strict';
@@ -81,45 +81,3 @@
  
  var mozL10n = document.mozL10n || document.webL10n;
  
-@@ -1581,9 +1581,9 @@
-       // (except for toggleHandTool, hand_tool.js is responsible for it):
-       { element: this.presentationModeButton,
-         handler: this.presentationModeClick },
--      { element: this.openFile, handler: this.openFileClick },
-+      //{ element: this.openFile, handler: this.openFileClick },
-       { element: this.print, handler: this.printClick },
--      { element: this.download, handler: this.downloadClick },
-+      //{ element: this.download, handler: this.downloadClick },
-       { element: this.firstPage, handler: this.firstPageClick },
-       { element: this.lastPage, handler: this.lastPageClick },
-       { element: this.pageRotateCw, handler: this.pageRotateCwClick },
-@@ -4806,8 +4806,8 @@
-   document.body.appendChild(fileInput);
- 
-   if (!window.File || !window.FileReader || !window.FileList || !window.Blob) {
--    document.getElementById('openFile').setAttribute('hidden', 'true');
--    document.getElementById('secondaryOpenFile').setAttribute('hidden', 'true');
-+    //document.getElementById('openFile').setAttribute('hidden', 'true');
-+    //document.getElementById('secondaryOpenFile').setAttribute('hidden', 'true');
-   } else {
-     document.getElementById('fileInput').value = null;
-   }
-@@ -4970,14 +4970,14 @@
-   document.getElementById('presentationMode').addEventListener('click',
-     SecondaryToolbar.presentationModeClick.bind(SecondaryToolbar));
- 
--  document.getElementById('openFile').addEventListener('click',
--    SecondaryToolbar.openFileClick.bind(SecondaryToolbar));
-+//  document.getElementById('openFile').addEventListener('click',
-+//    SecondaryToolbar.openFileClick.bind(SecondaryToolbar));
- 
-   document.getElementById('print').addEventListener('click',
-     SecondaryToolbar.printClick.bind(SecondaryToolbar));
- 
--  document.getElementById('download').addEventListener('click',
--    SecondaryToolbar.downloadClick.bind(SecondaryToolbar));
-+//  document.getElementById('download').addEventListener('click',
-+//    SecondaryToolbar.downloadClick.bind(SecondaryToolbar));
- 
- 
-   PDFView.open(file, 0);
diff --git a/plugins/pdfviewer/viewer/viewer.js b/plugins/pdfviewer/viewer/viewer.js
index f7803378..cb58dd18 100644
--- a/plugins/pdfviewer/viewer/viewer.js
+++ b/plugins/pdfviewer/viewer/viewer.js
@@ -1581,9 +1581,9 @@ var SecondaryToolbar = {
       // (except for toggleHandTool, hand_tool.js is responsible for it):
       { element: this.presentationModeButton,
         handler: this.presentationModeClick },
-      //{ element: this.openFile, handler: this.openFileClick },
+      { element: this.openFile, handler: this.openFileClick },
       { element: this.print, handler: this.printClick },
-      //{ element: this.download, handler: this.downloadClick },
+      { element: this.download, handler: this.downloadClick },
       { element: this.firstPage, handler: this.firstPageClick },
       { element: this.lastPage, handler: this.lastPageClick },
       { element: this.pageRotateCw, handler: this.pageRotateCwClick },
@@ -4806,8 +4806,8 @@ document.addEventListener('DOMContentLoaded', function webViewerLoad(evt) {
   document.body.appendChild(fileInput);
 
   if (!window.File || !window.FileReader || !window.FileList || !window.Blob) {
-    //document.getElementById('openFile').setAttribute('hidden', 'true');
-    //document.getElementById('secondaryOpenFile').setAttribute('hidden', 'true');
+    document.getElementById('openFile').setAttribute('hidden', 'true');
+    document.getElementById('secondaryOpenFile').setAttribute('hidden', 'true');
   } else {
     document.getElementById('fileInput').value = null;
   }
@@ -4970,14 +4970,14 @@ document.addEventListener('DOMContentLoaded', function webViewerLoad(evt) {
   document.getElementById('presentationMode').addEventListener('click',
     SecondaryToolbar.presentationModeClick.bind(SecondaryToolbar));
 
-//  document.getElementById('openFile').addEventListener('click',
-//    SecondaryToolbar.openFileClick.bind(SecondaryToolbar));
+  document.getElementById('openFile').addEventListener('click',
+    SecondaryToolbar.openFileClick.bind(SecondaryToolbar));
 
   document.getElementById('print').addEventListener('click',
     SecondaryToolbar.printClick.bind(SecondaryToolbar));
 
-//  document.getElementById('download').addEventListener('click',
-//    SecondaryToolbar.downloadClick.bind(SecondaryToolbar));
+  document.getElementById('download').addEventListener('click',
+    SecondaryToolbar.downloadClick.bind(SecondaryToolbar));
 
 
   PDFView.open(file, 0);