diff options
| author | Olivier Lamy <olamy@apache.org> | 2014-01-15 03:30:36 +0000 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2014-01-15 03:30:36 +0000 |
| commit | 7f56a1ff0e3bff4995a1e0667e09941498b149e7 (patch) | |
| tree | 0ec0eeb1d47e078fd3dbea603827f18b8265c0f8 | |
| parent | 6d057edb38ff5313335226c603a51a6988c520d0 (diff) | |
| download | archiva-7f56a1ff0e3bff4995a1e0667e09941498b149e7.tar.gz archiva-7f56a1ff0e3bff4995a1e0667e09941498b149e7.zip | |
use animate to avoid collision with hide defined in both jquery and jqueryui
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1558287 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/search.js | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/search.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/search.js index 6fc34661c..5b2eeffdc 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/search.js +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/search.js @@ -209,7 +209,9 @@ define("archiva.search",["jquery","jquery.ui","i18n","jquery.tmpl","select2","kn browseResult.show(); mainContent.find("#browse_artifact" ).hide(); var browseBreadCrumb=mainContent.find("#browse_breadcrumb"); - mainContent.find("#main_browse_result_content").hide( "slide", {}, 300, + $.log("before slide"); + //mainContent.find("#main_browse_result_content").hide( "slide", {}, 300, + mainContent.find("#main_browse_result_content").animate( {},300,"slide", function(){ browseResult.html(mediumSpinnerImg()); browseBreadCrumb.html(smallSpinnerImg()); @@ -378,8 +380,8 @@ define("archiva.search",["jquery","jquery.ui","i18n","jquery.tmpl","select2","kn } this.display=function(afterCallbackFn){ - mainContent.find("#browse_breadcrumb").hide("slide", {}, 300,function(){ - mainContent.find("#browse_artifact").hide("slide", {}, 300,function(){ + mainContent.find("#browse_breadcrumb").animate({},300,"slide",function(){ + mainContent.find("#browse_artifact").animate({},300,"slide",function(){ mainContent.find("#browse_artifact_detail").show(); mainContent.find("#browse_artifact_detail").html(mediumSpinnerImg()); @@ -1285,7 +1287,7 @@ define("archiva.search",["jquery","jquery.ui","i18n","jquery.tmpl","select2","kn mainContent.find("#browse_artifact_detail").hide(); mainContent.find("#browse_result").hide(); $.log("before slide"); - mainContent.find("#main_browse_result_content").hide("slide", {}, 300,function(){ + mainContent.find("#main_browse_result_content").animate({},300,"slide",function(){ $.log("yup"); mainContent.find("#browse_breadcrumb").html(smallSpinnerImg()); mainContent.find("#browse_artifact").show(); |