muck-activities 0.1.13 → 0.1.14

data/VERSION

@@ -1 +1 @@
-0.1.13
+0.1.14

data/app/controllers/muck/activities_controller.rb

@@ -22,7 +22,7 @@ class Muck::ActivitiesController < ApplicationController
   def create
     @activity = @parent.activities.build(params[:activity])
     @activity.source = @parent
-    @activity.content.gsub!(@parent.display_name, '')
+    @activity.content.gsub!(@parent.display_name, '') if @activity.template == 'status_update'
     @parent.save!
     @activity_html = get_activity_html(@activity)
     if @activity.template == 'status_update'

data/app/views/activities/_activity_feed.html.erb

@@ -12,7 +12,7 @@
   jQuery(document).ready(function(){
     setup_submit_delete();
     <% if GlobalConfig.enable_live_activity_updates -%>
-    setInterval(function() {jQuery.ajax({success:function(request){update_feed(request);},url:'<%= activities_path(:parent_id => activities_object, :parent_type => activities_object.type, :activity_filter => params[:activity_filter], :format => 'js') %>&amp;latest_activity_id=' + get_latest_activity_id()})}, <%=GlobalConfig.live_activity_update_interval%> * 1000)
+    setInterval(function() {jQuery.ajax({success:function(request){update_feed(request);}, type: "GET", url:'<%= activities_path(:parent_id => activities_object, :parent_type => activities_object.type, :activity_filter => params[:activity_filter], :format => 'js') %>&amp;latest_activity_id=' + get_latest_activity_id()})}, <%=GlobalConfig.live_activity_update_interval%> * 1000)
     <% end -%>
   });
 <% end -%>

data/muck-activities.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-activities}
-  s.version = "0.1.13"
+  s.version = "0.1.14"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball"]
-  s.date = %q{2009-07-07}
+  s.date = %q{2009-07-08}
   s.description = %q{Activity engine for the muck system.}
   s.email = %q{justinball@gmail.com}
   s.extra_rdoc_files = [

data/public/javascripts/muck_activities.js

@@ -83,7 +83,7 @@ function show_comment_box(obj){
 }
 
 function get_latest_activity_id(){
-  var activities = jQuery('#activity-feed-content').children('.activity-status-update');
+  var activities = jQuery('#activity-feed-content').children('.activity');
   if(activities.length > 0){
     return activities[0].id.replace('activity_', '');
   } else {

data/test/rails_root/public/javascripts/muck_activities.js

@@ -75,7 +75,7 @@ function show_comment_box(obj){
 }
 
 function get_latest_activity_id(){
-  var activities = jQuery('#activity-feed-content').children('.activity-status-update');
+  var activities = jQuery('#activity-feed-content').children('.activity');
   if(activities.length > 0){
     return activities[0].id.replace('activity_', '');
   } else {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: muck-activities
 version: !ruby/object:Gem::Version 
-  version: 0.1.13
+  version: 0.1.14
 platform: ruby
 authors: 
 - Justin Ball
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-07 00:00:00 -06:00
+date: 2009-07-08 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency