Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3486 from Rob--W/csp-unsafe-inline

Browse Source 
Remove all inline JavaScript from viewer.html to comply with CSP unsafe-inline and correct error textarea's height
This commit is contained in:
Yury Delendik 2013-07-18 06:08:39 -07:00
commit 984b9bf78b
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
web/viewer.html
View File

@ -230,15 +230,15 @@ limitations under the License.
<div id="errorWrapper" hidden='true'> <div id="errorWrapper" hidden='true'>
<div id="errorMessageLeft"> <div id="errorMessageLeft">
<span id="errorMessage"></span> <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 More Information
</button> </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 Less Information
</button> </button>
</div> </div>
<div id="errorMessageRight"> <div id="errorMessageRight">
<button id="errorClose" oncontextmenu="return false;" data-l10n-id="error_close"> <button id="errorClose" data-l10n-id="error_close">
Close Close
</button> </button>
</div> </div>

8
web/viewer.js
View File

@ -1104,17 +1104,21 @@ var PDFView = {
errorMoreInfo.removeAttribute('hidden'); errorMoreInfo.removeAttribute('hidden');
moreInfoButton.setAttribute('hidden', 'true'); moreInfoButton.setAttribute('hidden', 'true');
lessInfoButton.removeAttribute('hidden'); lessInfoButton.removeAttribute('hidden');
errorMoreInfo.style.height = errorMoreInfo.scrollHeight + 'px';
}; };
lessInfoButton.onclick = function() { lessInfoButton.onclick = function() {
errorMoreInfo.setAttribute('hidden', 'true'); errorMoreInfo.setAttribute('hidden', 'true');
moreInfoButton.removeAttribute('hidden'); moreInfoButton.removeAttribute('hidden');
lessInfoButton.setAttribute('hidden', 'true'); lessInfoButton.setAttribute('hidden', 'true');
}; };
moreInfoButton.oncontextmenu =
lessInfoButton.oncontextmenu =
closeButton.oncontextmenu = function(e) {
e.preventDefault();
};
moreInfoButton.removeAttribute('hidden'); moreInfoButton.removeAttribute('hidden');
lessInfoButton.setAttribute('hidden', 'true'); lessInfoButton.setAttribute('hidden', 'true');
errorMoreInfo.value = moreInfoText; errorMoreInfo.value = moreInfoText;
errorMoreInfo.rows = moreInfoText.split('\n').length - 1;
//#else //#else
// console.error(message + '\n' + moreInfoText); // console.error(message + '\n' + moreInfoText);
// this.fallback(); // this.fallback();