]> source.dussan.org Git - archiva.git/commitdiff
use animate to avoid collision with hide defined in both jquery and jqueryui
authorOlivier Lamy <olamy@apache.org>
Wed, 15 Jan 2014 03:30:36 +0000 (03:30 +0000)
committerOlivier Lamy <olamy@apache.org>
Wed, 15 Jan 2014 03:30:36 +0000 (03:30 +0000)
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1558287 13f79535-47bb-0310-9956-ffa450edef68

archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/search.js

index 6fc34661c3b39faff6f3fa6e4f0ef7cd57dcc5ab..5b2eeffdc9eaa757ba75263a4cfde00392005237 100644 (file)
@@ -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();