From d5e16ab85c63768f1b8116a2c72921f68d433c4a Mon Sep 17 00:00:00 2001
From: Rob Wu <gwnRob@gmail.com>
Date: Thu, 18 Jul 2013 00:40:15 +0200
Subject: [PATCH] Viewer: Remove inline events; set height on error

Move inline event handlers to viewer.js to comply with a
Content-Security-Policy where directive "unsafe-inline" is not set.

Change textarea.rows = <number of newlines> to
textarea.style.height = textarea.scrollHeight.
(The former is extremely unreliable; consider long lines...)
---
 web/viewer.html | 6 +++---
 web/viewer.js   | 8 ++++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/web/viewer.html b/web/viewer.html
index 704b1a909..6c46bd1fd 100644
--- a/web/viewer.html
+++ b/web/viewer.html
@@ -230,15 +230,15 @@ limitations under the License.
         <div id="errorWrapper" hidden='true'>
           <div id="errorMessageLeft">
             <span id="errorMessage"></span>
-            <button id="errorShowMore" onclick="" oncontextmenu="return false;" data-l10n-id="error_more_info">
+            <button id="errorShowMore" data-l10n-id="error_more_info">
               More Information
             </button>
-            <button id="errorShowLess" onclick="" oncontextmenu="return false;" data-l10n-id="error_less_info" hidden='true'>
+            <button id="errorShowLess" data-l10n-id="error_less_info" hidden='true'>
               Less Information
             </button>
           </div>
           <div id="errorMessageRight">
-            <button id="errorClose" oncontextmenu="return false;" data-l10n-id="error_close">
+            <button id="errorClose" data-l10n-id="error_close">
               Close
             </button>
           </div>
diff --git a/web/viewer.js b/web/viewer.js
index a3ea12b93..9060320b4 100644
--- a/web/viewer.js
+++ b/web/viewer.js
@@ -1075,17 +1075,21 @@ var PDFView = {
       errorMoreInfo.removeAttribute('hidden');
       moreInfoButton.setAttribute('hidden', 'true');
       lessInfoButton.removeAttribute('hidden');
+      errorMoreInfo.style.height = errorMoreInfo.scrollHeight + 'px';
     };
     lessInfoButton.onclick = function() {
       errorMoreInfo.setAttribute('hidden', 'true');
       moreInfoButton.removeAttribute('hidden');
       lessInfoButton.setAttribute('hidden', 'true');
     };
+    moreInfoButton.oncontextmenu =
+    lessInfoButton.oncontextmenu =
+    closeButton.oncontextmenu = function(e) {
+      e.preventDefault();
+    };
     moreInfoButton.removeAttribute('hidden');
     lessInfoButton.setAttribute('hidden', 'true');
     errorMoreInfo.value = moreInfoText;
-
-    errorMoreInfo.rows = moreInfoText.split('\n').length - 1;
 //#else
 //  console.error(message + '\n' + moreInfoText);
 //  this.fallback();