nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #4752 from svbergerem/fix-timeago-mobile

Browse source 
Fix timeago on mobile devices. Fix missing space
This commit is contained in:
Jonne Haß 2014-02-02 07:32:27 -08:00
commit d5207d61d4
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/assets/javascripts/mobile.js
View file

@ -126,10 +126,12 @@ $(document).ready(function(){
link.addClass('active');
existingCommentsContainer.show();
scrollToOffset(parent, commentsContainer());
commentsContainer().find('time.timeago').timeago();
}
});
} else {
existingCommentsContainer.show();
existingCommentsContainer.find('time.timeago').timeago();
}
link.addClass('active');
@ -141,10 +143,10 @@ $(document).ready(function(){
parent.append(data);
link.addClass('active');
scrollToOffset(parent, commentsContainer());
commentsContainer().find('time.timeago').timeago();
}
});
}
});
var scrollToOffset = function(parent, commentsContainer){
@ -232,6 +234,7 @@ $(document).ready(function(){
reactionLink.text(reactionLink.text().replace(/(\d+)/, function(match){ return parseInt(match) + 1; }));
commentCount.text(commentCount.text().replace(/(\d+)/, function(match){ return parseInt(match) + 1; }));
commentActionLink.addClass("inactive");
bottomBar.find('time.timeago').timeago();
}, 'html');
});

1
config/locales/javascript/javascript.en.yml
View file

@ -31,6 +31,7 @@ en:
months: "%d months"
year: "about a year"
years: "%d years"
wordSeparator: " "
my_activity: "My Activity"
my_stream: "Stream"