From 70a77cccc87617713c5081a563c87e59cc21f16c Mon Sep 17 00:00:00 2001
From: esp <sxwxs@msn.com>
Date: Mon, 10 Aug 2015 17:00:39 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=89=8D=E7=AB=AF]=E4=BF=AE=E6=AD=A3csrf.js?=
 =?UTF-8?q?=20=20=20=20uploader.js=20=20=E7=9A=84=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=20[CI=20SKIP]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 static/src/js/utils/csrf.js     |  2 +-
 static/src/js/utils/uploader.js | 21 ++++++++++++---------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/static/src/js/utils/csrf.js b/static/src/js/utils/csrf.js
index 6a004b4..0e21e0f 100644
--- a/static/src/js/utils/csrf.js
+++ b/static/src/js/utils/csrf.js
@@ -11,7 +11,7 @@ define("csrf",function(){
     }
     function csrfHeader(){
         // jquery的请求
-        if(arguments.length == 1) {
+        if(arguments.length == 2) {
             arguments[0].setRequestHeader("X-CSRFToken", get_cookie("csrftoken"));
         }
         // 百度webuploader 的请求
diff --git a/static/src/js/utils/uploader.js b/static/src/js/utils/uploader.js
index ec418c5..83c2b1f 100644
--- a/static/src/js/utils/uploader.js
+++ b/static/src/js/utils/uploader.js
@@ -1,20 +1,23 @@
-define("uploader", ["webuploader"], function(webuploader){
-    function uploader(selector, server) {
-        return webuploader.create({
-
+define("uploader", ["webuploader", "csrf"], function(webuploader,csrf){
+    function uploader(selector, server, onSuccess) {
+        var Webuploader=  webuploader.create({
+            auto: true,
             // swf文件路径
-            swf: "/js/Uploader.swf",
-
+            swf: "/static/img/Uploader.swf",
             // 文件接收服务端。
             server: server,
-
             // 选择文件的按钮。可选。
             // 内部根据当前运行是创建，可能是input元素，也可能是flash.
             pick: selector,
-
             // 不压缩image, 默认如果是jpeg，文件上传前会压缩一把再上传！
-            resize: false
+            resize: false,
+            uploadBeforeSend : csrf
         });
+        Webuploader.on("uploadBeforeSend",csrf);
+        Webuploader.on("uploadSuccess", onSuccess);
+
+        return Webuploader;
     }
+
     return uploader;
 });
\ No newline at end of file