Skip to content

Commit

Permalink
update elFinder to v2.1.33
Browse files Browse the repository at this point in the history
  • Loading branch information
dleffler committed Mar 16, 2018
1 parent b72369a commit d3953ea
Show file tree
Hide file tree
Showing 90 changed files with 2,444 additions and 737 deletions.
8 changes: 4 additions & 4 deletions external/ExtPrograms.csv
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ csshover.htc,3.11,peterned.home.xs4all.nl/csshover.html,3.11,IE6 shim
CKEditor,4.8.0,ckeditor.com,4.8.0,"add fieldinsert (exp), tableresize, sourcedialog, image2 fileupload & imageupload widgets & kama skin"
TinyMCE,4.7.9,tinymce.com,4.7.9,"add fieldinsert (exp) & quickupload (exp) plugins, & xenmce skin"
PLUpload,2.3.6,github.com/moxiecode/plupload,2.3.6/3.1.1,"needed for TinyMCE Quick Upload, placed in that plugin folder"
elFinder,2.1.32,elfinder.org,2.1.32,customized in /framework with Exponent php classes and .js files
elFinder,2.1.33,elfinder.org,2.1.33,customized in /framework with Exponent php classes and .js files
jQuery1,1.12.4,jquery.com,1.12.4,v1.11.3 still needed for old firefox
jQuery,2.2.4,jquery.com,2.2.4,
jQuery Migrate,1.4.1,jquery.com,1.4.1,renamed to migrate.js for easy loading as an addon
Expand All @@ -61,7 +61,7 @@ yadcf,0.9.2,github.com/vedmack/yadcf,0.9.2,
tag-it,2,aehlke.github.io/tag-it/,2,renamed css file to same as js file for our loader
multiselect,2,mind2soft.com/labs/jquery/multiselect/,2,
excoloSlider,1.1.0,excolo.github.io/Excolo-Slider/,1.1.0,
OwlCarousel2,2.2.1,github.com/smashingboxes/OwlCarousel2,2.2.1,
OwlCarousel2,2.3.2,github.com/smashingboxes/OwlCarousel2,2.3.2,
colorbox,1.6.4,www.jacklmoore.com/colorbox,1.6.4,using style #5 renamed to jquery.colorbox.css
Searcher,0.3.0,github.com/lloiser/jquery-searcher/,0.3.0,
DateTimePicker,2.5.18exp,xdsoft.net/jqplugins/datetimepicker/,2.5.18,rename .full version; we add .js auto-close on inline date select and extra 'reset' work & remove .css z-index issue
Expand All @@ -77,7 +77,7 @@ bootstrap-tagsinput,0.8.0exp,github.com/timschlechter/bootstrap-tagsinput,0.8.0,
Typeahead,0.11.1,twitter.github.io/typeahead.js/,0.11.1,needed by bootstrap-tagsinput
bootstrap-duallistbox,3.0.6,github.com/istvan-ujjmeszaros/bootstrap-duallistbox,3.0.6,
select2,4.0.5,github.com/ivaynberg/select2,4.0.5,renamed select2.full.js to select2.js
shuffle.js,v3.1.1,github.com/Vestride/Shuffle,5.0.3,
shuffle.js,v3.1.1,github.com/Vestride/Shuffle,4.2.0/5.1.1,
Jasny Bootstrap2,2.3.1,jasny.github.io/bootstrap,2.3.1,only using bootstrap-fileupload at this time
Jasny Bootstrap,3.2.0beta1,jasny.github.io/bootstrap,3.2.0beta1,only using fileinput at this time
easypost sdk,3.4.0,github.com/EasyPost/easypost-php,3.4.0,
Expand All @@ -97,7 +97,7 @@ Kint,2.2.0,github.com/kint-php/kint,2.2.0,"optional, for formatted edebug output
Not included yet,,,,
Twitter-Bootstrap,,twitter.github.com/bootstrap,4.0.0,patched bootstrap.scss includes swatches & exp variables
Bootswatch,,bootswatch.com/,4.0.0,change 1st line variables.scss comment to output to .css file
Font-Awesome,,fontawesome.com,5.0.7,add 'fonts' to main sheet
Font-Awesome,,fontawesome.com,5.0.8,add 'fonts' to main sheet
DataTables Buttons,,www.datatables.net,1.5.1,
DataTables Responsive,,www.datatables.net,2.2.1,
,,,,
Expand Down
35 changes: 35 additions & 0 deletions external/elFinder/Changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,38 @@
2018-03-14 Naoki Sawada <hypweb+elfinder@gmail.com>

* elFinder (2.1.33):
- [cmd:upload] Fixed #2379 icon of target folder list is not shown
- [js:core] Fixed #2378 sometime can't upload from directory selector
- [cmd:edit] Fixed #2381 trigger event "editEditorPrepare" before build editor
- [cmd:edit] Fixed #2382 can't reopen editor on return from canceling SaveAs from cancel action
- [cmd:edit] Fixed #2383 can't use CodeMirror, SimpleMDE with require.js
- [VD:MySQL] Fixed #2384 infinitely loop on search if root has parent_id
- [js:extras:editors] add CKEditor5 editor
- [js,css] Fixed #2390 optimization to mobile devices
- [cmd:search] Fixed #2392 broken search design in current nightlty
- [php:core] Fixed #2393 strange corruption of PHP internal_encoding
- [js] Fixed #2401 remove deprecated functions of jQuery
- [js] Fixed #2401 change `on('hover')` to `on('mouseenter mouseleave')`
- [php:core] Fixed #2402 add an option `memoryLimitGD` to connector main options
- [js:core] Fixed #2403 backward compatibility with API 2.0 is broken
- [cmd:edit] Fixed #2405 mount the zip archive to edit archive contents
- [VD:abstract] Fixed #2407 include the leaf root into search results
- [VD:abstract] Fixed #2408 have the generic archive function for remote volume
- [js:core] optimization of handling of leafRoots
- [cmd:netmount] also unmount volumes included in volume to be unmounted
- [i18n:LANG] add 'reflectOnImmediate','reflectOnUnmount','unmountChildren'
- [cmd:netmount] follow the tree in reverse and unmount them in order
- [php:core] add 'netmount' to `sessionUseCmds` for handle requests synchronously on unmount
- [VD:Group] correction of `dirs` result of root stat
- [VD] allow uploading all file types to the net mount volume
- [cmd:quicklook] add the MarkDown viewer with marked.js
- [js:core] Fixed #2413 problem that unnecessary "remove" event fires on upload
- [cmd:info] show the md5, sha256 contents hashes
- [cmd:help] add preference "Algorithms to show the file hash"
- [js:rename] Fixed #2419 allow rename of the volume root name
- And some minor bug fixes


2018-02-07 Naoki Sawada <hypweb+elfinder@gmail.com>

* elFinder (2.1.32):
Expand Down
7 changes: 4 additions & 3 deletions external/elFinder/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ elFinder is an open-source file manager for web, written in JavaScript using
jQuery UI. Creation is inspired by simplicity and convenience of Finder program
used in Mac OS X operating system.

