Skip to content

Commit

Permalink
perf(admin): Update elFinder v2.1.62 → v2.1.64
Browse files Browse the repository at this point in the history
  • Loading branch information
mcaskill committed Jan 12, 2024
1 parent 5baa78d commit b55a916
Show file tree
Hide file tree
Showing 12 changed files with 491 additions and 488 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"psr/log": "^1.0",
"seld/jsonlint": "^1.9",
"slim/slim": "^3.7",
"studio-42/elfinder": "2.1.62",
"studio-42/elfinder": "2.1.64",
"symfony/translation": "^3.4",
"tedivm/stash": "~0.16",
"vlucas/phpdotenv": "^5.4"
Expand Down
14 changes: 7 additions & 7 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

86 changes: 25 additions & 61 deletions packages/admin/assets/dist/elfinder/css/elfinder.full.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!
* elFinder - file manager for web
* Version 2.1.62 (2023-06-14)
* Version 2.1.64 (2023-12-20)
* http://elfinder.org
*
* Copyright 2009-2023, Studio 42
Expand Down Expand Up @@ -3437,93 +3437,57 @@ button.elfinder-info-button {
}

/* File: /css/fonts.css */
.elfinder-font-mono {
font-family: "Ricty Diminished", "Myrica M", Consolas, "Courier New", Courier, Monaco, monospace;
font-size: 1.1em;
}

.elfinder-contextmenu .elfinder-contextmenu-item span {
font-size: .72em;
}

.elfinder-cwd-view-icons .elfinder-cwd-filename {
font-size: .7em;
}

