Merge branch 'dev' into sxw-dev

2015-08-10 14:47:56 +08:00
parent 99fbb6dfaa c65799ce4c
commit 916ecf3ddf
15 changed files with 301 additions and 23 deletions
--- a/static/src/js/utils/csrf.js
+++ b/static/src/js/utils/csrf.js
@@ -9,8 +9,15 @@ define("csrf",function(){
        }
        return "";
    }
-    function csrfHeader(xhr){
-         xhr.setRequestHeader("X-CSRFToken", get_cookie("csrftoken"));
+    function csrfHeader(){
+        // jquery的请求
+        if(arguments.length == 1) {
+            arguments[0].setRequestHeader("X-CSRFToken", get_cookie("csrftoken"));
+        }
+        // 百度webuploader 的请求
+        else if(arguments.length == 3){
+            arguments[2]["X-CSRFToken"] = get_cookie("csrftoken");
+        }
    }
    return csrfHeader;
 });