mirror of
https://github.com/ansible/awx.git
synced 2024-11-01 08:21:15 +03:00
Merge pull request #7179 from mabashian/6442-scroll-top
Scroll the user to the top of the page after a non-search state transition
This commit is contained in:
commit
825dfc9df9
@ -354,7 +354,30 @@ var awApp = angular.module('awApp', [
|
||||
activateTab();
|
||||
});
|
||||
|
||||
$rootScope.$on('$stateChangeSuccess', function(event, toState, toParams, fromState) {
|
||||
$rootScope.$on('$stateChangeSuccess', function(event, toState, toParams, fromState, fromParams) {
|
||||
|
||||
if(toState === fromState) {
|
||||
// check to see if something other than a search param has changed
|
||||
let toParamsWithoutSearchKeys = {};
|
||||
let fromParamsWithoutSearchKeys = {};
|
||||
for (let key in toParams) {
|
||||
if (toParams.hasOwnProperty(key) && !/_search/.test(key)) {
|
||||
toParamsWithoutSearchKeys[key] = toParams[key];
|
||||
}
|
||||
}
|
||||
for (let key in fromParams) {
|
||||
if (fromParams.hasOwnProperty(key) && !/_search/.test(key)) {
|
||||
fromParamsWithoutSearchKeys[key] = fromParams[key];
|
||||
}
|
||||
}
|
||||
|
||||
if(!_.isEqual(toParamsWithoutSearchKeys, fromParamsWithoutSearchKeys)) {
|
||||
document.body.scrollTop = document.documentElement.scrollTop = 0;
|
||||
}
|
||||
}
|
||||
else {
|
||||
document.body.scrollTop = document.documentElement.scrollTop = 0;
|
||||
}
|
||||
|
||||
if (fromState.name === 'license' && toParams.hasOwnProperty('licenseMissing')) {
|
||||
$rootScope.licenseMissing = toParams.licenseMissing;
|
||||
|
Loading…
Reference in New Issue
Block a user