diff --git a/css/elfinder.full.css b/css/elfinder.full.css index a36bef010..4dc316def 100644 --- a/css/elfinder.full.css +++ b/css/elfinder.full.css @@ -1,6 +1,6 @@ /*! * elFinder - file manager for web - * Version 2.1.9 (2.1-src Nightly: 7b38c65) (2016-03-23) + * Version 2.1.9 (2.1-src Nightly: be8b86c) (2016-03-24) * http://elfinder.org * * Copyright 2009-2016, Studio 42 diff --git a/css/elfinder.min.css b/css/elfinder.min.css index 75146fa7a..ea01b091a 100644 --- a/css/elfinder.min.css +++ b/css/elfinder.min.css @@ -1,6 +1,6 @@ /*! * elFinder - file manager for web - * Version 2.1.9 (2.1-src Nightly: 7b38c65) (2016-03-23) + * Version 2.1.9 (2.1-src Nightly: be8b86c) (2016-03-24) * http://elfinder.org * * Copyright 2009-2016, Studio 42 diff --git a/js/elfinder.full.js b/js/elfinder.full.js index a0269382e..9613d6a58 100644 --- a/js/elfinder.full.js +++ b/js/elfinder.full.js @@ -1,6 +1,6 @@ /*! * elFinder - file manager for web - * Version 2.1.9 (2.1-src Nightly: 7b38c65) (2016-03-23) + * Version 2.1.9 (2.1-src Nightly: be8b86c) (2016-03-24) * http://elfinder.org * * Copyright 2009-2016, Studio 42 @@ -4881,7 +4881,7 @@ if (!Object.keys) { * * @type String **/ -elFinder.prototype.version = '2.1.9 (2.1-src Nightly: 7b38c65)'; +elFinder.prototype.version = '2.1.9 (2.1-src Nightly: be8b86c)'; @@ -5350,29 +5350,43 @@ elFinder.prototype._options = { } }, done: function(fm, data){ - var f = this.inputs; + var f = this.inputs, p = this.protocol; if (data.mode == 'makebtn') { $(f.host[0]).removeClass('elfinder-info-spinner'); f.host.find('input').hover(function(){$(this).toggleClass('ui-state-hover');}); $(f.host[1]).val(''); + f.path.val('root').next().remove(); f.user.val(''); f.pass.val(''); f.offline.parent().parent().show(); } else { $(f.host[0]).html('Google.com ').removeClass('elfinder-info-spinner'); + if (data.reset) { + p.trigger('change', 'reset'); + return; + } $(f.host[0]).parent().append($('') .on('click', function() { $(f.host[1]).val('revoke'); - $(this).parents('table.elfinder-netmount-tb').find('select:first').trigger('change', 'reset'); + p.trigger('change', 'reset'); })); $(f.host[1]).val('googledrive'); + if (data.folders) { + f.path.after( + $('
').append( + $(''),h=this.UA.IE,f=function(){o&&clearTimeout(o),r&&clearTimeout(r),a&&s.notify({type:"upload",cnt:-i}),setTimeout(function(){h&&e('