[![Download now!](http://studio-42.github.io/elFinder/images/download-icon.png)](https://github.com/Studio-42/elFinder/releases/latest)
[![Packagist License](https://poser.pugx.org/studio-42/elfinder/license.png)](http://choosealicense.com/licenses/bsd-3-clause/)
[![Download now!](https://studio-42.github.io/elFinder/images/download-icon.png)](https://github.com/Studio-42/elFinder/releases/latest)
[![Packagist License](https://poser.pugx.org/studio-42/elfinder/license.png)](https://choosealicense.com/licenses/bsd-3-clause/)
[![Latest Stable Version](https://poser.pugx.org/studio-42/elfinder/version.png)](https://packagist.org/packages/studio-42/elfinder)
[![Total Downloads](https://poser.pugx.org/studio-42/elfinder/d/total.png)](https://packagist.org/packages/studio-42/elfinder)
[![CDNJS version](https://img.shields.io/cdnjs/v/elfinder.svg)](https://cdnjs.com/libraries/elfinder)
Expand Down Expand Up @@ -103,6 +103,7 @@ Requirements
### Server
* Any web server
* PHP 5.2+ (Recommend PHP 5.4 or higher) And for thumbnails - GD / Imagick module / convert(imagemagick) require
* Recommend PHP 7.1 or higher to supports non-ASCII character of file path/name on the Windows server

Installation
------------
Expand All @@ -127,7 +128,7 @@ Installation
Downloads
------------
**Stable releases** ([Changelog](https://github.com/Studio-42/elFinder/blob/master/Changelog))
+ [elFinder 2.1.32](https://github.com/Studio-42/elFinder/archive/2.1.32.zip)
+ [elFinder 2.1.33](https://github.com/Studio-42/elFinder/archive/2.1.33.zip)
+ [elFinder 2.0.9](https://github.com/Studio-42/elFinder/archive/2.0.9.zip) (deprecated)

**Nightly builds**
Expand Down
14 changes: 12 additions & 2 deletions external/elFinder/css/commands.css
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,10 @@
.elfinder-touch .elfinder-file-edit {
font-size: 16px;
}
/* edit area */
.ui-dialog .ui-dialog-content.elfinder-edit-editor {
background-color: #fff;
}
/* bottom margen for softkeyboard on fullscreen mode */
.elfinder-touch.elfinder-fullscreen-native textarea.elfinder-file-edit {
padding-bottom: 20em;
Expand Down Expand Up @@ -490,10 +494,16 @@ div.elfinder-cwd-wrapper-list tr.ui-state-default td span.ui-icon {
display: inline-block;
cursor: pointer;
}
.elfinder-help-preference dd.elfinder-help-toolbarPref,
.elfinder-help-preference dd.elfinder-help-columnPref {
.elfinder-help-preference dt.elfinder-help-checkboxes {
width: 100%;
max-width: none;
}
.elfinder-help-preference dd.elfinder-help-checkboxes {
padding-top: 3ex;
}
.elfinder-help-preference select {
max-width: 100%;
}

/********************** COMMAND "INFO" ****************************/
.elfinder-rtl .elfinder-info-title .elfinder-cwd-icon:before {
Expand Down
4 changes: 4 additions & 0 deletions external/elFinder/css/common.css
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@
font-family: Verdana,Arial,Helvetica,sans-serif;
}

.elfinder-font-mono {
line-height: 2ex;
}

/* in lazy execution status */
.elfinder.elfinder-processing * {
cursor: progress !important
Expand Down
1 change: 1 addition & 0 deletions external/elFinder/css/contextmenu.css
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
.elfinder-navbar-root-googledrive.elfinder-contextmenu-icon { background-image:url("../img/volume_icon_googledrive.png"); }
.elfinder-navbar-root-onedrive.elfinder-contextmenu-icon { background-image:url("../img/volume_icon_onedrive.png"); }
.elfinder-navbar-root-box.elfinder-contextmenu-icon { background-image:url("../img/volume_icon_box.png"); }
.elfinder-navbar-root-zip.elfinder-contextmenu-icon { background-image:url("../img/volume_icon_zip.png"); }

/* text in item */
.elfinder .elfinder-contextmenu .elfinder-contextmenu-item span { display:block; }
Expand Down
7 changes: 7 additions & 0 deletions external/elFinder/css/cwd.css
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,13 @@
background-position:0 0;
background-size: contain;
}
.elfinder-navbar-root-zip .elfinder-cwd-icon,
.elfinder-cwd .elfinder-navbar-root-zip.elfinder-droppable-active .elfinder-cwd-icon,
.elfinder-cwd-view-list .elfinder-navbar-root-zip td .elfinder-cwd-icon {
background-image:url("../img/volume_icon_zip.png");
background-position:0 0;
background-size: contain;
}
.elfinder-cwd .elfinder-navbar-root-googledrive.elfinder-droppable-active .elfinder-cwd-icon,
.elfinder-cwd .elfinder-navbar-root-onedrive.elfinder-droppable-active .elfinder-cwd-icon,
.elfinder-cwd .elfinder-navbar-root-box.elfinder-droppable-active .elfinder-cwd-icon {
Expand Down
15 changes: 14 additions & 1 deletion external/elFinder/css/dialog.css
Original file line number Diff line number Diff line change
Expand Up @@ -316,9 +316,22 @@
min-width:200px;
border:0 solid;
margin:1em .2em 1em .2em;
width: 100%;
}

.elfinder-info-tb td { white-space:nowrap; padding:2px; }
.elfinder-info-tb td {
white-space: pre-wrap;
padding: 2px;
}

.elfinder-info-tb td.elfinder-info-label {
white-space: nowrap;
}

.elfinder-info-tb td.elfinder-info-hash {
word-break: break-word;
max-width: 32em;
}

.elfinder-info-tb tr td:first-child { text-align:right; }

Expand Down
5 changes: 5 additions & 0 deletions external/elFinder/css/fonts.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
.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; }
Expand Down
1 change: 1 addition & 0 deletions external/elFinder/css/navbar.css
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@
.elfinder-tree .elfinder-navbar-root-googledrive .elfinder-navbar-icon { background-image:url("../img/volume_icon_googledrive.png"); background-position:0 0; }
.elfinder-tree .elfinder-navbar-root-onedrive .elfinder-navbar-icon { background-image:url("../img/volume_icon_onedrive.png"); background-position:0 0; }
.elfinder-tree .elfinder-navbar-root-box .elfinder-navbar-icon { background-image:url("../img/volume_icon_box.png"); background-position:0 0; }
.elfinder-tree .elfinder-navbar-root-zip .elfinder-navbar-icon { background-image:url("../img/volume_icon_zip.png"); background-position:0 0; }
.elfinder-tree .elfinder-navbar-root-network .elfinder-navbar-icon { background-image:url("../img/toolbar.png"); background-position: 0 -688px; }

/* icon in active/hove/dropactive state */
Expand Down
51 changes: 38 additions & 13 deletions external/elFinder/css/toolbar.css
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
border-left:0 solid transparent;
border-top:0 solid transparent;
border-right:0 solid transparent;
max-height: 50%;
overflow-y: auto;
}

/* container for button's group */
Expand Down Expand Up @@ -175,13 +177,12 @@
/* menu */
.elfinder-button-menu {
position:absolute;
left:0;
top:25px;
padding:3px 0;
margin-top: 24px;
padding: 3px 0;
}

.elfinder-touch .elfinder-button-menu {
top:35px;
margin-top: 30px;
}

/* menu item */
Expand Down Expand Up @@ -234,23 +235,46 @@
height: auto;
min-height: 26px;
float:right;
width:202px;
width: 70px;
overflow: visible;
}

.elfinder .elfinder-button-search .elfinder-button-menu {
.elfinder .elfinder-button-search.ui-state-active {
width: 220px;
}

/* search "pull down menu" */
.elfinder .elfinder-button-search-menu {
font-size: 8pt;
text-align: center;
width: 100%;
width: auto;
min-width: 180px;
position: absolute;
top: 30px;
padding-right: 5px;
padding-left: 5px;
}
.elfinder-ltr .elfinder-button-search-menu {
right: 22px;
left: auto;
}
.elfinder-rtl .elfinder-button-search-menu {
right: auto;
left: 22px;
}
.elfinder-touch .elfinder-button-search-menu {
top: 34px;
}

.elfinder .elfinder-button-search .elfinder-button-menu div {
.elfinder .elfinder-button-search-menu div {
margin-left: auto;
margin-right: auto;
margin-top: 5px;
margin-bottom: 5px;
display: table;
}

.elfinder .elfinder-button-search .elfinder-button-menu div .ui-state-hover {
.elfinder .elfinder-button-search-menu div .ui-state-hover {
border: 1px solid;
}

Expand All @@ -260,8 +284,9 @@

/* search text field */
.elfinder-button-search input[type=text] {
width:160px;
height:22px;
box-sizing: border-box;
width: 100%;
height: 26px;
padding:0 20px;
line-height: 22px;
border:0 solid;
Expand All @@ -276,7 +301,7 @@
display: none;
}
.elfinder-touch .elfinder-button-search input {
height:28px;
height:30px;
line-height: 28px;
}
.elfinder-rtl .elfinder-button-search input { direction:rtl; }
Expand All @@ -291,7 +316,7 @@
opacity: .6;
filter:Alpha(Opacity=60);
}
.elfinder-button-search .ui-checkboxradio-icon {
.elfinder-button-search-menu .ui-checkboxradio-icon {
display: none;
}

Expand Down
Binary file modified external/elFinder/img/arrows-active.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified external/elFinder/img/arrows-normal.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified external/elFinder/img/crop.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified external/elFinder/img/dialogs.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified external/elFinder/img/edit_aceeditor.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified external/elFinder/img/edit_ckeditor.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added external/elFinder/img/edit_ckeditor5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified external/elFinder/img/edit_codemirror.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified external/elFinder/img/edit_creativecloud.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified external/elFinder/img/edit_pixlreditor.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified external/elFinder/img/edit_pixlrexpress.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified external/elFinder/img/edit_simplemde.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified external/elFinder/img/edit_zohooffice.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified external/elFinder/img/icons-big.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified external/elFinder/img/icons-small.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified external/elFinder/img/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified external/elFinder/img/progress.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified external/elFinder/img/quicklook-bg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified external/elFinder/img/quicklook-icons.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified external/elFinder/img/spinner-mini.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified external/elFinder/img/toolbar.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified external/elFinder/img/ui-icons_ffffff_256x240.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified external/elFinder/img/volume_icon_dropbox.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified external/elFinder/img/volume_icon_ftp.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified external/elFinder/img/volume_icon_googledrive.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified external/elFinder/img/volume_icon_local.png
Binary file modified external/elFinder/img/volume_icon_onedrive.png
Binary file modified external/elFinder/img/volume_icon_sql.png
Binary file modified external/elFinder/img/volume_icon_trash.png
Binary file added external/elFinder/img/volume_icon_zip.png
4 changes: 2 additions & 2 deletions external/elFinder/js/commands/chmod.js
Original file line number Diff line number Diff line change
Expand Up @@ -307,10 +307,10 @@ elFinder.prototype.commands.chmod = function() {
return;
}
}).on('focus', function(e){
$(this).select();
$(this).trigger('select');
}).on('keyup', function(e) {
if ($(this).val().length == 3) {
$(this).select();
$(this).trigger('select');
setcheck($(this).val());
}
});
Expand Down
Loading

0 comments on commit d3953ea

Please sign in to comment.