转换为remote js

app/controllers/at_controller.rb

@@ -1,25 +1,143 @@
 #coding=utf-8
 
 class AtController < ApplicationController
-  respond_to :js
+  respond_to :json
 
   def show
-    type = params[:type]
+    @logger = Logger.new(Rails.root.join('log', 'at.log').to_s)
+    users = find_at_users(params[:type], params[:id])
+    @users = users.uniq { |u| u.id }.delete_if { |u| u.id == User.current.id }
+  end
+
+  private
+  def find_at_users(type, id)
+    @logger.info("#{type}, #{id}")
     case type
       when "Issue"
-        @users = find_issue(params)
+        find_issue(id)
+      when 'Project'
+        find_project(id)
+      when 'Course'
+        find_course(id)
+      when 'Activity', 'CourseActivity', 'ForgeActivity','UserActivity', 'OrgActivity','PrincipalActivity'
+        find_activity(id, type)
+      when 'Attachment'
+        find_attachment(id)
+      when 'Message'
+        find_message(id)
       else
+        nil
     end
   end
 
-  private
-  def find_issue(params)
+  def find_issue(id)
     #1. issues list persons
     #2. project persons
-    issue      = Issue.find(params[:id])
-    journals   = issue.journals
+    issue = Issue.find(id)
+    journals = issue.journals
     at_persons = journals.map(&:user) + issue.project.users
-    at_persons.uniq{|u| u.id}.delete_if{|u| u.id == User.current.id}
+    at_persons.uniq { |u| u.id }.delete_if { |u| u.id == User.current.id }
+  end
+
+  def find_project(id)
+    at_persons = Project.find(id).users
+    at_persons.delete_if { |u| u.id == User.current.id }
+  end
+
+  def find_course(id)
+    at_persons = Course.find(id).users
+    at_persons.delete_if { |u| u.id == User.current.id }
+  end
+
+  def find_activity(id, type)
+
+    ## 基本上是本类型中的 加上所属类型的用户
+    case type
+      when 'Activity'
+        activity = Activity.find(id)
+        (find_at_users(activity.act_type, activity.act_id) ||[]) +
+            (find_at_users(activity.activity_container_type, activity.activity_container_id) || [])
+      when 'CourseActivity'
+        activity = CourseActivity.find(id)
+        (find_at_users(activity.course_act_type, activity.course_act_id) || []) + (find_course(activity.course.id) || [])
+      when 'ForgeActivity'
+        activity = ForgeActivity.find(id)
+        (find_at_users(activity.forge_act_type, activity.forge_act_id) ||[]) +
+            (find_project(activity.project_id) || [])
+      when 'UserActivity'
+        activity = UserActivity.find(id)
+        (find_at_users(activity.act_type, activity.act_id) || []) +
+            (find_at_users(activity.container_type, activity.container_id) || [])
+      when 'OrgActivity'
+        activity = OrgActivity.find(id)
+        (find_at_users(activity.org_act_type, activity.org_act_id) || []) +
+            (find_at_users(activity.container_type, activity.container_id) || [])
+      when 'PrincipalActivity'
+        activity = PrincipalActivity.find(id)
+        find_at_users(activity.principal_act_type, activity.principal_act_id)
+      else
+        nil
+    end
+  end
+
+  #作业应该是关联课程,取课程的用户列表
+  def find_homework(id)
+    homework = HomeworkCommon.find(id)
+    find_course(homework.course_id)
+  end
+
+  def find_attachment(id)
+    attachment = Attachment.find(id)
+    find_at_users(attachment.container_type, attachment.container_id)
+  end
+
+  #Message
+  def find_message(id)
+    message = Message.find(id)
+    at_persons =  message.board.messages.map(&:author)
+
+  end
+
+  #News
+  def find_news(id)
+    find_project(News.find(id).project_id)
+  end
+
+  #JournalsForMessage
+  def find_journals_for_message(id)
+    jounrnal = JournalsForMessage.find(id)
+    find_at_users(jounrnal.jour_type, jounrnal.jour_id)
+  end
+
+  #Poll
+  def find_poll(id)
+  end
+
+  #Journal
+  def find_journal(id)
+    journal = Journal.find(id)
+    find_at_users(journal.journalized_type, journal.journalized_id)
+  end
+
+  #Document
+  def find_document(id)
+    find_project(Document.find(id).project_id)
+  end
+
+  #ProjectCreateInfo
+  def find_project_create_info(id)
+
+  end
+
+  #Principal
+  def find_principal(id)
+
+  end
+
+  #BlogComment
+  def find_blog_comment(id)
+    blog = BlogComment.find(id).blog
+    blog.users
   end
 
 end

