Elfinder 2.161

Elfinder update
This commit is contained in:
g7sim 2022-08-25 19:12:24 +02:00
parent 49d701cb77
commit bd16be2dc3
7 changed files with 393 additions and 76 deletions

View File

@ -1,9 +1,9 @@
/*!
* elFinder - file manager for web
* Version 2.1.50 (2019-08-20)
* Version 2.1.61 (2.1-src Nightly: 1733024) (2022-03-15)
* http://elfinder.org
*
* Copyright 2009-2019, Studio 42
* Copyright 2009-2022, Studio 42
* Licensed under a 3-clauses BSD license
*/
@ -944,6 +944,40 @@ ul.elfinder-help-integrations a:hover {
z-index: 100;
}
/* style reset */
div.elfinder *,
div.elfinder :after,
div.elfinder :before {
box-sizing: content-box;
}
div.elfinder fieldset {
display: block;
margin-inline-start: 2px;
margin-inline-end: 2px;
padding-block-start: 0.35em;
padding-inline-start: 0.75em;
padding-inline-end: 0.75em;
padding-block-end: 0.625em;
min-inline-size: min-content;
border-width: 2px;
border-style: groove;
border-color: threedface;
border-image: initial;
}
div.elfinder legend {
display: block;
padding-inline-start: 2px;
padding-inline-end: 2px;
border-width: initial;
border-style: none;
border-color: initial;
border-image: initial;
width: auto;
margin-bottom: 0;
}
/* base container */
div.elfinder {
padding: 0;
@ -1150,6 +1184,12 @@ div.elfinder {
opacity: .8;
}
.elfinder div.elfinder-bottomtray > div {
top: initial;
right: initial;
left: initial;
}
.elfinder.elfinder-ltr div.elfinder-bottomtray {
left: 0;
}
@ -1165,6 +1205,24 @@ div.elfinder {
padding: 2px 4px;
}
/* progressbar */
.elfinder-ui-progressbar {
pointer-events: none;
position: absolute;
width: 0;
height: 2px;
top: 0px;
border-radius: 2px;
filter: blur(1px);
}
.elfinder-ltr .elfinder-ui-progressbar {
left: 0;
}
.elfinder-rtl .elfinder-ui-progressbar {
right: 0;
}
/* File: /css/contextmenu.css */
/* menu and submenu */
.elfinder .elfinder-contextmenu,
@ -2450,7 +2508,7 @@ div.elfinder {
}
.elfinder .elfinder-cwd table td {
padding: 4px 12px;
padding: 0 12px;
white-space: pre;
overflow: hidden;
text-align: right;
@ -2521,6 +2579,12 @@ tr.elfinder-cwd-file td .elfinder-cwd-select {
margin-right: 8px;
}
.elfinder-cwd-view-list .elfinder-cwd-filename {
padding-top: 4px;
padding-bottom: 4px;
display: inline-block;
}
.elfinder-ltr .elfinder-cwd-view-list .elfinder-cwd-filename {
padding-left: 23px;
}
@ -2874,7 +2938,6 @@ tr.elfinder-cwd-file td .elfinder-cwd-select {
/* content */
.std42-dialog .ui-dialog-content {
padding: .3em .5em;
box-sizing: border-box;
}
.elfinder .std42-dialog .ui-dialog-content,
@ -2980,12 +3043,48 @@ tr.elfinder-cwd-file td .elfinder-cwd-select {
.elfinder-dialog-notify .ui-dialog-titlebar {
height: 5px;
overflow: hidden;
}
.elfinder-dialog-notify .ui-dialog-titlebar-close {
.elfinder.elfinder-touch > .elfinder-dialog-notify .ui-dialog-titlebar {
height: 10px;
}
.elfinder > .elfinder-dialog-notify .ui-dialog-titlebar .elfinder-titlebar-button {
top: 2px;
}
.elfinder.elfinder-touch > .elfinder-dialog-notify .ui-dialog-titlebar .elfinder-titlebar-button {
top: 4px;
}
.elfinder > .elfinder-dialog-notify .ui-dialog-titlebar .elfinder-titlebar-button {
left: -18px;
right: 18px;
}
.elfinder > .elfinder-dialog-notify .ui-dialog-titlebar .elfinder-titlebar-button.elfinder-titlebar-button-right {
left: 18px;
right: -18px;
}
.ui-dialog-titlebar .elfinder-ui-progressbar {
position: absolute;
top: 17px;
}
.elfinder-touch .ui-dialog-titlebar .elfinder-ui-progressbar {
top: 26px;
}
.elfinder-dialog-notify.elfinder-titlebar-button-hide .ui-dialog-titlebar-close {
display: none;
}
.elfinder-dialog-notify.elfinder-dialog-minimized.elfinder-titlebar-button-hide .ui-dialog-titlebar span.elfinder-dialog-title {
max-width: initial;
}
.elfinder-dialog-notify .ui-dialog-content {
padding: 0;
}
@ -3034,6 +3133,22 @@ tr.elfinder-cwd-file td .elfinder-cwd-select {
border-radius: 2px;
}
.elfinder-notify-cancel {
position: relative;
top: -18px;
right: calc(-50% + 15px);
}
.elfinder-notify-cancel .ui-icon-close {
background-position: -80px -128px;
width: 18px;
height: 18px;
border-radius: 9px;
border: none;
background-position: -80px -128px;
cursor: pointer;
}
/* icons */
.elfinder-dialog-icon-open,
.elfinder-dialog-icon-readdir,
@ -4101,6 +4216,12 @@ button.elfinder-info-button {
color: #fff;
}
.elfinder-quicklook-info-progress {
width: 0;
height: 4px;
border-radius: 2px;
}
/* file icon */
.elfinder-quicklook .elfinder-cwd-icon {
position: absolute;
@ -4135,7 +4256,7 @@ button.elfinder-info-button {
}
.elfinder-ltr .elfinder-quicklook .elfinder-cwd-icon:after {
left: -20px;
left: -42px;
}
.elfinder-ltr .elfinder-navdock .elfinder-quicklook .elfinder-cwd-icon:after {
@ -4149,13 +4270,14 @@ button.elfinder-info-button {
.elfinder-rtl .elfinder-quicklook .elfinder-cwd-icon:after {
left: auto;
right: 46px;
right: 42px;
}
/* image in preview */
.elfinder-quicklook-preview img {
.elfinder-quicklook-preview > img,
.elfinder-quicklook-preview > div > canvas {
display: block;
margin: 0 auto;
margin: auto;
}
/* navigation bar on quicklook window bottom */
@ -4235,6 +4357,26 @@ button.elfinder-info-button {
display: none;
}
/* text encoding selector */
.elfinder-quicklook-encoding {
height: 40px;
}
.elfinder-quicklook-encoding > select {
color: #fff;
background: #000;
border: 0;
font-size: 12px;
max-width: 100px;
display: inline-block;
position: relative;
top: 6px;
left: 5px;
}
.elfinder-navdock .elfinder-quicklook .elfinder-quicklook-encoding {
display: none;
}
/* text files preview wrapper */
.elfinder-quicklook-preview-text-wrapper {
width: 100%;
@ -4269,6 +4411,7 @@ pre.elfinder-quicklook-preview-text.prettyprint {
margin: 0;
padding: 3px 9px;
border: none;
overflow: visible;
-o-tab-size: 4;
-moz-tab-size: 4;
tab-size: 4;
@ -4323,6 +4466,13 @@ embed.elfinder-quicklook-preview-audio {
height: 100%;
}
/* video.js error message */
.elfinder-quicklook-preview .vjs-error .vjs-error-display .vjs-modal-dialog-content {
font-size: 12pt;
padding: 0;
color: #fff;
}
/* allow user select */
.elfinder .elfinder-quicklook .elfinder-quicklook-info *,
.elfinder .elfinder-quicklook .elfinder-quicklook-preview * {

File diff suppressed because one or more lines are too long

View File

@ -103,6 +103,10 @@
border-color: #8a8a8a;
}
.elfinder-quicklook-info-progress {
background-color: gray;
}
.std42-dialog .ui-dialog-titlebar .ui-dialog-titlebar-close:hover .ui-icon,
.elfinder-mobile .std42-dialog .ui-dialog-titlebar .ui-dialog-titlebar-close .ui-icon,
.elfinder-quicklook-titlebar-icon .ui-icon.elfinder-icon-close:hover,
@ -396,6 +400,15 @@
background-color: inherit;
}
.elfinder-notify-cancel .elfinder-notify-button {
background-color: #707070;
background-image: url("../img/ui-icons_ffffff_256x240.png");
}
.elfinder-notify-cancel .elfinder-notify-button.ui-state-hover {
background-color: #aaa;
}
/* edit dialog */
.elfinder-dialog-edit select.elfinder-edit-changed {
border-bottom: 2px solid #13ae10;
@ -410,3 +423,8 @@
.elfinder .elfinder-ui-tooltip.ui-widget-shadow {
box-shadow: 2px 6px 4px -4px #cecdcd;
}
/* progressbar */
.elfinder-ui-progressbar {
background-color: #419bf3;
}

View File

@ -1,9 +1,9 @@
/*!
* elFinder - file manager for web
* Version 2.1.59 (2021-06-14)
* Version 2.1.61 (2.1-src Nightly: 1733024) (2022-03-15)
* http://elfinder.org
*
* Copyright 2009-2021, Studio 42
* Copyright 2009-2022, Studio 42
* Licensed under a 3-clauses BSD license
*/
(function(root, factory) {
@ -844,6 +844,14 @@ var elFinder = function(elm, opts, bootCallback) {
*/
this.i18nBaseUrl = '';
/**
* Base URL of worker js files
* baseUrl + "js/worker/" when empty value
*
* @type String
*/
this.workerBaseUrl = '';
/**
* Is elFinder CSS loaded
*
@ -1163,6 +1171,7 @@ var elFinder = function(elm, opts, bootCallback) {
})();
this.i18nBaseUrl = (this.options.i18nBaseUrl || this.baseUrl + 'js/i18n').replace(/\/$/, '') + '/';
this.workerBaseUrl = (this.options.workerBaseUrl || this.baseUrl + 'js/worker').replace(/\/$/, '') + '/';
this.options.maxErrorDialogs = Math.max(1, parseInt(this.options.maxErrorDialogs || 5));
@ -8968,6 +8977,11 @@ elFinder.prototype = {
} else {
kind = this.kinds[mime];
}
} else if (this.mimeTypes[mime]) {
kind = this.mimeTypes[mime].toUpperCase();
if (!this.messages['kind'+kind]) {
kind = null;
}
}
if (! kind) {
if (mime.indexOf('text') === 0) {
@ -10199,7 +10213,7 @@ elFinder.prototype = {
* @return {<type>} The worker url.
*/
getWorkerUrl : function(filename) {
return this.convAbsUrl(this.baseUrl + 'js/worker/' + filename);
return this.convAbsUrl(this.workerBaseUrl + filename);
},
/**
@ -10716,7 +10730,7 @@ if (!window.cancelAnimationFrame) {
*
* @type String
**/
elFinder.prototype.version = '2.1.59';
elFinder.prototype.version = '2.1.61 (2.1-src Nightly: 1733024)';
@ -11202,27 +11216,27 @@ elFinder.prototype._options = {
*/
cdns : {
// for editor etc.
ace : 'https://cdnjs.cloudflare.com/ajax/libs/ace/1.4.12',
codemirror : 'https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.61.1',
ckeditor : 'https://cdnjs.cloudflare.com/ajax/libs/ckeditor/4.16.1',
ckeditor5 : 'https://cdn.ckeditor.com/ckeditor5/28.0.0',
tinymce : 'https://cdnjs.cloudflare.com/ajax/libs/tinymce/5.7.1',
ace : 'https://cdnjs.cloudflare.com/ajax/libs/ace/1.4.14',
codemirror : 'https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.65.2',
ckeditor : 'https://cdnjs.cloudflare.com/ajax/libs/ckeditor/4.17.2',
ckeditor5 : 'https://cdn.ckeditor.com/ckeditor5/33.0.0',
tinymce : 'https://cdnjs.cloudflare.com/ajax/libs/tinymce/6.0.0',
simplemde : 'https://cdnjs.cloudflare.com/ajax/libs/simplemde/1.11.2',
fabric : 'https://cdnjs.cloudflare.com/ajax/libs/fabric.js/4.2.0',
fabric16 : 'https://cdnjs.cloudflare.com/ajax/libs/fabric.js/1.6.7',
tui : 'https://uicdn.toast.com',
// for quicklook etc.
hls : 'https://cdnjs.cloudflare.com/ajax/libs/hls.js/1.0.2/hls.min.js',
dash : 'https://cdnjs.cloudflare.com/ajax/libs/dashjs/3.2.2/dash.all.min.js',
flv : 'https://cdnjs.cloudflare.com/ajax/libs/flv.js/1.5.0/flv.min.js',
videojs : 'https://cdnjs.cloudflare.com/ajax/libs/video.js/7.12.1',
hls : 'https://cdnjs.cloudflare.com/ajax/libs/hls.js/1.1.5/hls.min.js',
dash : 'https://cdnjs.cloudflare.com/ajax/libs/dashjs/4.3.0/dash.all.min.js',
flv : 'https://cdnjs.cloudflare.com/ajax/libs/flv.js/1.6.2/flv.min.js',
videojs : 'https://cdnjs.cloudflare.com/ajax/libs/video.js/7.18.1',
prettify : 'https://cdn.jsdelivr.net/gh/google/code-prettify@f1c3473acd1e8ea8c8c1a60c56e89f5cdd06f915/loader/run_prettify.js',
psd : 'https://cdnjs.cloudflare.com/ajax/libs/psd.js/3.2.0/psd.min.js',
psd : 'https://cdnjs.cloudflare.com/ajax/libs/psd.js/3.4.0/psd.min.js',
rar : 'https://cdn.jsdelivr.net/gh/nao-pon/rar.js@6cef13ec66dd67992fc7f3ea22f132d770ebaf8b/rar.min.js',
zlibUnzip : 'https://cdn.jsdelivr.net/gh/imaya/zlib.js@0.3.1/bin/unzip.min.js', // need check unzipFiles() in quicklook.plugins.js when update
zlibGunzip : 'https://cdn.jsdelivr.net/gh/imaya/zlib.js@0.3.1/bin/gunzip.min.js',
bzip2 : 'https://cdn.jsdelivr.net/gh/nao-pon/bzip2.js@0.8.0/bzip2.js',
marked : 'https://cdnjs.cloudflare.com/ajax/libs/marked/2.0.3/marked.min.js',
marked : 'https://cdnjs.cloudflare.com/ajax/libs/marked/4.0.2/marked.min.js',
sparkmd5 : 'https://cdnjs.cloudflare.com/ajax/libs/spark-md5/3.0.0/spark-md5.min.js',
jssha : 'https://cdnjs.cloudflare.com/ajax/libs/jsSHA/3.2.0/sha.min.js',
amr : 'https://cdn.jsdelivr.net/gh/yxl/opencore-amr-js@dcf3d2b5f384a1d9ded2a54e4c137a81747b222b/js/amrnb.js',
@ -11401,6 +11415,15 @@ elFinder.prototype._options = {
* @default ""
*/
i18nBaseUrl : '',
/**
* Base URL of worker js files
* baseUrl + "js/worker/" when empty value
*
* @type String
* @default ""
*/
workerBaseUrl : '',
/**
* Auto load required CSS
@ -22425,11 +22448,11 @@ $.fn.elfindertree = function(fm, opts) {
arrow.data('dfrd', dfrd);
})
.on('contextmenu', selNavdir, function(e) {
e.stopPropagation();
var self = $(this);
// now dirname editing
if (self.find('input:text').length) {
e.stopPropagation();
return;
}
@ -25877,7 +25900,7 @@ elFinder.prototype.commands.fullscreen = function() {
html.push('<div class="'+prim+'">'+fm.i18n('team')+'</div>');
html.push(atpl[r](author, 'Dmitry "dio" Levashov &lt;dio@std42.ru&gt;')[r](work, fm.i18n('chiefdev')));
html.push(atpl[r](author, 'Naoki Sawada &lt;hypweb+elfinder@gmail.com&gt;')[r](work, fm.i18n('developer')));
html.push(atpl[r](author, 'Naoki Sawada (nao-pon)&lt;hypweb+elfinder@gmail.com&gt;')[r](work, fm.i18n('developer')));
html.push(atpl[r](author, 'Troex Nevelin &lt;troex@fury.scancode.ru&gt;')[r](work, fm.i18n('maintainer')));
html.push(atpl[r](author, 'Alexey Sukhotin &lt;strogg@yandex.ru&gt;')[r](work, fm.i18n('contributor')));
@ -25894,7 +25917,7 @@ elFinder.prototype.commands.fullscreen = function() {
html.push(sep);
html.push('<div class="'+lic+'">Licence: 3-clauses BSD Licence</div>');
html.push('<div class="'+lic+'">Copyright © 2009-2021, Studio 42</div>');
html.push('<div class="'+lic+'">Copyright © 2009-2022, Studio 42 / nao-pon</div>');
html.push('<div class="'+lic+'">„ …'+fm.i18n('dontforget')+' ”</div>');
html.push('</div>');
},
@ -30088,7 +30111,7 @@ elFinder.prototype.commands.quicklook.plugins = [
ql.hideinfo();
var doc = $('<iframe class="elfinder-quicklook-preview-html"></iframe>').appendTo(preview)[0].contentWindow.document;
doc.open();
doc.write(marked(data.content));
doc.write((marked.parse || marked)(data.content));
doc.close();
loading.remove();
},
@ -34679,35 +34702,43 @@ elFinder.prototype.commands.rm = function() {
this.value = 'rm';
this.init = function() {
// re-assign for extended command
self = this;
fm = this.fm;
// bind function of change
self.change(function() {
var update = function(origin) {
var targets;
delete self.extra;
self.title = fm.i18n('cmd' + self.value);
self.className = self.value;
self.button && self.button.children('span.elfinder-button-icon')[self.value === 'trash'? 'addClass' : 'removeClass']('elfinder-button-icon-trash');
if (self.value === 'trash') {
self.extra = {
icon: 'rm',
node: $('<span></span>')
.attr({title: fm.i18n('cmdrm')})
.on('ready', function(e, data) {
targets = data.targets;
})
.on('click touchstart', function(e){
if (e.type === 'touchstart' && e.originalEvent.touches.length > 1) {
return;
}
e.stopPropagation();
e.preventDefault();
fm.getUI().trigger('click'); // to close the context menu immediately
fm.exec('rm', targets, {_userAction: true, forceRm : true});
})
};
if (origin && origin !== 'cwd' && (self.state > -1 || origin === 'navbar')) {
if (self.value === 'trash') {
self.extra = {
icon: 'rm',
node: $('<span></span>')
.attr({title: fm.i18n('cmdrm')})
.on('ready', function(e, data) {
targets = data.targets;
})
.on('click touchstart', function(e){
if (e.type === 'touchstart' && e.originalEvent.touches.length > 1) {
return;
}
e.stopPropagation();
e.preventDefault();
fm.getUI().trigger('click'); // to close the context menu immediately
fm.exec('rm', targets, {_userAction: true, forceRm : true});
})
};
}
}
};
// re-assign for extended command
self = this;
fm = this.fm;
// bind function of change
self.change(function() {
update();
});
fm.bind('contextmenucreate', function(e) {
update(e.data.type);
});
};

File diff suppressed because one or more lines are too long

View File

@ -30,7 +30,7 @@
'error' : 'Fehler',
'errUnknown' : 'Unbekannter Fehler.',
'errUnknownCmd' : 'Unbekannter Befehl.',
'errJqui' : 'Ungültige jQuery UI-Konfiguration. Die Komponenten Selectable, Draggable und Droppable müssen inkludiert sein.',
'errJqui' : 'Ungültige jQuery UI-Konfiguration. Die Komponenten Selectable, Draggable und Droppable müssen enthalten sein.',
'errNode' : 'Für elFinder muss das DOM-Element erstellt werden.',
'errURL' : 'Ungültige elFinder Konfiguration! Die URL-Option ist nicht gesetzt.',
'errAccess' : 'Zugriff verweigert.',
@ -136,7 +136,7 @@
'cmdinfo' : 'Informationen',
'cmdmkdir' : 'Neuer Ordner',
'cmdmkdirin' : 'In neuen Ordner', // from v2.1.7 added 19.2.2016
'cmdmkfile' : 'Neuer Datei',
'cmdmkfile' : 'Neue Datei',
'cmdopen' : 'Öffnen',
'cmdpaste' : 'Einfügen',
'cmdquicklook' : 'Vorschau',

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 31 KiB