muck-activities 0.1.26 → 0.1.27

data/VERSION

@@ -1 +1 @@
-0.1.26
+0.1.27

data/app/controllers/muck/activities_controller.rb

@@ -31,24 +31,8 @@ class Muck::ActivitiesController < ApplicationController
       @status_html = ''
     end
     respond_to do |format|
-      format.js do
-        render :update do |page|
-          page.insert_html :top, 'activity-feed-content', @activity_html
-          page.replace_html 'current-status', @status_html if @status_html
-          page.visual_effect :highlight, "#{@activity.dom_id}".to_sym
-          page << 'jQuery("#status_update").val(\'\');'
-          page << "jQuery('#status-update-field').removeClass('status-update-lit');"
-          page << "jQuery('#status-update-field').addClass('status-update-dim');" 
-          page << 'jQuery("#status-update-field").show();'
-          page << 'jQuery("#submit_status").show();'
-          page << 'jQuery("#progress-bar").hide();'
-          page << 'setup_submit_delete();'
-          page << 'apply_activity_ajax_methods();'
-        end
-      end
-      format.html do
-        redirect_back_or_default(@parent)
-      end
+      format.js { render :template => 'activities/create', :layout => false }
+      format.html { redirect_back_or_default(@parent) }
       format.json do
         render :json => { :success => true,
                           :is_status_update => @activity.is_status_update,
@@ -71,9 +55,7 @@ class Muck::ActivitiesController < ApplicationController
         flash[:error] = message
         redirect_back_or_default(@parent)
       end
-      format.js do
-        render :text => message
-      end
+      format.js { render :js => message }
       format.json do
         render :json => { :success => false,
                           :exception => ex,
@@ -92,17 +74,8 @@ class Muck::ActivitiesController < ApplicationController
         redirect_back_or_default(@activities_object)
       end
       format.js do
-        if @activity.is_status_update
-          @new_status = get_status_html(@activities_object)
-          render(:update) do |page|
-            page << "jQuery('##{@activity.dom_id}').fadeOut();"
-            page.replace_html 'current-status', @new_status if @new_status
-          end
-        else
-          render(:update) do |page|
-            page << "jQuery('##{@activity.dom_id}').fadeOut();"
-          end
-        end
+        @new_status = get_status_html(@activities_object) if @activity.is_status_update
+        render :template => 'activities/destroy', :layout => false
       end
       format.json do
         @new_status = get_status_html(@activities_object) if @activity.is_status_update
@@ -119,9 +92,7 @@ class Muck::ActivitiesController < ApplicationController
         flash[:notice] = t("muck.activities.item_could_not_be_removed")
         redirect_back_or_default(current_user)
       end
-      format.js do
-        render(:update){ |page| page_alert(page, t("muck.activities.item_could_not_be_removed")) }
-      end
+      format.js { render :text => page_alert(t("muck.activities.item_could_not_be_removed")) }
       format.json { render :json => { :success => false, :message => t("muck.activities.item_could_not_be_removed") } }
     end
   end
@@ -159,7 +130,7 @@ class Muck::ActivitiesController < ApplicationController
           flash[:notice] = t("muck.activities.permission_denied")
           redirect_back_or_default(current_user)
         end
-        format.js { render(:update){|page| page_alert(page, t("muck.activities.permission_denied"))}}
+        format.js { render :template => 'activities/permission_denied' }
       end
     end
   end

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

@@ -6,7 +6,6 @@
 <%= will_paginate activities, :previous_label => t('muck.activities.paging_newer'), :next_label => t('muck.activities.paging_older') -%>
 <% content_for :javascript do -%>
   jQuery(document).ready(function(){
-    setup_submit_delete();
     <% if GlobalConfig.enable_live_activity_updates -%>
     setInterval(function() {jQuery.ajax({success:function(request){update_feed(request);}, type: "GET", url:'<%= activities_path(:parent_id => activities_object, :parent_type => activities_object.class, :activity_filter => params[:activity_filter], :format => 'js') %>&amp;latest_activity_id=' + get_latest_activity_id()})}, <%=GlobalConfig.live_activity_update_interval%> * 1000)
     <% end -%>

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

@@ -1,9 +1,9 @@
 <div id="status-update">
   <%= output_errors(t('muck.users.problem_with_status'), {:class => 'help-box'}, @activity) %>
-  <% remote_form_for(:activity, 
-                     :url => activities_path(:parent_id => activities_object, :parent_type => activities_object.class, :format => 'js'), 
-                     :html => { :id => 'status_update_form', :class => 'clear',
-                                :action => activities_path(:parent_id => activities_object, :parent_type => activities_object.class) } ) do |f| -%>
+  <% form_for(:activity, 
+              :url => activities_path(:parent_id => activities_object, :parent_type => activities_object.class), 
+              :html => { :id => 'status_update_form', :class => 'clear ajax',
+                         :action => activities_path(:parent_id => activities_object, :parent_type => activities_object.class) } ) do |f| -%>
     <div id="progress-bar" style="display:none;">
       <h3><%= t('muck.activities.updating_status_message') %></h3>
       <img src="/images/loading.gif" alt="progress bar">
@@ -25,11 +25,11 @@
       jQuery('#status-update-field').removeClass('status-update-dim');
       jQuery('#status-update-field').addClass('status-update-lit');
     });
-
     jQuery("#status_update_form").submit(function() {
       jQuery("#status-update-field").hide();
       jQuery("#submit_status").hide();
       jQuery("#progress-bar").show();
+      return true;
     });
   });
 <% end -%>

data/app/views/activities/create.js.erb

@@ -0,0 +1,12 @@
+jQuery('#activity-feed-content').prepend("<%=escape_javascript(@activity_html)%>");
+<% if @status_html -%>
+  jQuery('#current-status').html("<%=escape_javascript(@status_html)%>");
+<% end -%>
+jQuery('#<%=@activity.dom_id%>').effect("highlight", {}, 1000);
+jQuery('#status_update').val('');
+jQuery('#status-update-field').removeClass('status-update-lit');
+jQuery('#status-update-field').addClass('status-update-dim');
+jQuery("#status-update-field").show();
+jQuery('#submit_status').show();
+jQuery('#progress-bar').hide();
+apply_activity_ajax_methods();

data/app/views/activities/destroy.js.erb

@@ -0,0 +1,6 @@
+<% if @activity.is_status_update -%>
+  jQuery('#<%=@activity.dom_id%>').fadeOut();
+  jQuery('#current-status').html("<%=escape_javascript(@new_status)%>");
+<% else -%>
+  jQuery('#<%=@activity.dom_id%>').fadeOut();
+<% end -%>

data/app/views/activities/permission_denied.js.erb

@@ -0,0 +1 @@
+<%= page_alert(t("muck.activities.permission_denied")) %>