app/helpers/application_helper.rb

@@ -1716,6 +1716,13 @@ module ApplicationHelper
   #
   def javascript_include_tag(*sources)
     options = sources.last.is_a?(Hash) ? sources.pop : {}
+
+    @sources ||= []
+    sources = sources.delete_if do|source|
+      @sources.include?(source)
+    end
+    @sources += sources
+
     if plugin = options.delete(:plugin)
       sources = sources.map do |source|
         if plugin
@@ -1725,7 +1732,12 @@ module ApplicationHelper
         end
       end
     end
-    super sources, options
+
+     if sources && !sources.empty?
+       super(sources, options)
+     else
+       ''
+     end
   end
 
   def content_for(name, content = nil, &block)
@@ -2621,11 +2633,8 @@ int main(int argc, char** argv){
   end
 
   def import_ke(default_opt={})
-    opt = {enable_at: true, prettify: false, init_activity: false}.merge default_opt
+    opt = {enable_at: false, prettify: false, init_activity: false}.merge default_opt
     ss  = ''
-    if opt[:enable_at]
-      ss += %Q|<script src="/at/#{opt[:enable_at][:id]}.js?type=#{opt[:enable_at][:type]}" type="text/javascript"></script>|
-    end
 
     ss += javascript_include_tag("/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg')
     if opt[:enable_at]

app/views/at/show.js.erb

@@ -1,8 +0,0 @@
-(function(){
-  window.atPersonLists = [];
-  <% @users && @users.each_with_index do |person,index| %>
-  var o = {id: <%=index%>, name: '<%=person.show_name%>', login: '<%=person.login%>', searchKey: '<%=person.get_at_show_name%>'};
-  atPersonLists.push(o);
-  <% end %>
-
-})();

app/views/at/show.json.erb

@@ -0,0 +1,6 @@
+[
+  <% @users && @users.each_with_index do |person,index| %>
+  {"id": <%=index%>, "name": "<%=person.show_name%>", "login": "<%=person.login%>", "searchKey": "<%=person.get_at_show_name%>"}
+  <%= index != @users.size-1 ? ',' : '' %>
+  <% end %>
+]

app/views/bids/_new_homework_form.html.erb

@@ -15,10 +15,10 @@
       <label class="fl" >&nbsp;&nbsp;<%= l(:field_quote)%>&nbsp;&nbsp;：</label>
       <!--<textarea  name="bid[description]" placeholder="最多3000个汉字(或6000个英文字符)"  class="hwork_text fl"></textarea>-->
       <% if edit_mode %>
-        <%= f.kindeditor :description,:width=>'91%',:editor_id => 'bid_description_editor',:owner_id => bid.id,:owner_type =>OwnerTypeHelper::BID,:resizeType => 0 %>
+        <%= f.kindeditor :description,:width=>'91%',:editor_id => 'bid_description_editor',:owner_id => bid.id,:owner_type =>OwnerTypeHelper::BID,:resizeType => 0,act_id: @course.id, act_type: @course.class.to_s %>
       <% else %>
           <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
-          <%= f.kindeditor :description,:width=>'91%',:editor_id => 'bid_description_editor',:resizeType => 0 %>
+          <%= f.kindeditor :description,:width=>'91%',:editor_id => 'bid_description_editor',:resizeType => 0, act_id: @course.id, act_type: @course.class.to_s %>
       <% end %>
     </li>
     <div class="cl"></div>

app/views/blog_comments/_edit.html.erb

@@ -1,5 +1,5 @@
 <%= content_for(:header_tags) do %>
-    <%= import_ke(enable_at: false, prettify: false) %>
+    <%= import_ke(enable_at: true, prettify: false) %>
     <%= javascript_include_tag 'blog' %>
 <% end %>
 
@@ -34,7 +34,9 @@
                            :class => 'talk_text fl',
                            :input_html => { :id => 'message_content',
                                             :class => 'talk_text fl',
-                                            :maxlength => 5000 }%>
+                                            :maxlength => 5000 },
+                           act_id: article.id, act_type: article.class.to_s
+          %>
           <div class="cl"></div>
           <p id="message_content_span"></p>
         </div>

app/views/blog_comments/_reply_form.html.erb

@@ -1,5 +1,5 @@
 <%= content_for(:header_tags) do %>
-    <%= import_ke(enable_at: false, prettify: false) %>
+    <%= import_ke(enable_at: true, prettify: false) %>
 <% end %>
 <li>
   <div style="display: none ;" class="fl"><label><span class="c_red">*</span>&nbsp;<%= l(:field_subject) %>&nbsp;&nbsp;：</label></div>
@@ -27,7 +27,9 @@
                        :minHeight=>100,
                        :input_html => { :id => 'message_content',
                                         :class => 'talk_text fl',
-                                        :maxlength => 5000 }%>
+                                        :maxlength => 5000 },
+                       at_id: article.id, at_type: article.class.to_s
+      %>
   <div class="cl"></div>
   <p id="message_content_span"></p>
 </li>

