[Openutils-svn] SF.net SVN: openutils:[3580] trunk/openutils-mgnlmedia/src/main/resources/ net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html

[<die...@us...>]

Revision: 3580
          http://openutils.svn.sourceforge.net/openutils/?rev=3580&view=rev
Author:   diego_schivo
Date:     2011-07-11 15:03:12 +0000 (Mon, 11 Jul 2011)

Log Message:
-----------
MEDIA-246 /blank

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html

Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html	2011-07-11 14:38:04 UTC (rev 3579)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html	2011-07-11 15:03:12 UTC (rev 3580)
@@ -33,7 +33,6 @@
   {
     url += "&mediaType=" + encodeURIComponent(mediaType);
   }
-  alert(url);
   return url;
 }
 
@@ -50,14 +49,14 @@
   var centerPanel = viewport.getComponent('center-panel');
   (selectMedia ? centerPanel : centerPanel.getComponent('center-center-panel')).setTitle("Search results for : "+ textToSearch);
 
-  var url = "${this.request.contextPath}/.magnolia/pages/mediaFolderView.html?search="+ textToSearch + "&mgnlCK=" + (new Date()).getTime();
+  var url = "${this.request.contextPath}/.magnolia/pages/mediaFolderView.html?search=" + encodeURIComponent(textToSearch) + "&mgnlCK=" + (new Date()).getTime();
   if (selectMedia)
   {
-    url += "&selectMedia=true&actMediaHandle="+ actMediaHandle;
+    url += "&selectMedia=true&actMediaHandle=" + encodeURIComponent(actMediaHandle);
   }
   if (mediaType != null && mediaType != 'null')
   {
-    url += "&mediaType=" + mediaType;
+    url += "&mediaType=" + encodeURIComponent(mediaType);
   }
   frames['mediaFolderView'].location.href = url;
 }
@@ -138,7 +137,7 @@
   setTimeout(function() {
     setTreeCollapsed(false);
     frames['mediaTreeView'].location.href = getTreeUrl();
-    frames['advancedSearchView'].location.href = "${this.request.contextPath}/.magnolia/pages/media-advsearchform.html?selectMedia="+selectMedia+"&playlistHandle=${this.playlistHandle!''}&${this.playlistSearch!''}";
+    frames['advancedSearchView'].location.href = "${this.request.contextPath}/.magnolia/pages/media-advsearchform.html?selectMedia="+encodeURIComponent(selectMedia)+"&playlistHandle=${this.playlistHandle!''}&${this.playlistSearch!''}";
     if (openPath != null && openPath != "null" && openPath.length > 0)
     {
       reloadFolder(openPath);
@@ -234,8 +233,8 @@
   (selectMedia ? centerPanel : centerPanel.getComponent('center-center-panel')).setTitle("Media - "+ path);
 
   var url = frames['mediaFolderView'].location.pathname;
-  // fix 404 on Chromium
-  if (url == 'blank') url = '';
+  // fix 404 on Chromium and IE8
+  if (url == 'blank' || url == '/blank') url = '';
   
   var querystringoriginal = frames['mediaFolderView'].location.search.substring(1).cleanQueryString().parseQueryString();
    


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.