seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

VRFS-2217 fixed spec test; cleanup profile feeds issue

This commit is contained in:
Jonathan Kolyer 2014-10-14 07:33:08 +00:00
parent ac57463415
commit 2ac03a912c
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
web/app/assets/javascripts/feedHelper.js
View File

@ -90,9 +90,9 @@
function setLoading(yn) {
isLoading = yn;
if (yn) {
$('#'+screenID()+'loading-feeds').show();
$('#'+screenID()+'-loading-feeds').show();
} else {
$('#'+screenID()+'loading-feeds').hide();
$('#'+screenID()+'-loading-feeds').hide();
}
}
@ -542,7 +542,7 @@
var winheight = $(scrollerID).height();
var docheight = $('#'+screenID()+'-feed-entry-list').height();
var scrollTrigger = 0.90;
console.log("feed scroll: wintop="+wintop+" docheight="+docheight+" winheight="+winheight+" ratio="+(wintop / (docheight - winheight)));
//console.log("feed scroll: wintop="+wintop+" docheight="+docheight+" winheight="+winheight+" ratio="+(wintop / (docheight - winheight)));
if ((wintop / (docheight - winheight)) > scrollTrigger) {
populate();
}

1
web/spec/features/profile_history_spec.rb
View File

@ -24,7 +24,6 @@ describe "Profile History", :js => true, :type => :feature, :capybara_feature =>
# the same feedHelper instance is used to show any user's feed. so we need to make sure bouncing back and forth
# between feeds is safe
it "between users" do
pending
create_session(creator: user)
formal_leave_by(user)
user2 = FactoryGirl.create(:user)