From 90e4387395a918ce3e9ef7954872e5b719377885 Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Mon, 24 Nov 2014 09:08:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=99=BB=E5=BD=95=20Signed-o?=
 =?UTF-8?q?ff-by:=20alan=20<547533434@qq.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Gemfile.lock                      |  1 +
 public/javascripts/application.js | 22 +++++++++++++++-------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 4ba8ecf6c..6916219a9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -125,6 +125,7 @@ GEM
     mocha (1.1.0)
       metaclass (~> 0.0.1)
     multi_json (1.10.1)
+    mysql2 (0.3.11)
     mysql2 (0.3.11-x86-mingw32)
     net-ldap (0.3.1)
     nokogiri (1.6.3)
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 42f345d15..7e8080a4a 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -2,13 +2,7 @@
 /* Redmine - project management software
  Copyright (C) 2006-2013  Jean-Philippe Lang */
 
-$(function() {
-    $.ajaxSetup({
-        beforeSend: function ( xhr ) {
-            xhr.setRequestHeader("Accept", "text/javascript")
-        }
-    })
-}
+
 
 function cleanArray (actual){
     var newArray = new Array();
@@ -397,6 +391,7 @@ function submitPreview(url, form, target) {
     $.ajax({
         url: url,
         type: 'post',
+        beforeSend: function(xhr) {xhr.setRequestHeader('X-CSRF-Token', $('meta[name="csrf-token"]').attr('content'))},
         data: $('#'+form).serialize(),
         success: function(data){
             $('#'+target).html(data);
@@ -441,6 +436,7 @@ function scmEntryClick(id, url) {
     el.addClass('loading');
     $.ajax({
         url: url,
+        beforeSend: function(xhr) {xhr.setRequestHeader('X-CSRF-Token', $('meta[name="csrf-token"]').attr('content'))},
         success: function(data){
             el.after(data);
             el.addClass('open').addClass('loaded').removeClass('loading');
@@ -462,6 +458,7 @@ function randomKey(size) {
 function updateIssueFrom(url) {
     $.ajax({
         url: url,
+        beforeSend: function(xhr) {xhr.setRequestHeader('X-CSRF-Token', $('meta[name="csrf-token"]').attr('content'))},
         type: 'post',
         data: $('#issue-form').serialize()
     });
@@ -470,6 +467,7 @@ function updateIssueFrom(url) {
 function updateBulkEditFrom(url) {
     $.ajax({
         url: url,
+        beforeSend: function(xhr) {xhr.setRequestHeader('X-CSRF-Token', $('meta[name="csrf-token"]').attr('content'))},
         type: 'post',
         data: $('#bulk_edit_form').serialize()
     });
@@ -508,6 +506,7 @@ function observeSearchfield(fieldId, targetId, url) {
                 $.ajax({
                     url: url,
                     type: 'get',
+                    beforeSend: function(xhr) {xhr.setRequestHeader('X-CSRF-Token', $('meta[name="csrf-token"]').attr('content'))},
                     data: {q: $this.val()},
                     success: function(data){ if(targetId) $('#'+targetId).html(data); },
                     beforeSend: function(){ $this.addClass('ajax-loading'); },
@@ -548,6 +547,7 @@ function initMyPageSortable(list, url) {
             $.ajax({
                 url: url,
                 type: 'post',
+                beforeSend: function(xhr) {xhr.setRequestHeader('X-CSRF-Token', $('meta[name="csrf-token"]').attr('content'))},
                 data: {'blocks': $.map($('#list-'+list).children(), function(el){return $(el).attr('id');})}
             });
         }
@@ -629,6 +629,14 @@ function transpotUrl (scope) {
 $(document).ready(setupAjaxIndicator);
 $(document).ready(hideOnLoad);
 $(document).ready(addFormObserversForDoubleSubmit);
+$(document).ready(function(){
+        $.ajaxSetup({
+            headers: {
+                'X-CSRF-Token': $('meta[name="csrf-token"]').attr('content')
+            }
+        });
+    }
+)
 
 function img_thumbnails() {
     $('.thumbnails a').colorbox({rel:'nofollow'});