activeadmin_trumbowyg 1.0.0 → 1.2.0

data/app/assets/javascripts/activeadmin/trumbowyg/plugins/upload/trumbowyg.upload.js

@@ -43,7 +43,49 @@
         return object;
     }
 
-    addXhrProgressEvent();
+    function runXhrRequest(url, data, options) {
+        var xhrRequest = new XMLHttpRequest();
+        xhrRequest.open(
+            'POST',
+            url,
+            true
+        );
+
+        // Set Headers
+        Object.keys(options.headers).forEach((headerKey) => {
+            xhrRequest.setRequestHeader(headerKey, options.headers[headerKey]);
+        });
+
+        // Set XHR fields
+        Object.keys(options.xhrFields).forEach((xhrFieldKey) => {
+            xhrRequest[xhrFieldKey] = options.headers[xhrFieldKey];
+        });
+
+        // Progress
+        xhrRequest.upload.addEventListener('progress', function (e) {
+            options.progress(e);
+        }, false);
+
+        // Success
+        xhrRequest.onreadystatechange = function() {
+            if (xhrRequest.readyState !== 4) {
+                return;
+            }
+
+            if ((xhrRequest.status < 200 || xhrRequest.status >= 300) && xhrRequest.status !== 304) {
+                options.error();
+                xhrRequest = null;
+                return;
+            }
+
+            var jsonResponse = JSON.parse(xhrRequest.responseText);
+            options.success(jsonResponse);
+
+            xhrRequest = null;
+        };
+
+        xhrRequest.send(data);
+    }
 
     $.extend(true, $.trumbowyg, {
         langs: {
@@ -53,6 +95,21 @@
                 file: 'File',
                 uploadError: 'Error'
             },
+            az: {
+                upload: 'Yüklə',
+                file: 'Fayl',
+                uploadError: 'Xəta'
+            },
+            by: {
+                upload: 'Загрузка',
+                file: 'Файл',
+                uploadError: 'Памылка'
+            },
+            ca: {
+                upload: 'Pujar fitxer',
+                file: 'Fitxer',
+                uploadError: 'Error'
+            },
             cs: {
                 upload: 'Nahrát obrázek',
                 file: 'Soubor',
@@ -68,6 +125,11 @@
                 file: 'Datei',
                 uploadError: 'Fehler'
             },
+            es: {
+                upload: 'Subir archivo',
+                file: 'Archivo',
+                uploadError: 'Error'
+            },
             et: {
                 upload: 'Lae üles',
                 file: 'Fail',
@@ -103,6 +165,11 @@
                 file: 'Файл',
                 uploadError: 'Ошибка'
             },
+            sl: {
+                upload: 'Naloži datoteko',
+                file: 'Datoteka',
+                uploadError: 'Napaka'
+            },
             sk: {
                 upload: 'Nahrať',
                 file: 'Súbor',
@@ -169,15 +236,17 @@
 
                                 // Callback
                                 function (values) {
+                                    const uploadPluginOptions = trumbowyg.o.plugins.upload;
+
                                     if (isUploading) {
                                         return;
                                     }
                                     isUploading = true;
 
                                     var data = new FormData();
-                                    data.append(trumbowyg.o.plugins.upload.fileFieldName, file);
+                                    data.append(uploadPluginOptions.fileFieldName, file);
 
-                                    trumbowyg.o.plugins.upload.data.map(function (cur) {
+                                    uploadPluginOptions.data.map(function (cur) {
                                         data.append(cur.name, cur.value);
                                     });
 
@@ -200,72 +269,67 @@
                                             );
                                     }
 
-                                    $.ajax({
-                                        url: trumbowyg.o.plugins.upload.serverPath,
-                                        headers: trumbowyg.o.plugins.upload.headers,
-                                        xhrFields: trumbowyg.o.plugins.upload.xhrFields,
-                                        type: 'POST',
-                                        data: data,
-                                        cache: false,
-                                        dataType: 'json',
-                                        processData: false,
-                                        contentType: false,
-
-                                        progressUpload: function (e) {
-                                            $('.' + prefix + 'progress-bar').css('width', Math.round(e.loaded * 100 / e.total) + '%');
-                                        },
-
-                                        success: function (data) {
-                                            if (trumbowyg.o.plugins.upload.success) {
-                                                trumbowyg.o.plugins.upload.success(data, trumbowyg, $modal, values);
-                                            } else {
-                                                if (!!getDeep(data, trumbowyg.o.plugins.upload.statusPropertyName.split('.'))) {
-                                                    var url = getDeep(data, trumbowyg.o.plugins.upload.urlPropertyName.split('.'));
-                                                    trumbowyg.execCmd('insertImage', url, false, true);
-                                                    var $img = $('img[src="' + url + '"]:not([alt])', trumbowyg.$box);
-                                                    $img.attr('alt', values.alt);
-                                                    if (trumbowyg.o.plugins.upload.imageWidthModalEdit && parseInt(values.width) > 0) {
-                                                        $img.attr({
-                                                            width: values.width
-                                                        });
-                                                    }
-                                                    setTimeout(function () {
-                                                        trumbowyg.closeModal();
-                                                    }, 250);
-                                                    trumbowyg.$c.trigger('tbwuploadsuccess', [trumbowyg, data, url]);
-                                                } else {
+                                    runXhrRequest(
+                                        uploadPluginOptions.serverPath,
+                                        data,
+                                        {
+                                            headers: uploadPluginOptions.headers,
+                                            xhrFields: uploadPluginOptions.xhrFields,
+
+                                            progress: function (e) {
+                                                $('.' + prefix + 'progress-bar').css('width', Math.round(e.loaded * 100 / e.total) + '%');
+                                            },
+
+                                            success: function (data) {
+                                                isUploading = false;
+
+                                                if (uploadPluginOptions.success) {
+                                                    uploadPluginOptions.success(data, trumbowyg, $modal, values);
+                                                    return;
+                                                }
+
+                                                if (!getDeep(data, uploadPluginOptions.statusPropertyName.split('.'))) {
                                                     trumbowyg.addErrorOnModalField(
                                                         $('input[type=file]', $modal),
                                                         trumbowyg.lang[data.message]
                                                     );
                                                     trumbowyg.$c.trigger('tbwuploaderror', [trumbowyg, data]);
+                                                    return;
                                                 }
-                                            }
 
-                                            isUploading = false;
-                                        },
+                                                var url = getDeep(data, uploadPluginOptions.urlPropertyName.split('.'));
+                                                trumbowyg.execCmd('insertImage', url, false, true);
+                                                var $img = $('img[src="' + url + '"]:not([alt])', trumbowyg.$box);
+                                                $img.attr('alt', values.alt);
+                                                if (uploadPluginOptions.imageWidthModalEdit && parseInt(values.width) > 0) {
+                                                    $img.attr({
+                                                        width: values.width
+                                                    });
+                                                }
+                                                trumbowyg.syncCode();
+                                                setTimeout(function () {
+                                                    trumbowyg.closeModal();
+                                                }, 250);
+                                                trumbowyg.$c.trigger('tbwuploadsuccess', [trumbowyg, data, url]);
+                                            },
 
-                                        error: trumbowyg.o.plugins.upload.error || function () {
-                                            trumbowyg.addErrorOnModalField(
-                                                $('input[type=file]', $modal),
-                                                trumbowyg.lang.uploadError
-                                            );
-                                            trumbowyg.$c.trigger('tbwuploaderror', [trumbowyg]);
+                                            error: uploadPluginOptions.error || function () {
+                                                trumbowyg.addErrorOnModalField(
+                                                    $('input[type=file]', $modal),
+                                                    trumbowyg.lang.uploadError
+                                                );
+                                                trumbowyg.$c.trigger('tbwuploaderror', [trumbowyg]);
 
-                                            isUploading = false;
+                                                isUploading = false;
+                                            }
                                         }
-                                    });
+                                    );
                                 }
                             );
 
                             $('input[type=file]').on('change', function (e) {
-                                try {
-                                    // If multiple files allowed, we just get the first.
-                                    file = e.target.files[0];
-                                } catch (err) {
-                                    // In IE8, multiple files not allowed
-                                    file = e.target.value;
-                                }
+                                // We just get the first.
+                                file = e.target.files[0];
                             });
                         }
                     };
@@ -275,25 +339,4 @@
             }
         }
     });
