External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-04-14 06:29:25 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7179 from mabashian/6442-scroll-top

Browse Source 
Scroll the user to the top of the page after a non-search state transition
This commit is contained in:
Michael Abashian
2017-07-21 11:04:16 -04:00
committed by GitHub
parent 2460ade49d 54eaa6e8d1
commit 825dfc9df9
1 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
awx/ui/client/src/app.js
View File

@@ -354,7 +354,30 @@ var awApp = angular.module('awApp', [
activateTab(); 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')) { if (fromState.name === 'license' && toParams.hasOwnProperty('licenseMissing')) {
$rootScope.licenseMissing = toParams.licenseMissing; $rootScope.licenseMissing = toParams.licenseMissing;