.elfinder-cwd-view-list td {
font-size: .7em;
.dialogelfinder .dialogelfinder-drag,
.elfinder-place-drag .elfinder-navbar-dir,
.elfinder-quicklook-preview-text-wrapper,
.elfinder-info-tb {
font-size: .9em;
}

.std42-dialog .ui-dialog-titlebar {
font-size: .82em;
}

.std42-dialog .ui-dialog-content {
font-size: .72em;
.elfinder-button-search input {
font-size: .8em;
}

.std42-dialog .ui-dialog-buttonpane {
.std42-dialog .ui-dialog-buttonpane, .elfinder-toast {
font-size: .76em;
}

.elfinder-info-tb {
font-size: .9em;
}

.elfinder-upload-dropbox {
font-size: 1.2em;
}

.elfinder-upload-dialog-or {
font-size: 1.2em;
}

.dialogelfinder .dialogelfinder-drag {
font-size: .9em;
}

.elfinder .elfinder-navbar {
.elfinder-contextmenu .elfinder-contextmenu-item span,
.std42-dialog .ui-dialog-content,
.elfinder .elfinder-navbar,
.elfinder-quicklook-info-data,
.elfinder-button-menu-item {
font-size: .72em;
}

.elfinder-place-drag .elfinder-navbar-dir {
font-size: .9em;
}

.elfinder-quicklook-title {
.elfinder-cwd-view-icons .elfinder-cwd-filename,
.elfinder-cwd-view-list td,
.elfinder-quicklook-title,
.elfinder-statusbar div {
font-size: .7em;
font-weight: normal;
}

.elfinder-quicklook-info-data {
font-size: .72em;
}

.elfinder-quicklook-preview-text-wrapper {
font-size: .9em;
}

.elfinder-button-menu-item {
font-size: .72em;
}

.elfinder-button-search input {
font-size: .8em;
.elfinder-upload-dropbox, .elfinder-upload-dialog-or {
font-size: 1.2em;
}

.elfinder-statusbar div {
font-size: .7em;
.elfinder-font-mono {
font-family: "Ricty Diminished", "Myrica M", Consolas, "Courier New", Courier, Monaco, monospace;
font-size: 1.1em;
}

.elfinder-drag-num {
font-size: 12px;
}

.elfinder-toast {
font-size: .76em;
.elfinder-quicklook-title {
font-weight: normal;
}


/* File: /css/navbar.css */
/*********************************************/
/* NAVIGATION PANEL */
Expand Down
4 changes: 2 additions & 2 deletions packages/admin/assets/dist/elfinder/css/elfinder.min.css

Large diffs are not rendered by default.

36 changes: 20 additions & 16 deletions packages/admin/assets/dist/elfinder/js/elfinder.full.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!
* elFinder - file manager for web
* Version 2.1.62 (2023-06-14)
* Version 2.1.64 (2023-12-20)
* http://elfinder.org
*
* Copyright 2009-2023, Studio 42
Expand Down Expand Up @@ -3259,7 +3259,7 @@ var elFinder = function(elm, opts, bootCallback) {
this.shortcut = function(s) {
var patterns, pattern, code, i, parts;

if (this.options.allowShortcuts && s.pattern && $.isFunction(s.callback)) {
if (this.options.allowShortcuts && s.pattern && typeof s.callback === 'function') {
patterns = s.pattern.toUpperCase().split(/\s+/);

for (i= 0; i < patterns.length; i++) {
Expand Down Expand Up @@ -5279,10 +5279,10 @@ var elFinder = function(elm, opts, bootCallback) {
$.each(self.commands, function(name, cmd) {
var proto = Object.assign({}, cmd.prototype),
extendsCmd, opts;
if ($.isFunction(cmd) && !self._commands[name] && (cmd.prototype.forceLoad || $.inArray(name, self.options.commands) !== -1)) {
if (typeof cmd === 'function' && !self._commands[name] && (cmd.prototype.forceLoad || $.inArray(name, self.options.commands) !== -1)) {
extendsCmd = cmd.prototype.extendsCmd || '';
if (extendsCmd) {
if ($.isFunction(self.commands[extendsCmd])) {
if (typeof self.commands[extendsCmd] === 'function') {
cmd.prototype = Object.assign({}, base, new self.commands[extendsCmd](), cmd.prototype);
} else {
return true;
Expand All @@ -5301,7 +5301,7 @@ var elFinder = function(elm, opts, bootCallback) {
if (self._commands[name].linkedCmds.length) {
$.each(self._commands[name].linkedCmds, function(i, n) {
var lcmd = self.commands[n];
if ($.isFunction(lcmd) && !self._commands[n]) {
if (typeof lcmd === 'function' && !self._commands[n]) {
lcmd.prototype = base;
self._commands[n] = new lcmd();
self._commands[n].setup(n, self.options.commandsOptions[n]||{});
Expand Down Expand Up @@ -8642,7 +8642,7 @@ elFinder.prototype = {

if (cnt > 0) {
if (cancel && button.length) {
if ($.isFunction(cancel) || (typeof cancel === 'object' && cancel.promise)) {
if (typeof cancel === 'function' || (typeof cancel === 'object' && cancel.promise)) {
notify._esc = function(e) {
if (e.type == 'keydown' && e.keyCode != $.ui.keyCode.ESCAPE) {
return;
Expand Down Expand Up @@ -8799,7 +8799,7 @@ elFinder.prototype = {
};
}

if (opts.optionsCallback && $.isFunction(opts.optionsCallback)) {
if (opts.optionsCallback && typeof opts.optionsCallback === 'function') {
opts.optionsCallback(options);
}

Expand Down Expand Up @@ -9293,7 +9293,7 @@ elFinder.prototype = {
* @return void
*/
registRawStringDecoder : function(rawStringDecoder) {
if ($.isFunction(rawStringDecoder)) {
if (typeof rawStringDecoder === 'function') {
this.decodeRawString = this.options.rawStringDecoder = rawStringDecoder;
}
},
Expand Down Expand Up @@ -9785,7 +9785,7 @@ elFinder.prototype = {
}
});
if (!hasError) {
if ($.isFunction(callback)) {
if (typeof callback === 'function') {
if (check) {
if (typeof check.obj[check.name] === 'undefined') {
cnt = check.timeout? (check.timeout / 10) : 1;
Expand All @@ -9803,7 +9803,7 @@ elFinder.prototype = {
}
}
} else {
if (opts.error && $.isFunction(opts.error)) {
if (opts.error && typeof opts.error === 'function') {
opts.error({ loadResults: results });
}
}
Expand Down Expand Up @@ -10748,7 +10748,7 @@ if (!window.cancelAnimationFrame) {
*
* @type String
**/
elFinder.prototype.version = '2.1.62';
elFinder.prototype.version = '2.1.64';



Expand Down Expand Up @@ -11143,7 +11143,7 @@ $.fn.elfinder = function(o, o2) {
if (elfinder) {
opts = $.extend(true, elfinder.options, $.isPlainObject(o2)? o2 : {});
bootCallback = elfinder.bootCallback;
if (elfinder.reloadCallback && $.isFunction(elfinder.reloadCallback)) {
if (elfinder.reloadCallback && typeof elfinder.reloadCallback === 'function') {
elfinder.reloadCallback(opts, bootCallback);
} else {
elfinder.destroy();
Expand Down Expand Up @@ -12565,7 +12565,7 @@ elFinder.prototype._options = {
*
* @type Null|Function
*/
rawStringDecoder : typeof Encoding === 'object' && $.isFunction(Encoding.convert)? function(str) {
rawStringDecoder : typeof Encoding === 'object' && typeof Encoding.convert === 'function'? function(str) {
return Encoding.convert(str, {
to: 'UNICODE',
type: 'string'
Expand Down Expand Up @@ -35681,11 +35681,15 @@ elFinder.prototype.commands.upload = function() {
idx, errors;

if (trf) {
if (trf.types && trf.types.length && (idx = $.inArray('Files', trf.types)) !== -1) {
kind = 'file';
if (trf.types && trf.types.length) {
if ((idx = $.inArray('application/x-moz-file', trf.types)) !== -1) {
kind = 'file';
} else if ((idx = $.inArray('Files', trf.types)) !== -1) {
kind = 'file';
}
}
else if (trf.items && trf.items.length && trf.items[0].kind) {
kind = trf.items[0].kind;
kind = trf.items[0].kind;
}

try {
Expand Down
35 changes: 18 additions & 17 deletions packages/admin/assets/dist/elfinder/js/elfinder.min.js

Large diffs are not rendered by default.

Loading

0 comments on commit b55a916

Please sign in to comment.