Improvements to mediamanager.js and popup-imagemanager.js

media/media/js/mediamanager.js

@@ -26,7 +26,12 @@
 			this.updatepaths = $( 'input.update-folder' );
 
 			this.frame = window.frames.folderframe;
-			this.frameurl = this.frame.location.href;
+
+			var self = this;
+
+			$(this.frame).one('load', function (e) {
+				self.frameurl = self.frame.location.href;
+			});
 		},
 
 		/**
@@ -59,30 +64,30 @@
 
 			var folder = this.getFolder() || '',
 				query = [],
-				a = getUriObject( $( '#uploadForm' ).attr( 'action' ) ),
+				a = getUriObject( $( '#uploadForm' ).prop( 'action' ) ),
 				q = getQueryObject( a.query ),
 				k, v;
 
 			this.updatepaths.each( function( path, el ) {
 				el.value = folder;
 			} );
 
-			this.folderpath.value = basepath + (folder ? '/' + folder : '');
+			this.folderpath.value = scope.basepath + (folder ? '/' + folder : '');
 
 			q.folder = folder;
 
 			for ( k in q ) {
 				if (!q.hasOwnProperty( k )) { continue; }
 
 				v = q[ k ];
-				query.push( k + (v === null ? '' : '=' + v) );
+				query.push(encodeURIComponent(k) + (v === null ? '' : '=' + encodeURIComponent(v)));
 			}
 
 			a.query = query.join( '&' );
 			a.fragment = null;
 
-			$( '#uploadForm' ).attr( 'action', buildUri(a) );
-			$( '#' + viewstyle ).addClass( 'active' );
+			$( '#uploadForm' ).prop( 'action', buildUri(a) );
+			$( '#' + scope.viewstyle ).addClass( 'active' );
 		},
 
 		/**
@@ -92,10 +97,13 @@
 		 */
 		setViewType: function( type ) {
 			$( '#' + type ).addClass( 'active' );
-			$( '#' + viewstyle ).removeClass( 'active' );
-			viewstyle = type;
+			$( '#' + scope.viewstyle ).removeClass( 'active' );
+			scope.viewstyle = type;
 			var folder = this.getFolder();
 
+			folder = encodeURIComponent(folder);
+			type = encodeURIComponent(type);
+
 			this.setFrameUrl( 'index.php?option=com_media&view=mediaList&tmpl=component&folder=' + folder + '&layout=' + type );
 		},
 
@@ -181,10 +189,12 @@
 		MediaManager.initialize();
 
 		document.updateUploader = function() {
-			MediaManager.onloadframe();
+			$(MediaManager.frame).one('load', function() {
+				MediaManager.onloadframe();
+			});
 		};
 
-		MediaManager.onloadframe();
+		document.updateUploader();
 	});
 
 }( jQuery, window ));

media/media/js/popup-imagemanager.js

@@ -32,7 +32,7 @@
 			this.author = options.author;
 			this.base   = options.base;
 			this.asset  = options.asset;
-			this.editor = decodeURIComponent(q.e_name);
+			this.editor = q.e_name;
 
 			// Setup image manager fields object
 			this.fields = {
@@ -79,7 +79,7 @@
 			this.frameurl = this.frame.location.href;
 			this.setFolder(folder);
 
-			a = this.getUriObject($form.attr('action'));
+			a = this.getUriObject($form.prop('action'));
 			q = this.getQueryObject(a.query);
 			q.folder = folder;
 			a.query = $.param(q);
@@ -89,7 +89,7 @@
 				portString = ':' + a.port;
 			}
 
-			$form.attr('action', a.scheme + '://' + a.domain + portString + a.path + '?' + a.query);
+			$form.prop('action', a.scheme + '://' + a.domain + portString + a.path + '?' + a.query);
 		},
 
 		/**
@@ -99,7 +99,7 @@
 		 */
 		getImageFolder: function ()
 		{
-			return this.getQueryObject(this.frame.location.search.substring(1)).folder.replace(/%2F/gi, "/");
+			return this.getQueryObject(this.frame.location.search.substring(1)).folder;
 		},
 
 		/**
@@ -178,7 +178,6 @@
 		 */
 		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)
@@ -277,11 +276,12 @@
 				view: 'imagesList',
 				tmpl: 'component',
 				asset: asset,
-				author: author
+				author: author,
+				folder: folder
 			};
 
 			// Don't run folder through params because / will end up double encoded.
-			this.frameurl = 'index.php?' + $.param(qs) + '&folder=' + folder;
+			this.frameurl = 'index.php?' + $.param(qs);
 			this.frame.location.href = this.frameurl;
 		},
 
@@ -300,7 +300,7 @@
 			{
 				var keys = val.split('=');
 
-				rs[keys[0]] = keys.length == 2 ? keys[1] : null;
+				rs[ decodeURIComponent(keys[0]) ] = keys.length == 2 ? decodeURIComponent(keys[1]) : null;
 			});
 
 			return rs;