From 6de50d0d6c89e17a9a4c2396719f18ca1cc346c7 Mon Sep 17 00:00:00 2001
From: Kevin Roast <kevin.roast@alfresco.com>
Date: Mon, 11 Jun 2007 10:41:11 +0000
Subject: [PATCH] Fix to Upload action in MySpaces portlet when running in the
 JSF dashboard environment. Fix to expanding space panel issue when clicking
 on a folder to navigate.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5907 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../webscripts/org/alfresco/portlets/myspaces.get.html.ftl      | 2 +-
 source/web/scripts/ajax/myspaces.js                             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/alfresco/templates/webscripts/org/alfresco/portlets/myspaces.get.html.ftl b/config/alfresco/templates/webscripts/org/alfresco/portlets/myspaces.get.html.ftl
index 5466ef68ec..e83e5e54ba 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/portlets/myspaces.get.html.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/portlets/myspaces.get.html.ftl
@@ -57,7 +57,7 @@
       <div class="spaceToolbarAction spaceToolbarActionUpload" title="Upload a new document" <#if home.hasPermission("CreateChildren")>onclick="MySpaces.upload(this);"</#if>>Upload</div>
       <div class="spaceUploadPanel">
          <#-- Url encode the path value, and encode any single quotes to generate valid string -->
-         <input class="spaceFormItem" type="submit" value="OK" onclick='MySpaces.uploadOK(this, "${path?url?replace("'","_%_")}");'>
+         <input class="spaceFormItem" type="button" value="OK" onclick='MySpaces.uploadOK(this, "${path?url?replace("'","_%_")}");'>
          <input class="spaceFormItem" type="button" value="Cancel" onclick="MySpaces.closePopupPanel();">
       </div>
       <#-- Create Space action -->
diff --git a/source/web/scripts/ajax/myspaces.js b/source/web/scripts/ajax/myspaces.js
index cc702c1246..ca3968d517 100644
--- a/source/web/scripts/ajax/myspaces.js
+++ b/source/web/scripts/ajax/myspaces.js
@@ -36,7 +36,7 @@ var MySpaces = {
                   var navImgs  = $$('#spacePanel .spaceNavLinkImg');
                   navLinks.each(function(navLink, i)
                   {
-                     navLink.setHTML('<a href="' + MySpaces.ScriptUrlEncoder.encUrl(navLink.innerHTML.replace(/&amp;/, "&")) + '">' + navImgs[i].innerHTML + '</a>');
+                     navLink.setHTML('<span onclick="event.cancelBubble=true"><a href="' + MySpaces.ScriptUrlEncoder.encUrl(navLink.innerHTML.replace(/&amp;/, "&")) + '">' + navImgs[i].innerHTML + '</a></span>');
                      navImgs[i].innerHTML = "";    // remove the html so the class is not selected during init()
                   });
                   // extract the count value from a hidden div and display it