[ui:tree] fix #1617 other volumes cmds doesn't work when it disabled …

…in cwd
Studio-42 · Aug 24, 2016 · f4611b9 · f4611b9
1 parent bb04b84
commit f4611b9
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 27 deletions.
diff --git a/js/commands/archive.js b/js/commands/archive.js
@@ -54,7 +54,7 @@ elFinder.prototype.commands.archive = function() {
 			error && fm.error(error);
 		});
 
-		if (!(this.enabled() && cnt && mimes.length && $.inArray(mime, mimes) !== -1)) {
+		if (! (cnt && mimes.length && $.inArray(mime, mimes) !== -1)) {
 			return dfrd.reject();
 		}
 

diff --git a/js/commands/duplicate.js b/js/commands/duplicate.js
@@ -26,7 +26,7 @@ elFinder.prototype.commands.duplicate = function() {
 				}), 
 			args = [];
 
-		if (!cnt || this.getstate(hashes) === -1) {
+		if (! cnt) {
 			return dfrd.reject();
 		}
 

diff --git a/js/commands/getfile.js b/js/commands/getfile.js
@@ -69,10 +69,6 @@
 			req = [], 
 			i, file, dim;
 
-		if (this.getstate(hashes) == -1) {
-			return dfrd.reject();
-		}
-
 		for (i = 0; i < cnt; i++) {
 			file = files[i];
 			if (file.mime == 'directory' && !opts.folders) {

diff --git a/js/commands/rename.js b/js/commands/rename.js
@@ -210,7 +210,7 @@ elFinder.prototype.commands.rename = function() {
 			node.empty().append(input.val(file.name));
 		}
 
-		if (cnt > 1 || this.getstate([file.hash]) < 0) {
+		if (cnt > 1) {
 			return dfrd.reject();
 		}
 

diff --git a/js/commands/rm.js b/js/commands/rm.js
@@ -31,7 +31,7 @@ elFinder.prototype.commands.rm = function() {
 			tpl    = '<div class="ui-helper-clearfix elfinder-rm-title"><span class="elfinder-cwd-icon {class} ui-corner-all"/>{title}<div class="elfinder-rm-desc">{desc}</div></div>',
 			targets, text, f, fname, size, tmb, descs, dialog;
 
-		if (!cnt || this._disabled) {
+		if (! cnt) {
 			return dfrd.reject();
 		}
 

diff --git a/js/commands/upload.js b/js/commands/upload.js
@@ -137,10 +137,6 @@ elFinder.prototype.commands.upload = function() {
 			dfrd = $.Deferred(),
 			dialog, input, button, dropbox, pastebox, dropUpload, paste, dirs, spinner;
 
-		if (this.getstate(check) < 0) {
-			return dfrd.reject();
-		}
-
 		dropUpload = function(e) {
 			e.stopPropagation();
 			e.preventDefault();

diff --git a/js/ui/contextmenu.js b/js/ui/contextmenu.js
@@ -142,23 +142,25 @@ $.fn.elfindercontextmenu = function(fm) {
 			},
 
 			close = function() {
-				menu.removeAttr('style').hide().empty().removeData('submenuKeep');
-				try {
-					if (! menu.draggable('instance')) {
-						menu.draggable(dragOpt);
+				if (menu.is(':visible') || menu.children().length) {
+					menu.removeAttr('style').hide().empty().removeData('submenuKeep');
+					try {
+						if (! menu.draggable('instance')) {
+							menu.draggable(dragOpt);
+						}
+					} catch(e) {
+						if (! menu.hasClass('ui-draggable')) {
+							menu.draggable(dragOpt);
+						}
 					}
-				} catch(e) {
-					if (! menu.hasClass('ui-draggable')) {
-						menu.draggable(dragOpt);
+					if (menu.data('prevNode')) {
+						menu.data('prevNode').after(menu);
+						menu.removeData('prevNode');
+					}
+					fm.trigger('closecontextmenu');
+					if (fm.UA.iOS) {
+						$('div.elfinder div.overflow-scrolling-touch').css('-webkit-overflow-scrolling', 'touch');
 					}
-				}
-				if (menu.data('prevNode')) {
-					menu.data('prevNode').after(menu);
-					menu.removeData('prevNode');
-				}
-				fm.trigger('closecontextmenu');
-				if (fm.UA.iOS) {
-					$('div.elfinder div.overflow-scrolling-touch').css('-webkit-overflow-scrolling', 'touch');
 				}
 			},
 
@@ -280,6 +282,7 @@ $.fn.elfindercontextmenu = function(fm) {
 										if ($.isPlainObject(opts)) {
 											opts._currentType = type;
 										}
+										close();
 										cmd.exec(targets, opts);
 									}
 								})