Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(199)

Unified Diff: chrome/browser/resources/print_preview.js

Issue 7108054: Revert 88611 - Print Preview: Changing displayed error message when PDF Viewer is missing. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/resources/print_preview.html ('k') | chrome/browser/ui/webui/print_preview_data_source.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/print_preview.js
===================================================================
--- chrome/browser/resources/print_preview.js (revision 88612)
+++ chrome/browser/resources/print_preview.js (working copy)
@@ -42,9 +42,7 @@
$('cancel-button').addEventListener('click', handleCancelButtonClick);
if (!checkCompatiblePluginExists()) {
- displayErrorMessageWithButton(localStrings.getString('noPlugin'),
- localStrings.getString('launchNativeDialog'),
- showSystemDialog);
+ displayErrorMessage(localStrings.getString('noPlugin'), false);
$('mainview').parentElement.removeChild($('dummy-viewer'));
return;
}
@@ -143,10 +141,10 @@
* @param {string} initiatorTabURL The URL of the initiator tab.
*/
function onInitiatorTabClosed(initiatorTabURL) {
- displayErrorMessageWithButton(
- localStrings.getString('initiatorTabClosed'),
- localStrings.getString('reopenPage'),
- function() { window.location = initiatorTabURL; });
+ $('reopen-page').addEventListener('click', function() {
+ window.location = initiatorTabURL;
+ });
+ displayErrorMessage(localStrings.getString('initiatorTabClosed'), true);
}
/**
@@ -439,12 +437,19 @@
/**
* Display an error message in the center of the preview area.
* @param {string} errorMessage The error message to be displayed.
+ * @param {boolean} showButton Indivates whether the "Reopen the page" button
+ * should be displayed.
*/
-function displayErrorMessage(errorMessage) {
+function displayErrorMessage(errorMessage, showButton) {
$('overlay-layer').classList.remove('invisible');
$('dancing-dots-text').classList.add('hidden');
$('error-text').innerHTML = errorMessage;
$('error-text').classList.remove('hidden');
+ if (showButton)
+ $('reopen-page').classList.remove('hidden');
+ else
+ $('reopen-page').classList.add('hidden');
+
removeEventListeners();
var pdfViewer = $('pdf-viewer');
if (pdfViewer)
@@ -452,28 +457,11 @@
}
/**
- * Display an error message in the center of the preview area followed by a
- * button.
- * @param {string} errorMessage The error message to be displayed.
- * @param {string} buttonText The text to be displayed within the button.
- * @param {string} buttonListener The listener to be executed when the button is
- * clicked.
- */
-function displayErrorMessageWithButton(
- errorMessage, buttonText, buttonListener) {
- var errorButton = $('error-button');
- errorButton.innerHTML = buttonText;
- errorButton.onclick = buttonListener;
- errorButton.classList.remove('hidden');
- displayErrorMessage(errorMessage);
-}
-
-/**
* Display an error message when print preview fails.
* Called from PrintPreviewMessageHandler::OnPrintPreviewFailed().
*/
function printPreviewFailed() {
- displayErrorMessage(localStrings.getString('previewFailed'));
+ displayErrorMessage(localStrings.getString('previewFailed'), false);
}
/**
« no previous file with comments | « chrome/browser/resources/print_preview.html ('k') | chrome/browser/ui/webui/print_preview_data_source.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698