diff --git a/app/views/shared/_stream_element.html.haml b/app/views/shared/_stream_element.html.haml
index cfbfbdfee..44ce12d3a 100644
--- a/app/views/shared/_stream_element.html.haml
+++ b/app/views/shared/_stream_element.html.haml
@@ -33,7 +33,7 @@
%span.aspect_badges
= aspect_badges(aspects_with_post(all_aspects, post), :link => true)
- %span.timeago.time
+ %span.timeago
= link_to(how_long_ago(post), status_message_path(post))
- unless (defined?(@commenting_disabled) && @commenting_disabled)
diff --git a/db/seeds.rb b/db/seeds.rb
index ef0d81083..7d8dd676c 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -34,8 +34,8 @@ time_interval = 1000
(1..25).each do |n|
[alice, bob, eve].each do |u|
post = u.post :status_message, :text => "#{u.username} - #{n} - #seeded", :to => u.aspects.first.id
- post.created_at = post.created_at + time_interval
- post.updated_at = post.updated_at + time_interval
+ post.created_at = post.created_at - time_interval
+ post.updated_at = post.updated_at - time_interval
post.save
time_interval += 1000
end
diff --git a/public/javascripts/aspect-filters.js b/public/javascripts/aspect-filters.js
index b41db702b..04c5564db 100644
--- a/public/javascripts/aspect-filters.js
+++ b/public/javascripts/aspect-filters.js
@@ -27,33 +27,29 @@ var AspectFilters = {
});
},
interceptAspectLinks: function(){
- $("a.hard_aspect_link").live("click", function(e){
- var link = $(this);
- if( !link.hasClass('aspect_selector') ){
- e.preventDefault();
- AspectFilters.requests++;
+ $("a.hard_aspect_link").live("click", AspectFilters.aspectLinkClicked);
+ },
+ aspectLinkClicked: function(e){
+ var link = $(this);
+ e.preventDefault();
+ if( !link.hasClass('aspect_selector') ){
+ AspectFilters.switchToAspect(link);
+ }
- var guid = $(this).attr('data-guid');
+ $('html, body').animate({scrollTop:0}, 'fast');
+ },
+ switchToAspect: function(aspectLi){
+ AspectFilters.requests++;
- // select correct aspect in filter list & deselect others
- $("#aspect_nav li").each(function(){
- var $this = $(this);
- if( $this.attr('data-guid') == guid){
- $this.addClass('selected');
- } else {
- $this.removeClass('selected');
- }
- });
+ var guid = aspectLi.attr('data-guid');
- // loading animation
- $("#aspect_stream_container").fadeTo(200, 0.4);
- $("#aspect_contact_pictures").fadeTo(200, 0.4);
+ // select correct aspect in filter list & deselect others
+ $("#aspect_nav li").removeClass('selected');
+ link.addClass('selected');
- AspectFilters.performAjax( $(this).attr('href'));
- }
+ AspectFilters.fadeOut();
- $('html, body').animate({scrollTop:0}, 'fast');
- });
+ AspectFilters.performAjax( aspectLi.attr('href'));
},
interceptAspectNavLinks: function(){
$("#aspect_nav a.aspect_selector").click(function(e){
@@ -62,8 +58,7 @@ var AspectFilters = {
AspectFilters.requests++;
// loading animation
- $("#aspect_stream_container").fadeTo(100, 0.4);
- $("#aspect_contact_pictures").fadeTo(100, 0.4);
+ AspectFilters.fadeOut();
// filtering //////////////////////
var $this = $(this),
@@ -139,8 +134,8 @@ var AspectFilters = {
//pass photos
$('#photodropzone img').each(function(){
var img = $(this);
- guid = img.attr('data-id');
- url = img.attr('src');
+ var guid = img.attr('data-id');
+ var url = img.attr('src');
photos[guid] = url;
});
@@ -181,12 +176,19 @@ var AspectFilters = {
// fade contents back in
if(AspectFilters.requests == 0){
- $("#aspect_stream_container").fadeTo(100, 1);
- $("#aspect_contact_pictures").fadeTo(100, 1);
+ AspectFilters.fadeIn();
AspectFilters.performAspectUpdate();
}
}
});
+ },
+ fadeIn: function(){
+ $("#aspect_stream_container").fadeTo(100, 1);
+ $("#aspect_contact_pictures").fadeTo(100, 1);
+ },
+ fadeOut: function(){
+ $("#aspect_stream_container").fadeTo(100, 0.4);
+ $("#aspect_contact_pictures").fadeTo(100, 0.4);
}
}
$(document).ready(function(){