diff --git a/war/src/main/js/add-item.js b/war/src/main/js/add-item.js index 0c7abccbd7..4540cdfb89 100644 --- a/war/src/main/js/add-item.js +++ b/war/src/main/js/add-item.js @@ -63,7 +63,14 @@ $.when(getItems()).done(function(data){ //////////////////////////////// // scroll action...... + var isManualScrolling = false; function watchScroll(){ + if (isManualScrolling) { + // We ignore scroll events when a manual scroll is in + // operation e.g. when the user clicks on a category tab. + return; + } + var $window = $(window); var $jenkTools = $('#breadcrumbBar'); var winScoll = $window.scrollTop(); @@ -253,7 +260,6 @@ $.when(getItems()).done(function(data){ if(!elem) {elem = i;} var $tab = $(['
  • ',elem.name,'
  • '].join('')) .click(function(){ - //e.preventDefault(e); var $this = $(this).children('a'); var tab = $this.attr('href'); @@ -261,9 +267,12 @@ $.when(getItems()).done(function(data){ setTimeout(function(){resetActiveTab($this);},510); + isManualScrolling = true; $('html,body').animate({ scrollTop: scrollTop - }, 500); + }, 500, function() { + isManualScrolling = false; + }); }); return $tab; }