app/views/blog_comments/quote.js.erb

@@ -3,7 +3,7 @@ if($("#reply_message_<%= @blogComment.id%>").length > 0) {
     $(function(){
         $('#reply_subject').val("<%= raw escape_javascript(@subject) %>");
         $('#quote_quote').val("<%= raw escape_javascript(@temp.content.html_safe) %>");
-        init_activity_KindEditor_data(<%= @blogComment.id%>,null,"85%");
+        init_activity_KindEditor_data(<%= @blogComment.id%>,null,"85%", "<%=@blogComment.class.to_s%>");
     });
 }else if($("#reply_to_message_<%= @blogComment.id%>").length >0) {
     $("#reply_to_message_<%= @blogComment.id%>").replaceWith("<p id='reply_message_<%= @blogComment.id%>'></p>");

app/views/blog_comments/reply.js.erb

@@ -1,7 +1,7 @@
 <% if @in_user_center%>
     $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/user_blog', :locals => {:activity => @article,:user_activity_id =>@user_activity_id}) %>");
-    init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%");
+    init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%", 'UserActivity');
 <% else%>
 $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'blogs/article', :locals => {:activity => @article,:user_activity_id =>@user_activity_id}) %>");
-init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%");
+init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%", 'UserActivity');
 <% end %>

app/views/blog_comments/show.html.erb

@@ -27,7 +27,7 @@
         }
     }
     $(function() {
-        init_activity_KindEditor_data(<%= @article.id%>,null,"85%");
+        init_activity_KindEditor_data(<%= @article.id%>,null,"85%", '<%=@article.class.to_s%>');
         showNormalImage('message_description_<%= @article.id %>');
     });
 </script>

app/views/blogs/_article_list.html.erb

