From 99fdd9e7a0bd998a88e5d96827a870fbbd90630a Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Tue, 27 Mar 2012 13:47:29 +0000 Subject: [PATCH] hide divs in browse screen when coming from menu git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1305841 13f79535-47bb-0310-9956-ffa450edef68 --- .../archiva-webapp-js/src/main/webapp/js/archiva/main.js | 2 +- .../archiva-webapp-js/src/main/webapp/js/archiva/search.js | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js index cac5f96f1..59172d612 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js @@ -86,7 +86,7 @@ function() { displayBrowseArtifactDetail(splitted[0],splitted[1],null,null); return; } else if (splitted.length==3) { - generaldisplayArtifactDetailsVersionView(splitted[0],splitted[1],splitted[2],repositoryId); + generalDisplayArtifactDetailsVersionView(splitted[0],splitted[1],splitted[2],repositoryId); return; } else { displayWarningMessage( $.i18n.prop("shortcut.artifact.illegal")); diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js index d76cb2d80..690aabd65 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js @@ -482,6 +482,8 @@ define("search",["jquery","i18n","jquery.tmpl","choosen","order!knockout","knock if(freshView){ mainContent.html($("#browse-tmpl" ).tmpl()); } + mainContent.find("#browse_artifact_detail").hide(); + mainContent.find("#browse_artifact" ).hide(); mainContent.find("#browse_result").html(mediumSpinnerImg()); $.ajax("restServices/archivaServices/browseService/userRepositories", { @@ -1146,11 +1148,11 @@ define("search",["jquery","i18n","jquery.tmpl","choosen","order!knockout","knock displayBrowseArtifactDetail(artifact.groupId,artifact.artifactId,null,null); } artifactDetailView=function(artifact){ - generaldisplayArtifactDetailsVersionView(artifact.groupId,artifact.artifactId,artifact.version,null); + generalDisplayArtifactDetailsVersionView(artifact.groupId,artifact.artifactId,artifact.version,null); } } - generaldisplayArtifactDetailsVersionView=function(groupId,artifactId,version,repositoryId){ + generalDisplayArtifactDetailsVersionView=function(groupId,artifactId,version,repositoryId){ var mainContent=$("#main-content"); mainContent.html($("#browse-tmpl" ).tmpl()); mainContent.find("#browse_result" ).hide(); -- 2.39.5