diff --git a/media/media/js/popup-imagemanager.js b/media/media/js/popup-imagemanager.js
index b7e656ec50b04..f751f99103756 100644
--- a/media/media/js/popup-imagemanager.js
+++ b/media/media/js/popup-imagemanager.js
@@ -99,7 +99,7 @@
*/
getImageFolder: function ()
{
- return this.getQueryObject(this.frame.location.search.substring(1)).folder;
+ return this.getQueryObject(this.frame.location.search.substring(1)).folder.replace(/%2F/gi, "/");
},
/**
@@ -178,6 +178,7 @@
*/
setFolder: function (folder, asset, author)
{
+ folder = folder.replace(/%2F/gi, "/");
for (var i = 0, l = this.folderlist.length; i < l; i++)
{
if (folder == this.folderlist.options[i].value)
diff --git a/media/media/js/popup-imagemanager.min.js b/media/media/js/popup-imagemanager.min.js
index 04ec4850e2f9c..464cacf0aa426 100644
--- a/media/media/js/popup-imagemanager.min.js
+++ b/media/media/js/popup-imagemanager.min.js
@@ -1 +1 @@
-!function(e,t){"use strict";window.ImageManager={initialize:function(){var i=this.getUriObject(window.self.location.href),a=this.getQueryObject(i.query),r=Joomla.getOptions("mediamanager");this.author=r.author,this.base=r.base,this.asset=r.asset,this.editor=decodeURIComponent(a.e_name),this.fields={url:t.getElementById("f_url"),alt:t.getElementById("f_alt"),align:t.getElementById("f_align"),title:t.getElementById("f_title"),caption:t.getElementById("f_caption"),c_class:t.getElementById("f_caption_class")},this.folderlist=t.getElementById("folderlist"),this.frame=window.frames.imageframe,this.frameurl=this.frame.location.href,e("#imageframe").on("load",function(){ImageManager.onloadimageview()}),e("#upbutton").off("click").on("click",function(){ImageManager.upFolder()})},onloadimageview:function(){var t,i,a=this.getImageFolder(),r=e("#uploadForm"),s="";this.frameurl=this.frame.location.href,this.setFolder(a),t=this.getUriObject(r.attr("action")),(i=this.getQueryObject(t.query)).folder=a,t.query=e.param(i),void 0!==t.port&&80!=t.port&&(s=":"+t.port),r.attr("action",t.scheme+"://"+t.domain+s+t.path+"?"+t.query)},getImageFolder:function(){return this.getQueryObject(this.frame.location.search.substring(1)).folder},onok:function(){var e="",t=[],i="",a="",r=this.fields.url.value,s=this.fields.alt.value,o=this.fields.align.value,l=this.fields.title.value,n=this.fields.caption.value,c=this.fields.c_class.value;return r&&(t.push('alt="'+s+'"'),o&&!n&&t.push('class="pull-'+o+'"'),l&&t.push('title="'+l+'"'),e='",n&&(o&&(i=' class="pull-'+o+'"'),c&&(a=' class="'+c+'"'),e="")),window.Joomla&&Joomla.editors.instances.hasOwnProperty(this.editor)?Joomla.editors.instances[editor].replaceSelection(e):window.parent.jInsertEditorText(e,this.editor),!0},setFolder:function(t,i,a){for(var r=0,s=this.folderlist.length;r:first-child").remove(),i.append(t),e("#messages").css("display","block")},refreshFrame:function(){this.frame.location.href=this.frameurl},setFrameUrl:function(t,i,a){var r={option:"com_media",view:"imagesList",tmpl:"component",asset:i,author:a};this.frameurl="index.php?"+e.param(r)+"&folder="+t,this.frame.location.href=this.frameurl},getQueryObject:function(t){var i={};return e.each((t||"").split(/[&;]/),function(e,t){var a=t.split("=");i[a[0]]=2==a.length?a[1]:null}),i},getUriObject:function(t){var i={},a=t.match(/^(?:([^:\/?#.]+):)?(?:\/\/)?(([^:\/?#]*)(?::(\d*))?)((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[\?#]|$)))*\/?)?([^?#\/]*))?(?:\?([^#]*))?(?:#(.*))?/);return e.each(["uri","scheme","authority","domain","port","path","directory","file","query","fragment"],function(e,t){i[t]=a&&a[e]?a[e]:""}),i}},e(function(){window.ImageManager.initialize()})}(jQuery,document);
\ No newline at end of file
+(function($,doc){'use strict';window.ImageManager={initialize:function(){var o=this.getUriObject(window.self.location.href),q=this.getQueryObject(o.query);var options=Joomla.getOptions('mediamanager');this.author=options.author;this.base=options.base;this.asset=options.asset;this.editor=decodeURIComponent(q.e_name);this.fields={'url':doc.getElementById("f_url"),'alt':doc.getElementById("f_alt"),'align':doc.getElementById("f_align"),'title':doc.getElementById("f_title"),'caption':doc.getElementById("f_caption"),'c_class':doc.getElementById("f_caption_class")};this.folderlist=doc.getElementById('folderlist');this.frame=window.frames.imageframe;this.frameurl=this.frame.location.href;$('#imageframe').on('load',function(){ImageManager.onloadimageview()});$('#upbutton').off('click').on('click',function(){ImageManager.upFolder()})},onloadimageview:function(){var folder=this.getImageFolder(),$form=$('#uploadForm'),portString='',a,q;this.frameurl=this.frame.location.href;this.setFolder(folder);a=this.getUriObject($form.attr('action'));q=this.getQueryObject(a.query);q.folder=folder;a.query=$.param(q);if(typeof(a.port)!=='undefined'&&a.port!=80){portString=':'+a.port}$form.attr('action',a.scheme+'://'+a.domain+portString+a.path+'?'+a.query)},getImageFolder:function(){return this.getQueryObject(this.frame.location.search.substring(1)).folder.replace(/%2F/gi,"/")},onok:function(){var tag='',attr=[],figclass='',captionclass='',url=this.fields.url.value,alt=this.fields.alt.value,align=this.fields.align.value,title=this.fields.title.value,caption=this.fields.caption.value,c_class=this.fields.c_class.value;if(url){attr.push('alt="'+alt+'"');if(align&&!caption){attr.push('class="pull-'+align+'"')}if(title){attr.push('title="'+title+'"')}tag='';if(caption){if(align){figclass=' class="pull-'+align+'"'}if(c_class){captionclass=' class="'+c_class+'"'}tag=''}}if(window.Joomla&&Joomla.editors.instances.hasOwnProperty(this.editor)){Joomla.editors.instances[editor].replaceSelection(tag)}else{window.parent.jInsertEditorText(tag,this.editor)}return true},setFolder:function(folder,asset,author){folder=folder.replace(/%2F/gi,"/");for(var i=0,l=this.folderlist.length;i:first-child').remove();$message.append(text);$('#messages').css('display','block')},refreshFrame:function(){this.frame.location.href=this.frameurl},setFrameUrl:function(folder,asset,author){var qs={option:'com_media',view:'imagesList',tmpl:'component',asset:asset,author:author};this.frameurl='index.php?'+$.param(qs)+'&folder='+folder;this.frame.location.href=this.frameurl},getQueryObject:function(q){var rs={};$.each((q||'').split(/[&;]/),function(key,val){var keys=val.split('=');rs[keys[0]]=keys.length==2?keys[1]:null});return rs},getUriObject:function(u){var bitsAssociate={},bits=u.match(/^(?:([^:\/?#.]+):)?(?:\/\/)?(([^:\/?#]*)(?::(\d*))?)((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[\?#]|$)))*\/?)?([^?#\/]*))?(?:\?([^#]*))?(?:#(.*))?/);$.each(['uri','scheme','authority','domain','port','path','directory','file','query','fragment'],function(key,index){bitsAssociate[index]=(!!bits&&!!bits[key])?bits[key]:''});return bitsAssociate}};$(function(){window.ImageManager.initialize()})}(jQuery,document));
\ No newline at end of file