@@ -74,7 +74,7 @@
               }
 
               $(function () {
-                  init_activity_KindEditor_data(<%= topic.id%>, null, "87%");
+                  init_activity_KindEditor_data(<%= topic.id%>, null, "87%", "<%=topic.class.to_s%>");
                   showNormalImage('activity_description_<%= topic.id %>');
                   /*var description_images=$("div#activity_description_<%#= topic.id %>").find("img");
                    if (description_images.length>0) {

app/views/boards/_course_new.html.erb

@@ -1,5 +1,5 @@
 <%= content_for(:header_tags) do %>
-    <%= import_ke(enable_at: false, prettify: false) %>
+    <%= import_ke(enable_at: true, prettify: false) %>
 <% end %>
 
 <%= error_messages_for 'message' %>
@@ -34,7 +34,9 @@
                            :class => 'talk_text fl',
                            :input_html => { :id => 'message_content',
                                             :class => 'talk_text fl',
-                                            :maxlength => 5000 }%>
+                                            :maxlength => 5000 },
+                           at_id: topic.id, at_type: topic.class.to_s
+          %>
           <div class="cl"></div>
           <p id="message_content_span"></p>
         </div>

app/views/boards/_course_show.html.erb

@@ -74,7 +74,7 @@
           }
 
           $(function () {
-              init_activity_KindEditor_data(<%= topic.id%>, null, "87%");
+              init_activity_KindEditor_data(<%= topic.id%>, null, "87%", "<%=topic.class.to_s%>");
               showNormalImage('activity_description_<%= topic.id %>');
               /*var description_images=$("div#activity_description_<%#= topic.id %>").find("img");
               if (description_images.length>0) {

app/views/comments/create.js.erb

@@ -1,3 +1,3 @@
 $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_news', :locals => {:activity => @news,:user_activity_id =>@user_activity_id}) %>");
 
-init_activity_KindEditor_data('<%= @user_activity_id%>',"","87%");
+init_activity_KindEditor_data('<%= @user_activity_id%>',"","87%", "UserActivity");

app/views/courses/_course_activity.html.erb

@@ -1,5 +1,5 @@
 <%= content_for(:header_tags) do %>
-    <%= import_ke(enable_at: false, prettify: false, init_activity: true) %>
+    <%= import_ke(enable_at: true, prettify: false, init_activity: true) %>
 <% end %>
 
 <style type="text/css">
@@ -19,7 +19,7 @@
     }
 
     span.ke-toolbar-icon-url {
-        background-image: url(/images/public_icon.png)
+        background-image: url("/images/public_icon.png")
     }
 
     div.ke-toolbar .ke-outline {
@@ -72,7 +72,7 @@
             }
 
             $(function () {
-                init_activity_KindEditor_data(<%= activity.id%>, null, "87%");
+                init_activity_KindEditor_data(<%= activity.id%>, null, "87%", "<%= activity.class.to_s %>");
                 showNormalImage('activity_description_<%= activity.id %>');
                 if($("#intro_content_<%= activity.id %>").height() > 360) {
                     $("#intro_content_show_<%= activity.id %>").show();

app/views/courses/_courses_jours.html.erb

@@ -1,7 +1,7 @@
 <style type="text/css">
   div.ke-toolbar{display:none;width:400px;border:none;background:none;padding:0px 0px;}
   span.ke-toolbar-icon{line-height:26px;font-size:14px;padding-left:26px;}
-  span.ke-toolbar-icon-url{background-image:url( /images/public_icon.png )}
+  span.ke-toolbar-icon-url{background-image:url( "/images/public_icon.png" )}
   div.ke-toolbar .ke-outline{padding:0px 0px;line-height:26px;font-size:14px;}
   span.ke-icon-emoticons{background-position:0px -671px;width:50px;height:26px;}
   span.ke-icon-emoticons:hover{background-position:-79px -671px;width:50px;height:26px;}
@@ -13,10 +13,9 @@
   /*.ke-container{height: 80px !important;}*/
 </style>
 <%= content_for(:header_tags) do %>
-    <%= import_ke(enable_at: false, prettify: false, init_activity: true) %>
+    <%= import_ke(enable_at:  true, prettify: false, init_activity: true) %>
 <% end %>
 
-
 <script >
     init_KindEditor_data('',80);
 </script>

app/views/courses/syllabus.html.erb

@@ -1,6 +1,6 @@
 
 <%= content_for(:header_tags) do %>
-    <%= import_ke(enable_at: false, prettify: false, init_activity: true) %>
+    <%= import_ke(enable_at:  true, prettify: false, init_activity: true) %>
     <%= javascript_include_tag 'blog' %>
 <% end %>
 
@@ -40,7 +40,7 @@
         }
     }
     $(function() {
-        init_activity_KindEditor_data(<%= @article.id%>,null,"87%");
+        init_activity_KindEditor_data(<%= @article.id%>,null,"87%", "<%=@article.class.to_s%>");
         showNormalImage('message_description_<%= @article.id %>');
     });
 </script>

app/views/homework_common/start_anonymous_comment.js.erb

@@ -2,10 +2,10 @@
     alert('启动成功');
     <% if @user_activity_id == -1 %>
         $("#homework_common_<%= @homework.id %>").replaceWith("<%= escape_javascript(render :partial => "users/user_homework_detail",:locals => {:homework_common => @homework, :is_in_course => @is_in_course})%>");
-        init_activity_KindEditor_data(<%= @homework.id%>,"","87%");
+        init_activity_KindEditor_data(<%= @homework.id%>,"","87%", "<%=@homework.class.to_s%>");
     <% else %>
         $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework,:user_activity_id =>@user_activity_id,:course_activity=>@course_activity}) %>");
-        init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%");
+        init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%", "UserActivity");
     <% end %>
 /*$("#<%#= @homework.id %>_start_anonymous_comment").replaceWith('<%#= escape_javascript(link_to "关闭匿评", alert_anonymous_comment_homework_common_path(@homework), remote: true, id:"#{@homework.id}_stop_anonymous_comment",:class => "postOptionLink")%>');*/
 <% elsif @statue == 2 %>

