From 2c989061d4feb028b6bfa259da91fa02a8013c1d Mon Sep 17 00:00:00 2001 From: nao-pon Date: Tue, 14 Mar 2017 22:02:58 +0900 Subject: [PATCH] src build elFinder-2.1-0708b81 --- css/elfinder.full.css | 2 +- css/elfinder.min.css | 2 +- js/elfinder.full.js | 75 +++++++++++++++++++------ js/elfinder.min.js | 22 ++++---- php/elFinderVolumeBox.class.php | 24 +++++--- php/elFinderVolumeDropbox2.class.php | 13 +++-- php/elFinderVolumeGoogleDrive.class.php | 11 +++- php/elFinderVolumeOneDrive.class.php | 24 +++++--- 8 files changed, 125 insertions(+), 48 deletions(-) diff --git a/css/elfinder.full.css b/css/elfinder.full.css index c7e1abaa2..315e2b97a 100644 --- a/css/elfinder.full.css +++ b/css/elfinder.full.css @@ -1,6 +1,6 @@ /*! * elFinder - file manager for web - * Version 2.1.22 (2.1-src Nightly: 4a64b6f) (2017-03-13) + * Version 2.1.22 (2.1-src Nightly: 0708b81) (2017-03-14) * http://elfinder.org * * Copyright 2009-2017, Studio 42 diff --git a/css/elfinder.min.css b/css/elfinder.min.css index 844c916c3..1f0084be5 100644 --- a/css/elfinder.min.css +++ b/css/elfinder.min.css @@ -1,6 +1,6 @@ /*! * elFinder - file manager for web - * Version 2.1.22 (2.1-src Nightly: 4a64b6f) (2017-03-13) + * Version 2.1.22 (2.1-src Nightly: 0708b81) (2017-03-14) * http://elfinder.org * * Copyright 2009-2017, Studio 42 diff --git a/js/elfinder.full.js b/js/elfinder.full.js index b00151c63..d82ed28b2 100644 --- a/js/elfinder.full.js +++ b/js/elfinder.full.js @@ -1,6 +1,6 @@ /*! * elFinder - file manager for web - * Version 2.1.22 (2.1-src Nightly: 4a64b6f) (2017-03-13) + * Version 2.1.22 (2.1-src Nightly: 0708b81) (2017-03-14) * http://elfinder.org * * Copyright 2009-2017, Studio 42 @@ -6561,7 +6561,7 @@ elFinder.prototype = { * @param String protocol * @param String name * @param String host - * @param Object opts Default {noOffline: false, path: 'root', pathI18n: 'folderId'} + * @param Object opts Default {noOffline: false, root: 'root', pathI18n: 'folderId', folders: true} } * * @return Object @@ -6570,9 +6570,54 @@ elFinder.prototype = { var noOffline = typeof opts === 'boolean'? opts : null, // for backward compat opts = $.extend({ noOffline : false, - path : 'root', - pathI18n : 'folderId' - }, (noOffline === null? (opts || {}) : {noOffline : noOffline})); + root : 'root', + pathI18n : 'folderId', + folders : true + }, (noOffline === null? (opts || {}) : {noOffline : noOffline})), + addFolders = function(bro, folders) { + var self = this, + cnt = Object.keys($.isPlainObject(folders)? folders : {}).length, + select; + + bro.next().remove(); + if (cnt) { + select = $(''), - path : $(''), + path : $(''), user : $(''), pass : $('') }, @@ -6629,11 +6674,15 @@ elFinder.prototype = { f0.removeClass('elfinder-info-spinner').removeData('expires').removeData('funcexpup'); f.host.find('input').hover(function(){$(this).toggleClass('ui-state-hover');}); f1.val(''); - f.path.val(opts.path).next().remove(); + f.path.val(opts.root).next().remove(); f.user.val(''); f.pass.val(''); ! opts.noOffline && f.offline.closest('tr').show(); this.vars.mbtn.hide(); + } else if (data.mode == 'folders') { + if (data.folders) { + addFolders.call(this, f.path.nextAll(':last'), data.folders); + } } else { if (data.expires) { expires = '()'; @@ -6668,13 +6717,7 @@ elFinder.prototype = { f1.val(protocol); this.vars.mbtn.show(); if (data.folders) { - f.path.next().remove().end().after( - $('
').append( - $(''),p=this.UA.IE,f=function(){o&&clearTimeout(o),r&&clearTimeout(r),a&&s.notify({type:"upload",cnt:-i}),setTimeout(function(){p&&e('