新增：上传自定义uploadServiceUpload

Author: modstart

_src/plugins/autoupload.js

@@ -103,8 +103,7 @@ UE.plugin.register("autoupload", function () {
 
         var upload = function (file) {
             if(me.getOpt('uploadServiceEnable')){
-                var service = me.getOpt('uploadService');
-                service.upload('image', file, {
+                me.getOpt('uploadServiceUpload')('image', file, {
                     success: function( res ) {
                         successHandler( res );
                     },

_src/plugins/simpleupload.js

@@ -76,8 +76,7 @@ UE.plugin.register("simpleupload", function () {
 
             var upload = function (file) {
                 if(me.getOpt('uploadServiceEnable')){
-                    var service = me.getOpt('uploadService');
-                    service.upload('image', file, {
+                    me.getOpt('uploadServiceUpload')('image', file, {
                         success: function( res ) {
                             successHandler( res );
                         },

dialogs/attachment/attachment.js

@@ -171,9 +171,8 @@
                 compress: false
             };
             if(editor.getOpt('uploadServiceEnable')) {
-                var service = editor.getOpt('uploadService');
                 uploaderOption.customUpload = function (file, callback) {
-                    service.upload('attachment', file, {
+                    editor.getOpt('uploadServiceUpload')('attachment', file, {
                         success: function( res ) {
                             callback.onSuccess(file, {_raw:JSON.stringify(res)});
                         },

dialogs/audio/audio.js

@@ -385,9 +385,8 @@
             };
 
             if(editor.getOpt('uploadServiceEnable')) {
-                var service = editor.getOpt('uploadService');
                 uploaderOption.customUpload = function (file, callback) {
-                    service.upload('audio', file, {
+                    editor.getOpt('uploadServiceUpload')('audio', file, {
                         success: function( res ) {
                             callback.onSuccess(file, {_raw:JSON.stringify(res)});
                         },

dialogs/image/image.js

@@ -435,9 +435,8 @@
                 } : false
             };
             if(editor.getOpt('uploadServiceEnable')) {
-                var service = editor.getOpt('uploadService');
                 uploaderOption.customUpload = function (file, callback) {
-                    service.upload('image', file, {
+                    editor.getOpt('uploadServiceUpload')('image', file, {
                         success: function( res ) {
                             callback.onSuccess(file, {_raw:JSON.stringify(res)});
                         },

dialogs/scrawl/scrawl.js

@@ -654,9 +654,8 @@ function exec(scrawlObj) {
             };
 
             if(editor.getOpt('uploadServiceEnable')) {
-                var service = editor.getOpt('uploadService');
                 var file = utils.base64toBlob(base64, 'image/png');
-                service.upload('image', file, {
+                editor.getOpt('uploadServiceUpload')('image', file, {
                     success: function( res ) {
                         if (!scrawlObj.isCancelScrawl) {
                             successHandler(res);

dialogs/video/video.js

@@ -438,9 +438,8 @@
                 compress: false
             };
             if(editor.getOpt('uploadServiceEnable')) {
-                var service = editor.getOpt('uploadService');
                 uploaderOption.customUpload = function (file, callback) {
-                    service.upload('video', file, {
+                    editor.getOpt('uploadServiceUpload')('video', file, {
                         success: function( res ) {
                             callback.onSuccess(file, {_raw:JSON.stringify(res)});
                         },

ueditor.config.js

@@ -185,28 +185,30 @@
         }
 
         // 自定义上传功能
-        , uploadServiceEnable: true
-        // 自定义上传配置
-        , uploadService: {
-            upload: function(type, file, callback, option ) {
-                console.log('upload', type, file, callback, option);
-                var i = 0;
-                var call = function(){
-                    i++;
-                    if(i > 3){
-                        callback.success({
-                            "state": "SUCCESS",
-                            "url": "https://ms-assets.modstart.com/demo/modstart.jpg",
-                        })
-                        return;
-                    }
-                    setTimeout(function(){
-                        callback.progress(0.3 * i);
-                        call();
-                    },500);
-                }
-                call();
-            }
+        , uploadServiceEnable: false
+        // 自定义上传函数，需要在这个函数中实现自定义上传逻辑
+        // type 上传类型，image 图片，video 视频，audio 音频，attachment 附件
+        // file 文件对象
+        // callback 回调函数，需要在上传完成后调用 callback.success、callback.error、callback.progress
+        // option 上传配置，其他一些未来扩展配置
+        , uploadServiceUpload: function(type, file, callback, option ) {
+            console.log('uploadServiceUpload', type, file, callback, option);
+            // var i = 0;
+            // var call = function(){
+            //     i++;
+            //     if(i > 3){
+            //         callback.success({
+            //             "state": "SUCCESS",
+            //             "url": "https://ms-assets.modstart.com/demo/modstart.jpg",
+            //         })
+            //         return;
+            //     }
+            //     setTimeout(function(){
+            //         callback.progress(0.3 * i);
+            //         call();
+            //     },500);
+            // }
+            // call();
         }
 
         // 插入图片自定义配置