Commit 7b6143bd authored by mtomasz@chromium.org's avatar mtomasz@chromium.org

Revert partially "cros: Use AlertDialog for remora device requisition."

This reverts the webui change from the commit 9cc0da7d (https://codereview.chromium.org/61523002/).
The reverted webui change breaks alert dialogs in the Files app by making them not closable by pressing the Escape key.

TEST=Tested manually in Files app.
BUG=330835, 331739

Review URL: https://codereview.chromium.org/129973002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244064 0039d316-1c4b-4281-b951-d872f2087c98
parent 649a577e
...@@ -91,9 +91,7 @@ cr.define('cr.ui.dialogs', function() { ...@@ -91,9 +91,7 @@ cr.define('cr.ui.dialogs', function() {
BaseDialog.prototype.onContainerKeyDown_ = function(event) { BaseDialog.prototype.onContainerKeyDown_ = function(event) {
// Handle Escape. // Handle Escape.
if (event.keyCode == 27 && if (event.keyCode == 27 && !this.cancelButton_.disabled) {
!this.cancelButton_.disabled &&
!this.cancelButton_.hidden) {
this.onCancelClick_(event); this.onCancelClick_(event);
event.stopPropagation(); event.stopPropagation();
// Prevent the event from being handled by the container of the dialog. // Prevent the event from being handled by the container of the dialog.
...@@ -244,8 +242,7 @@ cr.define('cr.ui.dialogs', function() { ...@@ -244,8 +242,7 @@ cr.define('cr.ui.dialogs', function() {
*/ */
function AlertDialog(parentNode) { function AlertDialog(parentNode) {
BaseDialog.apply(this, [parentNode]); BaseDialog.apply(this, [parentNode]);
this.cancelButton_.hidden = true; this.cancelButton_.style.display = 'none';
this.closeButton_.hidden = true;
} }
AlertDialog.prototype = {__proto__: BaseDialog.prototype}; AlertDialog.prototype = {__proto__: BaseDialog.prototype};
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment