修正编辑器在火狐下粘贴不成功

app/helpers/application_helper.rb

@@ -1770,8 +1770,7 @@ module ApplicationHelper
 
   def get_memo
     @new_memo = Memo.new
-    #@new_memo.subject = "有什么想说的，尽管来咆哮吧~~"
-    @public_forum = Forum.find(1)
+    @public_forum = Forum.find(1) rescue ActiveRecord::RecordNotFound
   end
 
   #获取用户未过期的课程

app/models/token.rb

@@ -33,7 +33,7 @@ class Token < ActiveRecord::Base
     unless token
       token = Token.create(:user => user, :action => 'autologin')
     else
-      token..update_attribute(:created_on, Time.now)
+      token.update_attribute(:created_on, Time.now)
     end
     token
   end

app/views/layouts/_base_feedback.html.erb

@@ -168,6 +168,7 @@ function cookieget(n)
             <div class="side_title"><a title="<%= l(:label_feedback) %>" class="close_btn"><span><%= l(:label_feedback) %></span></a></div>
             <div class="side_center">
                 <div class="custom_service">
+                   <% if @public_forum %>
                   <% get_memo %>
 				  <%= form_for(@new_memo, :url => create_feedback_forum_path(@public_forum)) do |f|  %>
                       <%= f.text_area :subject,:id=>"subject", :class => "opnionText", :placeholder => l(:label_feedback_tips) %>
@@ -176,6 +177,7 @@ function cookieget(n)
                       <label class="c_grey">您还能输入<span id="textCount" class="c_orange">50</span>个字符</label>
                       <a href="javascript:void(0);" class="opnionButton" style=" color:#fff;" id="" onclick="f_submit();"><%= l(:label_submit)%></a>
 				  <% end %>
+          <% end %>
                 </div>
                 <div class="msgserver">
                     <a href="http://user.trustie.net/users/34/user_newfeedback" style="color: #15BCCF;"><%= l(:label_technical_support) %>白&nbsp;&nbsp;&nbsp;羽</a>

lib/rails_kindeditor/lib/rails_kindeditor/helper.rb

@@ -54,9 +54,9 @@ module RailsKindeditor
           if(old_onload_#{random_name}) old_onload_#{random_name}();
         }"
       else
-        "KindEditor.ready(function(K){
-        	#{editor_id}K.create('##{dom_id}', #{get_options(options).to_json}).loadPlugin('paste');
-        });"
+        "$(function(){KindEditor.ready(function(K){
+          #{editor_id}K.create('##{dom_id}', #{get_options(options).to_json}).loadPlugin('paste');
+        });});"
       end
     end
 

public/javascripts/application.js

@@ -578,7 +578,7 @@ function setupHeartBeat(){
 
 function setupAjaxIndicator() {
   $('#ajax-indicator').bind('ajaxSend', function(event, xhr, settings) {
-    if(settings && settings.url && settings.url.endsWith('account/heartbeat')){
+    if(settings && settings.url && settings.url.match(/account\/heartbeat$/)){
       return;
     }
     if ($('.ajax-loading').length === 0 && settings.contentType != 'application/octet-stream') {

public/javascripts/avatars.js

@@ -52,13 +52,14 @@ function ajaxUpload(file, fileSpan, inputEl) {
         fileSpan.removeClass('ajax-loading');
         var form = fileSpan.parents('form');
 
-        if (form.queue('upload').length == 0 && ajaxUpload.uploading == 0) {
-          $('input:submit', form).removeAttr('disabled');
-        }
-        form.dequeue('upload');
+        // if (form.queue('upload').length == 0 && ajaxUpload.uploading == 0) {
+        //   $('input:submit', form).removeAttr('disabled');
+        // }
+        // form.dequeue('upload');
       });
   }
 
+
   var progressSpan = $('#upload_progressbar');
   progressSpan.progressbar();
   fileSpan.addClass('ajax-waiting');

test/integration/account_test.rb

@@ -29,7 +29,7 @@ class AccountTest < ActionController::IntegrationTest
   # Replace this with your real tests.
   def test_login
     get "my/page"
-    assert_redirected_to "/login?back_url=http%3A%2F%2Fwww.example.com%2Fmy%2Fpage"
+    assert_redirected_to "/login"
     log_user('jsmith', 'jsmith')
 
     get "my/account"