app/views/homework_common/stop_anonymous_comment.js.erb

@@ -1,10 +1,10 @@
 alert('关闭成功');
 <% if @user_activity_id == -1 %>
 $("#homework_common_<%= @homework.id %>").replaceWith("<%= escape_javascript(render :partial => "users/user_homework_detail",:locals => {:homework_common => @homework, :is_in_course => @is_in_course})%>");
-init_activity_KindEditor_data(<%= @homework.id%>,"","87%");
+init_activity_KindEditor_data(<%= @homework.id%>,"","87%", "<%=@homework.class.to_s%>");
 <% else %>
 $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework,:user_activity_id =>@user_activity_id,:course_activity=>@course_activity}) %>");
-init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%");
+init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%", 'UserActivity');
 <% end %>
 /*
 $("#<%#= @homework.id %>_stop_anonymous_comment").replaceWith('');*/

app/views/issues/_edit.html.erb

@@ -1,8 +1,7 @@
 <%= content_for(:header_tags) do %>
-    <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
+    <%= import_ke(enable_at: true, prettify: false, init_activity: false) %>
 <% end %>
 
-
 <%= labelled_form_for @issue, :html => {:id => 'issue-form', :multipart => true} do |f| %>
     <%= error_messages_for 'issue', 'time_entry' %>
     <%= render :partial => 'conflict' if @conflict %>
@@ -24,7 +23,7 @@
     </div>
     <input name="issue_quote_new" type="hidden" value="<%= %>" />
     <fieldset><legend>回复</legend>
-    <%= f.kindeditor :notes, :style => "width:99%;",:height=>'100px', :cssData =>"blockquote { padding:0px}", :rows => "5", :no_label => true, :editor_id=>'issue_journal_kind_reply' %>
+    <%= f.kindeditor :notes, :style => "width:99%;",:height=>'100px', :cssData =>"blockquote { padding:0px}", :rows => "5", :no_label => true, :editor_id=>'issue_journal_kind_reply', at_id: @issue.id, at_type: @issue.class.to_s %>
     </fieldset>
     <!--<%# if @issue.safe_attribute? 'private_notes' %>-->
     <!--<label for="issue_private_notes"><%#= f.check_box :private_notes, :no_label => true %> <%#= l(:field_private_notes) %></label>-->

app/views/issues/_form.html.erb

@@ -49,7 +49,7 @@
               <%= f.label_for_field :description, :required => @issue.required_attribute?('description'), :no_label => true, :class => "label" %>
               <%#= link_to_function image_tag('edit.png'), '$(this).hide(); $("#issue_description_and_toolbar").show()' unless @issue.new_record? %>
               <%#= content_tag 'span', :id => "issue_description_and_toolbar" do %>
-              <%= f.kindeditor :description,:editor_id => "issue_desc_editor",  :width=>'87%', :resizeType => 0, :no_label => true %>
+              <%= f.kindeditor :description,:editor_id => "issue_desc_editor",  :width=>'87%', :resizeType => 0, :no_label => true,at_id: @project.id, at_type: @project.class.to_s %>
               <%# end %>
               <%#= wikitoolbar_for 'issue_description' %>
           <% end %>

app/views/issues/add_journal.js.erb

@@ -1,3 +1,3 @@
 $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/project_issue', :locals => {:activity => @issue,:user_activity_id =>@user_activity_id}) %>");
 
-init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%");
+init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%", "UserActivity");

app/views/issues/add_journal_in_org.js.erb

@@ -1,3 +1,3 @@
 $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'organizations/org_project_issue', :locals => {:activity => @issue,:user_activity_id =>@user_activity_id}) %>");
 
-init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%");
+init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%", "UserActivity");

app/views/issues/new.html.erb

@@ -1,5 +1,5 @@
 <%= content_for(:header_tags) do %>
-    <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
+    <%= import_ke(enable_at: true, prettify: false, init_activity: false) %>
 <% end %>
 
 

app/views/issues/show.html.erb

@@ -1,5 +1,5 @@
 <%= content_for(:header_tags) do %>
-<%= import_ke(enable_at: {id: @issue.id, type: 'Issue'}) %>
+<%= import_ke(enable_at: true) %>
 <% end %>
 
 <div class="project_r_h">