Browse Source

[home2] Require selection for delete

Johan Ahlen 9 năm trước cách đây
mục cha
commit
9ff1df9

+ 2 - 14
desktop/core/src/desktop/static/desktop/js/fileBrowser/hueFileEntry.js

@@ -192,24 +192,12 @@
     }
   };
 
-  HueFileEntry.prototype.topMenuDelete = function () {
+  HueFileEntry.prototype.showDeleteConfirmation = function () {
     var self = this;
     if (self.selectedEntries().length > 0 ) {
       self.entriesToDelete(self.selectedEntries());
-    } else {
-      self.entriesToDelete([ self ]);
-    }
-    $('#deleteEntriesModal').modal('show');
-  };
-
-  HueFileEntry.prototype.contextMenuDelete = function () {
-    var self = this;
-    if (self.selected()) {
-      self.parent.entriesToDelete(self.parent.selectedEntries());
-    } else {
-      self.parent.entriesToDelete([self]);
+      $('#deleteEntriesModal').modal('show');
     }
-    $('#deleteEntriesModal').modal('show');
   };
 
   HueFileEntry.prototype.performDelete = function () {

+ 2 - 2
desktop/core/src/desktop/templates/file_browser.mako

@@ -423,7 +423,7 @@ from desktop.views import _ko
           </span>
           <!-- /ko -->
           <a class="inactive-action fb-action" href="javascript:void(0);" data-bind="click: function () { $('#createDirectoryModal').modal('show'); }"><span class="fa-stack fa-fw" style="width: 1.28571429em;"><i class="fa fa-folder-o fa-stack-1x" ></i><i class="fa fa-plus-circle fa-stack-1x" style="font-size: 14px; margin-left: 7px; margin-top: 3px;"></i></span></a>
-          <a class="inactive-action fb-action" href="javascript:void(0);" data-bind="click: topMenuDelete, css: { 'disabled': selectedEntries().length === 0 }"><i class="fa fa-fw fa-times"></i></a>
+          <a class="inactive-action fb-action" href="javascript:void(0);" data-bind="click: showDeleteConfirmation, css: { 'disabled': selectedEntries().length === 0 }"><i class="fa fa-fw fa-times"></i></a>
           <!-- ko if: app === 'documents' -->
           <a class="inactive-action fb-action" href="javascript:void(0);" data-bind="click: showSharingModal, css: { 'disabled': selectedEntries().length !== 1 }"><i class="fa fa-fw fa-users"></i></a>
           <!-- /ko -->
@@ -463,7 +463,7 @@ from desktop.views import _ko
             <div style="width: 100%; height: 100%" data-bind="contextMenu: '.hue-context-menu'">
               <ul class="hue-context-menu">
                 <li><a href="javascript:void(0);" data-bind="click: contextMenuDownload"><i class="fa fa-download"></i> ${ _('Download') }</a></li>
-                <li><a href="javascript:void(0);" data-bind="click: contextMenuDelete"><i class="fa fa-fw fa-times"></i> ${ _('Delete') }</a></li>
+                <li><a href="javascript:void(0);" data-bind="click: function() { $parent.showDeleteConfirmation(); }"><i class="fa fa-fw fa-times"></i> ${ _('Delete') }</a></li>
               </ul>
               <div class="fb-primary-col">
                 <i class="fa fa-fw" data-bind="css: { 'fa-folder-o' : isDirectory, 'fa-file-o': ! isDirectory }"></i>