Skip to content

Commit b0051ef

Browse files
committed
src build elFinder-2.1-eb2bf30
1 parent 99262ee commit b0051ef

File tree

6 files changed

+50
-29
lines changed

6 files changed

+50
-29
lines changed

Changelog

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
2021-06-09 Naoki Sawada <[email protected]>
2+
* elFinder (2.1.58):
3+
- [VD:abstract] Fixed #3151 support RAR5 lib
4+
- [cmd:fullscreen] Fixed #3177 wrong fullscreen button caption
5+
- [js:core] Supports cookie samesite attribute
6+
- [VD:SFTP] Add new SFTP driver, via phpseclib library
7+
- [js:core] Fixed #3193 auto-detection of baseUrl
8+
- [js:upload] Fixed upload bug (#3264)
9+
- [VD:abstract,php] make the thumbnail support webp (#3265)
10+
- [php:core] Fixed #3250 error only variables can be passed by reference
11+
- [VD:abstract] add 'phar:*' => 'text/x-php' into 'staticMineMap'
12+
- [VD:abstract] Fixed #3181 add an option uploadMaxMkdirs
13+
- [php:core] Add cwd param to proc_open (#3281)
14+
- [VD:abstract] Bugfix of an option mimeDetect (#3291)
15+
- [UI] Fixed #3302 problem of d&d when copy of UI command is disabled
16+
- And some minor bug fixes
17+
18+
119
2020-06-05 Naoki Sawada <[email protected]>
220
* elFinder (2.1.57):
321
- [js] Fixed #3148 to support jQuery 3.5.0 update

css/elfinder.full.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*!
22
* elFinder - file manager for web
3-
* Version 2.1.57 (2.1-src Nightly: 77e8cad) (2021-06-08)
3+
* Version 2.1.58 (2.1-src Nightly: eb2bf30) (2021-06-09)
44
* http://elfinder.org
55
*
66
* Copyright 2009-2021, Studio 42

css/elfinder.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/elfinder.full.js

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*!
22
* elFinder - file manager for web
3-
* Version 2.1.57 (2.1-src Nightly: 77e8cad) (2021-06-08)
3+
* Version 2.1.58 (2.1-src Nightly: eb2bf30) (2021-06-09)
44
* http://elfinder.org
55
*
66
* Copyright 2009-2021, Studio 42
@@ -5209,12 +5209,14 @@ var elFinder = function(elm, opts, bootCallback) {
52095209
}
52105210

52115211
$(document).on(keyEvt, function(e){
5212-
var chk = (e.shiftKey||e.ctrlKey||e.metaKey);
5213-
if (ctr !== chk) {
5214-
ctr = chk;
5215-
if (helper.is(':visible') && helper.data('dropover') && ! helper.data('droped')) {
5216-
helper.toggleClass('elfinder-drag-helper-plus', helper.data('locked')? true : ctr);
5217-
self.trigger(ctr? 'unlockfiles' : 'lockfiles', {files : hashes, helper: helper});
5212+
if (self._commands.copy) {
5213+
var chk = (e.shiftKey||e.ctrlKey||e.metaKey);
5214+
if (ctr !== chk) {
5215+
ctr = chk;
5216+
if (helper.is(':visible') && helper.data('dropover') && ! helper.data('droped')) {
5217+
helper.toggleClass('elfinder-drag-helper-plus', helper.data('locked')? true : ctr);
5218+
self.trigger(ctr? 'unlockfiles' : 'lockfiles', {files : hashes, helper: helper});
5219+
}
52185220
}
52195221
}
52205222
});
@@ -10710,7 +10712,7 @@ if (!window.cancelAnimationFrame) {
1071010712
*
1071110713
* @type String
1071210714
**/
10713-
elFinder.prototype.version = '2.1.57 (2.1-src Nightly: 77e8cad)';
10715+
elFinder.prototype.version = '2.1.58 (2.1-src Nightly: eb2bf30)';
1071410716

1071510717

1071610718

@@ -16192,7 +16194,7 @@ $.fn.elfindercwd = function(fm, options) {
1619216194
over : function(e, ui) {
1619316195
var dst = $(this),
1619416196
helper = ui.helper,
16195-
ctr = (e.shiftKey || e.ctrlKey || e.metaKey),
16197+
ctr = fm._commands.copy && (e.shiftKey || e.ctrlKey || e.metaKey),
1619616198
hash, status, inParent;
1619716199
e.stopPropagation();
1619816200
helper.data('dropover', helper.data('dropover') + 1);
@@ -17016,7 +17018,8 @@ $.fn.elfindercwd = function(fm, options) {
1701617018

1701717019
if (!mobile && !$this.data('dragRegisted') && !$this.hasClass(clTmp) && !$this.hasClass(clDraggable) && !$this.hasClass(clDisabled)) {
1701817020
$this.data('dragRegisted', true);
17019-
if (!fm.isCommandEnabled('copy', fm.searchStatus.state > 1 || $this.hasClass('isroot')? fm.cwdId2Hash($this.attr('id')) : void 0)) {
17021+
if (!fm.isCommandEnabled('copy', fm.searchStatus.state > 1 || $this.hasClass('isroot')? fm.cwdId2Hash($this.attr('id')) : void 0) &&
17022+
!fm.isCommandEnabled('cut', fm.searchStatus.state > 1 || $this.hasClass('isroot')? fm.cwdId2Hash($this.attr('id')) : void 0)) {
1702017023
return;
1702117024
}
1702217025
$this.on('mousedown', function(e) {
@@ -21451,7 +21454,7 @@ $.fn.elfindertree = function(fm, opts) {
2145121454
status = 'elfinder-drag-helper-plus';
2145221455
} else {
2145321456
status = 'elfinder-drag-helper-move';
21454-
if (e.shiftKey || e.ctrlKey || e.metaKey) {
21457+
if (fm._commands.copy && (e.shiftKey || e.ctrlKey || e.metaKey)) {
2145521458
status += ' elfinder-drag-helper-plus';
2145621459
}
2145721460
}

js/elfinder.min.js

Lines changed: 15 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

php/elFinder.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class elFinder
3232
*
3333
* @var integer
3434
*/
35-
protected static $ApiRevision = 57;
35+
protected static $ApiRevision = 58;
3636

3737
/**
3838
* Storages (root dirs)

0 commit comments

Comments
 (0)