From 305d083e7c8df4147796e5c2b19402c75674cc89 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Thu, 27 Sep 2012 14:06:12 +0000 Subject: [PATCH] do not modify hash to prevent loosing nav history git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1391018 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/webapp/js/archiva/search.js | 8 ++++++-- .../src/main/webapp/js/templates/archiva/search.html | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) 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 0f9051484..1056580c3 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 @@ -645,7 +645,9 @@ define("archiva.search",["jquery","i18n","jquery.tmpl","choosen","knockout","kno text=text.replace(/>/g,">"); mainContent.find("#artifact-content-text" ).html(text); prettyPrint(); - goToAnchor("artifact-content-text-header"); + // olamy do not move to anchor to not loose nav history + //goToAnchor("artifact-content-text-header"); + //window.location.href=window.location+"#artifact-content-text-header"; } }); return; @@ -679,7 +681,9 @@ define("archiva.search",["jquery","i18n","jquery.tmpl","choosen","knockout","kno mainContent.find("#artifact-content-text" ).html(smallSpinnerImg()); mainContent.find("#artifact-content-text" ).html(text); prettyPrint(); - goToAnchor("artifact-content-text-header"); + // olamy do not move to anchor to not loose nav history + //goToAnchor("artifact-content-text-header"); + //window.location.href=window.location+"#artifact-content-text-header"; } }); } diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html index 3ea75e7e9..87c179a72 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html @@ -846,7 +846,7 @@