Index: chrome/browser/resources/file_manager/js/file_manager.js |
diff --git a/chrome/browser/resources/file_manager/js/file_manager.js b/chrome/browser/resources/file_manager/js/file_manager.js |
index f31f11eecb88b9a0c4e2881fbdb22e52f40abde4..c5791771abc8fd256aad617b03750f2c4cad9786 100644 |
--- a/chrome/browser/resources/file_manager/js/file_manager.js |
+++ b/chrome/browser/resources/file_manager/js/file_manager.js |
@@ -632,7 +632,6 @@ FileManager.prototype = { |
this.previewThumbnails_ = |
this.dialogDom_.querySelector('.preview-thumbnails'); |
this.previewPanel_ = this.dialogDom_.querySelector('.preview-panel'); |
- this.previewFilename_ = this.dialogDom_.querySelector('.preview-filename'); |
this.previewSummary_ = this.dialogDom_.querySelector('.preview-summary'); |
this.filenameInput_ = this.dialogDom_.querySelector('.filename-input'); |
this.taskItems_ = this.dialogDom_.querySelector('.tasks'); |
@@ -683,6 +682,11 @@ FileManager.prototype = { |
this.okButton_.addEventListener('click', this.onOk_.bind(this)); |
this.cancelButton_.addEventListener('click', this.onCancel_.bind(this)); |
+ this.deleteButton_.addEventListener('click', |
+ this.onDeleteButtonClick_.bind(this)); |
+ this.deleteButton_.addEventListener('keypress', |
+ this.onDeleteButtonKeyPress_.bind(this)); |
+ |
this.dialogDom_.querySelector('div.open-sidebar').addEventListener( |
'click', this.onToggleSidebar_.bind(this)); |
this.dialogDom_.querySelector('div.open-sidebar').addEventListener( |
@@ -721,12 +725,9 @@ FileManager.prototype = { |
this.dialogDom_.ownerDocument.defaultView.addEventListener( |
'resize', this.onResize_.bind(this)); |
- var ary = this.dialogDom_.querySelectorAll('[visibleif]'); |
- for (var i = 0; i < ary.length; i++) { |
- var expr = ary[i].getAttribute('visibleif'); |
- if (!eval(expr)) |
- ary[i].style.display = 'none'; |
- } |
+ this.dialogDom_.setAttribute('type', this.dialogType_); |
dgozman
2012/04/12 11:18:14
I believe, we have a method initDialogType.
Vladislav Kaznacheev
2012/04/12 12:47:32
Done.
|
+ if (str('ASH') == '1') |
+ this.dialogDom_.setAttribute('ash', true); |
dgozman
2012/04/12 11:18:14
true -> 'true' ?
Vladislav Kaznacheev
2012/04/12 12:47:32
Done.
|
this.filePopup_ = null; |
@@ -3303,6 +3304,19 @@ FileManager.prototype = { |
this.directoryModel_.deleteEntries(entries, opt_callback); |
}; |
+ FileManager.prototype.onDeleteButtonClick_ = function() { |
+ this.deleteEntries(this.selection.entries); |
+ }, |
+ |
+ FileManager.prototype.onDeleteButtonKeyPress_ = function(event) { |
+ switch (util.getKeyModifiers(event) + event.keyCode) { |
+ case '13': // Enter |
+ case '32': // Space |
+ this.deleteEntries(this.selection.entries); |
dgozman
2012/04/12 11:18:14
also event.preventDefault and event.stopPropagatio
Vladislav Kaznacheev
2012/04/12 12:47:32
Done.
|
+ break; |
+ } |
+ }, |
+ |
FileManager.prototype.blinkSelection = function() { |
if (!this.selection || this.selection.totalCount == 0) |
return; |