浏览代码

HUE-4056 [home] Click on trash icons errors

Enrico Berti 9 年之前
父节点
当前提交
4c67407
共有 1 个文件被更改,包括 9 次插入14 次删除
  1. 9 14
      desktop/core/src/desktop/static/desktop/js/fileBrowser/hueFileEntry.js

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

@@ -366,26 +366,21 @@
   };
 
   HueFileEntry.prototype.open = function (entry, e) {
-    var isLeftButton = (e.which || e.button) === 1;
-    var hasModifierKey = e.ctrlKey || e.shiftKey || e.metaKey;
     var self = this;
-    if (isLeftButton && !hasModifierKey) {
-      e.stopPropagation();
-      e.preventDefault();
-      if (self.definition().type === 'directory') {
-        self.makeActive();
-        huePubSub.publish('file.browser.directory.opened');
-        if (! self.loaded()) {
-          self.load();
-        }
-      } else {
-        window.location.href = self.definition().absoluteUrl;
+    if (self.definition().type === 'directory') {
+      self.makeActive();
+      huePubSub.publish('file.browser.directory.opened');
+      if (!self.loaded()) {
+        self.load();
       }
     }
     else {
-      if (self.definition().type !== 'directory') {
+      if (e && ((e.which || e.button) !== 1 || (e.ctrlKey || e.shiftKey || e.metaKey))) {
         window.open(self.definition().absoluteUrl);
       }
+      else {
+        window.location.href = self.definition().absoluteUrl;
+      }
     }
   };