Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix home page project ui not loading #4149 #4977

Merged
merged 3 commits into from
Jun 19, 2019
Merged

Fix home page project ui not loading #4149 #4977

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c7ef57c
fix #4149 correctly trigger project ui loading
gschueler Jun 18, 2019
0129bd7
cleanup: remove prototype .curry
gschueler Jun 18, 2019
2bff132
cleanup js
gschueler Jun 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions rundeckapp/grails-app/assets/javascripts/menu/home.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ function HomeData(data) {
for (var i = 0; i < projs.length; i++) {
var newproj = projs[i];
var found = self.projectForName(newproj.name);
if (found && found.name()==newproj.name) {
if (found && found.name() === newproj.name) {
ko.mapping.fromJS(newproj, null, found);
found.loaded(true);
} else {
Expand Down Expand Up @@ -188,8 +188,7 @@ function HomeData(data) {
if (self.pagingOffset() === -1) {
self.pagingOffset(0);
} else {
setTimeout(self.load.curry(true), self.pagingDelay());
return;
setTimeout(function(){self.load(true);}, self.pagingDelay());
}
}
}
Expand Down Expand Up @@ -296,9 +295,9 @@ function batchInitWaypoints(arr,handler,count){
"use strict";
var arr2=arr.splice(0,count);
if(arr2.length>0) {
jQuery(arr2).waypoint(handler, {offset: '100%'});
jQuery(arr2).waypoint(handler, {context:'#main-panel',offset: '100%'});
if (arr.length > 0) {
_waypointBatchTimer=setTimeout(batchInitWaypoints.curry(arr, handler,count), 1500);
_waypointBatchTimer=setTimeout(function(){batchInitWaypoints(arr, handler,count);}, 1500);
}
}
}
Expand Down Expand Up @@ -334,7 +333,7 @@ function init() {
projectNames: projectNamesData.projectNames.sort(),
projectNamesTotal: projectNamesData.projectNamesTotal || 0
},statsdata));
homedata.loadedProjectNames(projectNamesData.projectNames.length == projectNamesData.projectNamesTotal);
homedata.loadedProjectNames(projectNamesData.projectNames.length === projectNamesData.projectNamesTotal);
ko.applyBindings(homedata);

homedata.pagingMax(pageparams.pagingInitialMax || 15);
Expand All @@ -346,7 +345,7 @@ function init() {
homedata.searchedProjects.subscribe(function(val){
"use strict";
//when search results change, refresh waypoints
ko.tasks.schedule(initWaypoints.curry(homedata,true));
ko.tasks.schedule(function(){initWaypoints(homedata,true);});
});
if(homedata.loadedProjectNames()){
//load waypoints manually
Expand Down