Merge remote-tracking branch 'origin/szzh' into szzh

app/controllers/news_controller.rb

@@ -175,19 +175,19 @@ class NewsController < ApplicationController
           update_kindeditor_assets_owner ids,@news.id,OwnerTypeHelper::NEWS
         end
         # <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ض<EFBFBD>̬<EFBFBD>ļ<EFBFBD>¼add start
-        teachers = searchTeacherAndAssistant(@course)
-        for teacher in teachers
-          if(teacher.user_id != User.current.id)
-            notify = ActivityNotify.new()
-            notify.activity_container_id = @course.id
-            notify.activity_container_type = 'Course'
-            notify.activity_id = @news.id
-            notify.activity_type = 'News'
-            notify.notify_to = teacher.user_id
-            notify.is_read = 0
-            notify.save()
-          end
-        end
+        # teachers = searchTeacherAndAssistant(@course)
+        # for teacher in teachers
+        #   if(teacher.user_id != User.current.id)
+        #     notify = ActivityNotify.new()
+        #     notify.activity_container_id = @course.id
+        #     notify.activity_container_type = 'Course'
+        #     notify.activity_id = @news.id
+        #     notify.activity_type = 'News'
+        #     notify.notify_to = teacher.user_id
+        #     notify.is_read = 0
+        #     notify.save()
+        #   end
+        # end
         # <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ض<EFBFBD>̬<EFBFBD>ļ<EFBFBD>¼add end
         render_attachment_warning_if_needed(@news)
         flash[:notice] = l(:notice_successful_create)

app/models/mailer.rb

@@ -59,7 +59,6 @@ class Mailer < ActionMailer::Base
       @anonymous_comment_close_name = homework_common.name
       @author = homework_common.user
       #收件人邮箱
-     
       recipients << user.mail
     end
     mail :to => recipients,
@@ -98,10 +97,6 @@ class Mailer < ActionMailer::Base
         @anonymous_comment_fail_name = homework_common.name
         @author = homework_common.user
         #收件人邮箱
-        puts "######################"
-        puts homework_common.id
-        puts recipients
-        puts "######################"
         recipients << user.mail
       end
     end

public/assets/kindeditor/plugins/emoticons/emoticons.js

@@ -13,7 +13,7 @@ KindEditor.plugin('emoticons', function(K) {
 		allowPreview = self.allowPreviewEmoticons === undefined ? true : self.allowPreviewEmoticons,
 		currentPageNum = 1;
 	self.clickToolbar(name, function() {
-		this.edit.focus();//如果没有这句 火狐下取不到焦点 导致_getSel()为空 报错 
+		this.edit.focus();//<EFBFBD><EFBFBD><EFBFBD>û<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>ȡ<EFBFBD><C8A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>_getSel()Ϊ<><CEAA> <20><><EFBFBD><EFBFBD> 
 		var rows = 5, cols = 9, total = 135, startNum = 0,
 			cells = rows * cols, pages = Math.ceil(total / cells),
 			colsHalf = Math.floor(cols / 2),
@@ -55,6 +55,9 @@ KindEditor.plugin('emoticons', function(K) {
 				K(this).removeClass('ke-on');
 			});
 			cell.click(function(e) {
+                if(/^\s*<\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\s*\#\d*\;\s*\w*\-\w*\:\s*\w*\;\"\>[\u4e00-\u9fa5]*<\/\w*\>\s*$/.test(self.edit.html())){
+                    self.edit.html('');
+                }
 				self.insertHtml('<img src="' + path + num + '.gif" border="0" alt="" />').hideMenu().focus();
 				e.stop();
 			});