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

[<fg...@us...>]

Revision: 3072
          http://openutils.svn.sourceforge.net/openutils/?rev=3072&view=rev
Author:   fgiust
Date:     2010-09-12 08:04:57 +0000 (Sun, 12 Sep 2010)

Log Message:
-----------
MEDIA-176 search results are kept after editing a media now

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	2010-09-12 07:32:58 UTC (rev 3071)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html	2010-09-12 08:04:57 UTC (rev 3072)
@@ -231,28 +231,32 @@
   var centerPanel = viewport.getComponent('center-panel');
   (selectMedia ? centerPanel : centerPanel.getComponent('center-center-panel')).setTitle("Media - "+ path);
 
-  var url = "${this.request.contextPath}/.magnolia/pages/mediaFolderView.html?path="+ path + "&mgnlCK=" + (new Date()).getTime();
+  var url = frames['mediaFolderView'].location.pathname;
+  
+  var querystring = frames['mediaFolderView'].location.search.substring(1).cleanQueryString().parseQueryString();
+  
+  if (url == "") {
+    url = "${this.request.contextPath}/.magnolia/pages/mediaFolderView.html";
+  }
+  
+  querystring['path'] = path;
+  querystring['mgnlCK'] = (new Date()).getTime();
+  
   if (selectMedia)
   {
-    url += "&selectMedia=true&actMediaHandle="+ actMediaHandle;
+    querystring['selectMedia'] = true;
+    querystring['actMediaHandle'] = actMediaHandle;
   }
   if (type != null && type != 'null')
   {
-    url += "&type=" + type;
+    querystring['type'] = type;
   }
   if (mediaType != null && mediaType != 'null')
   {
-    url += "&mediaType=" + mediaType;
+    querystring['mediaType'] = mediaType;
   }
-
-  var olduri = frames['mediaFolderView'].location.href.parseQueryString();
   
-  if (olduri['page'] != undefined)
-  {
-    url += "&page=" + olduri['page'];
-  }
-  
-  frames['mediaFolderView'].location.href = url;
+  frames['mediaFolderView'].location.href = url + "?" + new Hash(querystring).toQueryString();
 }
 
 function setNewMedia(uuid, thumb, file)


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