src build elFinder-2.1-eb2bf30

Studio-42 · Jun 9, 2021 · b0051ef · b0051ef
1 parent 99262ee
commit b0051ef
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 29 deletions.
diff --git a/Changelog b/Changelog
@@ -1,3 +1,21 @@
+2021-06-09  Naoki Sawada  <hypweb+elfinder@gmail.com>
+	* elFinder (2.1.58):
+		- [VD:abstract] Fixed #3151 support RAR5 lib
+		- [cmd:fullscreen] Fixed #3177 wrong fullscreen button caption
+		- [js:core] Supports cookie samesite attribute
+		- [VD:SFTP] Add new SFTP driver, via phpseclib library
+		- [js:core] Fixed #3193 auto-detection of baseUrl
+		- [js:upload] Fixed upload bug (#3264)
+		- [VD:abstract,php] make the thumbnail support webp (#3265) 
+		- [php:core] Fixed #3250 error only variables can be passed by reference
+		- [VD:abstract] add 'phar:*' => 'text/x-php' into 'staticMineMap'
+		- [VD:abstract] Fixed #3181 add an option uploadMaxMkdirs
+		- [php:core] Add cwd param to proc_open (#3281)
+		- [VD:abstract] Bugfix of an option mimeDetect (#3291)
+		- [UI] Fixed #3302 problem of d&d when copy of UI command is disabled
+		- And some minor bug fixes
+
+
 2020-06-05  Naoki Sawada  <hypweb+elfinder@gmail.com>
 	* elFinder (2.1.57):
 		- [js] Fixed #3148 to support jQuery 3.5.0 update

diff --git a/css/elfinder.full.css b/css/elfinder.full.css
@@ -1,6 +1,6 @@
 /*!
  * elFinder - file manager for web
- * Version 2.1.57 (2.1-src Nightly: 77e8cad) (2021-06-08)
+ * Version 2.1.58 (2.1-src Nightly: eb2bf30) (2021-06-09)
  * http://elfinder.org
  * 
  * Copyright 2009-2021, Studio 42

diff --git a/css/elfinder.min.css b/css/elfinder.min.css
diff --git a/js/elfinder.full.js b/js/elfinder.full.js
@@ -1,6 +1,6 @@
 /*!
  * elFinder - file manager for web
- * Version 2.1.57 (2.1-src Nightly: 77e8cad) (2021-06-08)
+ * Version 2.1.58 (2.1-src Nightly: eb2bf30) (2021-06-09)
  * http://elfinder.org
  * 
  * Copyright 2009-2021, Studio 42
@@ -5209,12 +5209,14 @@ var elFinder = function(elm, opts, bootCallback) {
 					}
 
 					$(document).on(keyEvt, function(e){
-						var chk = (e.shiftKey||e.ctrlKey||e.metaKey);
-						if (ctr !== chk) {
-							ctr = chk;
-							if (helper.is(':visible') && helper.data('dropover') && ! helper.data('droped')) {
-								helper.toggleClass('elfinder-drag-helper-plus', helper.data('locked')? true : ctr);
-								self.trigger(ctr? 'unlockfiles' : 'lockfiles', {files : hashes, helper: helper});
+						if (self._commands.copy) {
+							var chk = (e.shiftKey||e.ctrlKey||e.metaKey);
+							if (ctr !== chk) {
+								ctr = chk;
+								if (helper.is(':visible') && helper.data('dropover') && ! helper.data('droped')) {
+									helper.toggleClass('elfinder-drag-helper-plus', helper.data('locked')? true : ctr);
+									self.trigger(ctr? 'unlockfiles' : 'lockfiles', {files : hashes, helper: helper});
+								}
 							}
 						}
 					});
@@ -10710,7 +10712,7 @@ if (!window.cancelAnimationFrame) {
  *
  * @type String
  **/
-elFinder.prototype.version = '2.1.57 (2.1-src Nightly: 77e8cad)';
+elFinder.prototype.version = '2.1.58 (2.1-src Nightly: eb2bf30)';
 
 
 
@@ -16192,7 +16194,7 @@ $.fn.elfindercwd = function(fm, options) {
 				over : function(e, ui) {
 					var dst    = $(this),
 						helper = ui.helper,
-						ctr    = (e.shiftKey || e.ctrlKey || e.metaKey),
+						ctr    = fm._commands.copy && (e.shiftKey || e.ctrlKey || e.metaKey),
 						hash, status, inParent;
 					e.stopPropagation();
 					helper.data('dropover', helper.data('dropover') + 1);
@@ -17016,7 +17018,8 @@ $.fn.elfindercwd = function(fm, options) {
 
 					if (!mobile && !$this.data('dragRegisted') && !$this.hasClass(clTmp) && !$this.hasClass(clDraggable) && !$this.hasClass(clDisabled)) {
 						$this.data('dragRegisted', true);
-						if (!fm.isCommandEnabled('copy', fm.searchStatus.state > 1 || $this.hasClass('isroot')? fm.cwdId2Hash($this.attr('id')) : void 0)) {
+						if (!fm.isCommandEnabled('copy', fm.searchStatus.state > 1 || $this.hasClass('isroot')? fm.cwdId2Hash($this.attr('id')) : void 0) &&
+							!fm.isCommandEnabled('cut', fm.searchStatus.state > 1 || $this.hasClass('isroot')? fm.cwdId2Hash($this.attr('id')) : void 0)) {
 							return;
 						}
 						$this.on('mousedown', function(e) {
@@ -21451,7 +21454,7 @@ $.fn.elfindertree = function(fm, opts) {
 						status = 'elfinder-drag-helper-plus';
 					} else {
 						status = 'elfinder-drag-helper-move';
-						if (e.shiftKey || e.ctrlKey || e.metaKey) {
+						if (fm._commands.copy && (e.shiftKey || e.ctrlKey || e.metaKey)) {
 							status += ' elfinder-drag-helper-plus';
 						}
 					}

diff --git a/js/elfinder.min.js b/js/elfinder.min.js
diff --git a/php/elFinder.class.php b/php/elFinder.class.php
@@ -32,7 +32,7 @@ class elFinder
      *
      * @var integer
      */
-    protected static $ApiRevision = 57;
+    protected static $ApiRevision = 58;
 
     /**
      * Storages (root dirs)