-
-    function addXhrProgressEvent() {
-        if (!$.trumbowyg.addedXhrProgressEvent) {   // Avoid adding progress event multiple times
-            var originalXhr = $.ajaxSettings.xhr;
-            $.ajaxSetup({
-                xhr: function () {
-                    var that = this,
-                        req = originalXhr();
-
-                    if (req && typeof req.upload === 'object' && that.progressUpload !== undefined) {
-                        req.upload.addEventListener('progress', function (e) {
-                            that.progressUpload(e);
-                        }, false);
-                    }
-
-                    return req;
-                }
-            });
-            $.trumbowyg.addedXhrProgressEvent = true;
-        }
-    }
 })(jQuery);

data/app/assets/javascripts/activeadmin/trumbowyg/plugins/upload/trumbowyg.upload.min.js

@@ -1 +1,13 @@
-!function(r){"use strict";var a={serverPath:"",fileFieldName:"fileToUpload",data:[],headers:{},xhrFields:{},urlPropertyName:"file",statusPropertyName:"success",success:void 0,error:void 0,imageWidthModalEdit:!1};function e(r,a){var o=a.shift(),l=a;if(null!==r){if(0===l.length)return r[o];if("object"==typeof r)return e(r[o],l)}return r}!function(){if(!r.trumbowyg.addedXhrProgressEvent){var a=r.ajaxSettings.xhr;r.ajaxSetup({xhr:function(){var r=this,e=a();return e&&"object"==typeof e.upload&&void 0!==r.progressUpload&&e.upload.addEventListener("progress",(function(a){r.progressUpload(a)}),!1),e}}),r.trumbowyg.addedXhrProgressEvent=!0}}(),r.extend(!0,r.trumbowyg,{langs:{en:{upload:"Upload",file:"File",uploadError:"Error"},cs:{upload:"Nahrát obrázek",file:"Soubor",uploadError:"Chyba"},da:{upload:"Upload",file:"Fil",uploadError:"Fejl"},de:{upload:"Hochladen",file:"Datei",uploadError:"Fehler"},et:{upload:"Lae üles",file:"Fail",uploadError:"Viga"},fr:{upload:"Envoi",file:"Fichier",uploadError:"Erreur"},hu:{upload:"Feltöltés",file:"Fájl",uploadError:"Hiba"},ja:{upload:"アップロード",file:"ファイル",uploadError:"エラー"},ko:{upload:"그림 올리기",file:"파일",uploadError:"에러"},pt_br:{upload:"Enviar do local",file:"Arquivo",uploadError:"Erro"},ru:{upload:"Загрузка",file:"Файл",uploadError:"Ошибка"},sk:{upload:"Nahrať",file:"Súbor",uploadError:"Chyba"},tr:{upload:"Yükle",file:"Dosya",uploadError:"Hata"},zh_cn:{upload:"上传",file:"文件",uploadError:"错误"},zh_tw:{upload:"上傳",file:"文件",uploadError:"錯誤"}},plugins:{upload:{init:function(o){o.o.plugins.upload=r.extend(!0,{},a,o.o.plugins.upload||{});var l={fn:function(){o.saveRange();var a,l=o.o.prefix,t={file:{type:"file",required:!0,attributes:{accept:"image/*"}},alt:{label:"description",value:o.getRangeText()}};o.o.plugins.upload.imageWidthModalEdit&&(t.width={value:""});var d=!1,i=o.openModalInsert(o.lang.upload,t,(function(t){if(!d){d=!0;var u=new FormData;u.append(o.o.plugins.upload.fileFieldName,a),o.o.plugins.upload.data.map((function(r){u.append(r.name,r.value)})),r.map(t,(function(r,a){"file"!==a&&u.append(a,r)})),0===r("."+l+"progress",i).length&&r("."+l+"modal-title",i).after(r("<div/>",{class:l+"progress"}).append(r("<div/>",{class:l+"progress-bar"}))),r.ajax({url:o.o.plugins.upload.serverPath,headers:o.o.plugins.upload.headers,xhrFields:o.o.plugins.upload.xhrFields,type:"POST",data:u,cache:!1,dataType:"json",processData:!1,contentType:!1,progressUpload:function(a){r("."+l+"progress-bar").css("width",Math.round(100*a.loaded/a.total)+"%")},success:function(a){if(o.o.plugins.upload.success)o.o.plugins.upload.success(a,o,i,t);else if(e(a,o.o.plugins.upload.statusPropertyName.split("."))){var l=e(a,o.o.plugins.upload.urlPropertyName.split("."));o.execCmd("insertImage",l,!1,!0);var u=r('img[src="'+l+'"]:not([alt])',o.$box);u.attr("alt",t.alt),o.o.plugins.upload.imageWidthModalEdit&&parseInt(t.width)>0&&u.attr({width:t.width}),setTimeout((function(){o.closeModal()}),250),o.$c.trigger("tbwuploadsuccess",[o,a,l])}else o.addErrorOnModalField(r("input[type=file]",i),o.lang[a.message]),o.$c.trigger("tbwuploaderror",[o,a]);d=!1},error:o.o.plugins.upload.error||function(){o.addErrorOnModalField(r("input[type=file]",i),o.lang.uploadError),o.$c.trigger("tbwuploaderror",[o]),d=!1}})}}));r("input[type=file]").on("change",(function(r){try{a=r.target.files[0]}catch(e){a=r.target.value}}))}};o.addBtnDef("upload",l)}}}})}(jQuery);
+/* ===========================================================
+ * trumbowyg.upload.js v1.2
+ * Upload plugin for Trumbowyg
+ * http://alex-d.github.com/Trumbowyg
+ * ===========================================================
+ * Author : Alexandre Demode (Alex-D)
+ *          Twitter : @AlexandreDemode
+ *          Website : alex-d.fr
+ * Mod by : Aleksandr-ru
+ *          Twitter : @Aleksandr_ru
+ *          Website : aleksandr.ru
+ */
+!function(r){"use strict";var e={serverPath:"",fileFieldName:"fileToUpload",data:[],headers:{},xhrFields:{},urlPropertyName:"file",statusPropertyName:"success",success:void 0,error:void 0,imageWidthModalEdit:!1};function a(r,e){var o=e.shift(),l=e;if(null!==r){if(0===l.length)return r[o];if("object"==typeof r)return a(r[o],l)}return r}r.extend(!0,r.trumbowyg,{langs:{en:{upload:"Upload",file:"File",uploadError:"Error"},az:{upload:"Yüklə",file:"Fayl",uploadError:"Xəta"},by:{upload:"Загрузка",file:"Файл",uploadError:"Памылка"},ca:{upload:"Pujar fitxer",file:"Fitxer",uploadError:"Error"},cs:{upload:"Nahrát obrázek",file:"Soubor",uploadError:"Chyba"},da:{upload:"Upload",file:"Fil",uploadError:"Fejl"},de:{upload:"Hochladen",file:"Datei",uploadError:"Fehler"},es:{upload:"Subir archivo",file:"Archivo",uploadError:"Error"},et:{upload:"Lae üles",file:"Fail",uploadError:"Viga"},fr:{upload:"Envoi",file:"Fichier",uploadError:"Erreur"},hu:{upload:"Feltöltés",file:"Fájl",uploadError:"Hiba"},ja:{upload:"アップロード",file:"ファイル",uploadError:"エラー"},ko:{upload:"그림 올리기",file:"파일",uploadError:"에러"},pt_br:{upload:"Enviar do local",file:"Arquivo",uploadError:"Erro"},ru:{upload:"Загрузка",file:"Файл",uploadError:"Ошибка"},sl:{upload:"Naloži datoteko",file:"Datoteka",uploadError:"Napaka"},sk:{upload:"Nahrať",file:"Súbor",uploadError:"Chyba"},tr:{upload:"Yükle",file:"Dosya",uploadError:"Hata"},zh_cn:{upload:"上传",file:"文件",uploadError:"错误"},zh_tw:{upload:"上傳",file:"文件",uploadError:"錯誤"}},plugins:{upload:{init:function(o){o.o.plugins.upload=r.extend(!0,{},e,o.o.plugins.upload||{});var l={fn:function(){o.saveRange();var e,l=o.o.prefix,t={file:{type:"file",required:!0,attributes:{accept:"image/*"}},alt:{label:"description",value:o.getRangeText()}};o.o.plugins.upload.imageWidthModalEdit&&(t.width={value:""});var i=!1,d=o.openModalInsert(o.lang.upload,t,(function(t){const u=o.o.plugins.upload;if(!i){i=!0;var s=new FormData;s.append(u.fileFieldName,e),u.data.map((function(r){s.append(r.name,r.value)})),r.map(t,(function(r,e){"file"!==e&&s.append(e,r)})),0===r("."+l+"progress",d).length&&r("."+l+"modal-title",d).after(r("<div/>",{class:l+"progress"}).append(r("<div/>",{class:l+"progress-bar"}))),function(r,e,a){var o=new XMLHttpRequest;o.open("POST",r,!0),Object.keys(a.headers).forEach((r=>{o.setRequestHeader(r,a.headers[r])})),Object.keys(a.xhrFields).forEach((r=>{o[r]=a.headers[r]})),o.upload.addEventListener("progress",(function(r){a.progress(r)}),!1),o.onreadystatechange=function(){if(4===o.readyState){if((o.status<200||o.status>=300)&&304!==o.status)return a.error(),void(o=null);var r=JSON.parse(o.responseText);a.success(r),o=null}},o.send(e)}(u.serverPath,s,{headers:u.headers,xhrFields:u.xhrFields,progress:function(e){r("."+l+"progress-bar").css("width",Math.round(100*e.loaded/e.total)+"%")},success:function(e){if(i=!1,u.success)u.success(e,o,d,t);else{if(!a(e,u.statusPropertyName.split(".")))return o.addErrorOnModalField(r("input[type=file]",d),o.lang[e.message]),void o.$c.trigger("tbwuploaderror",[o,e]);var l=a(e,u.urlPropertyName.split("."));o.execCmd("insertImage",l,!1,!0);var s=r('img[src="'+l+'"]:not([alt])',o.$box);s.attr("alt",t.alt),u.imageWidthModalEdit&&parseInt(t.width)>0&&s.attr({width:t.width}),o.syncCode(),setTimeout((function(){o.closeModal()}),250),o.$c.trigger("tbwuploadsuccess",[o,e,l])}},error:u.error||function(){o.addErrorOnModalField(r("input[type=file]",d),o.lang.uploadError),o.$c.trigger("tbwuploaderror",[o]),i=!1}})}}));r("input[type=file]").on("change",(function(r){e=r.target.files[0]}))}};o.addBtnDef("upload",l)}}}})}(jQuery);