summaryrefslogtreecommitdiffstats
path: root/ui/webui
diff options
context:
space:
mode:
authormtomasz@chromium.org <mtomasz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-10 03:06:57 +0000
committermtomasz@chromium.org <mtomasz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-10 03:06:57 +0000
commit7b6143bd7915e6638d25c94b1d29efdbd7935913 (patch)
treede7640afb27ce093105bac18b89c007fbd79877a /ui/webui
parent649a577eac4cdb80b5615f4705982c8697fd8ab3 (diff)
downloadchromium_src-7b6143bd7915e6638d25c94b1d29efdbd7935913.zip
chromium_src-7b6143bd7915e6638d25c94b1d29efdbd7935913.tar.gz
chromium_src-7b6143bd7915e6638d25c94b1d29efdbd7935913.tar.bz2
Revert partially "cros: Use AlertDialog for remora device requisition."
This reverts the webui change from the commit 9cc0da7de2e00c403bb2672762009148e1846078 (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
Diffstat (limited to 'ui/webui')
-rw-r--r--ui/webui/resources/js/cr/ui/dialogs.js7
1 files changed, 2 insertions, 5 deletions
diff --git a/ui/webui/resources/js/cr/ui/dialogs.js b/ui/webui/resources/js/cr/ui/dialogs.js
index 780b9ba..3a3456f 100644
--- a/ui/webui/resources/js/cr/ui/dialogs.js
+++ b/ui/webui/resources/js/cr/ui/dialogs.js
@@ -91,9 +91,7 @@ cr.define('cr.ui.dialogs', function() {
BaseDialog.prototype.onContainerKeyDown_ = function(event) {
// Handle Escape.
- if (event.keyCode == 27 &&
- !this.cancelButton_.disabled &&
- !this.cancelButton_.hidden) {
+ if (event.keyCode == 27 && !this.cancelButton_.disabled) {
this.onCancelClick_(event);
event.stopPropagation();
// Prevent the event from being handled by the container of the dialog.
@@ -244,8 +242,7 @@ cr.define('cr.ui.dialogs', function() {
*/
function AlertDialog(parentNode) {
BaseDialog.apply(this, [parentNode]);
- this.cancelButton_.hidden = true;
- this.closeButton_.hidden = true;
+ this.cancelButton_.style.display = 'none';
}
AlertDialog.prototype = {__proto__: BaseDialog.prototype};