2.22.0

Alex-D · Nov 26, 2020 · f5765a7 · f5765a7
1 parent 3fc1581
commit f5765a7
Show file tree

Hide file tree

Showing 76 changed files with 914 additions and 582 deletions.
diff --git a/dist/langs/ko.js b/dist/langs/ko.js
@@ -5,6 +5,8 @@
  * ===========================================================
  * Author : SeungWoo Chae (SDuck4)
  *          Github : https://github.com/SDuck4
+ *          Victor Chanil Park (opdev1004)
+ *          Github : https://github.com/opdev1004
  */
 
 jQuery.trumbowyg.langs.ko = {
@@ -34,7 +36,8 @@ jQuery.trumbowyg.langs.ko = {
     unorderedList: '기호 목록',
     orderedList: '번호 목록',
 
-    insertImage: '그림 넣기',
+    insertImage: '이미지 넣기',
+    insertVideo: '비디오 넣기',
     link: '링크',
     createLink: '링크 넣기',
     unlink: '링크 지우기',

diff --git a/dist/langs/ko.min.js b/dist/langs/ko.min.js
@@ -5,5 +5,7 @@
  * ===========================================================
  * Author : SeungWoo Chae (SDuck4)
  *          Github : https://github.com/SDuck4
+ *          Victor Chanil Park (opdev1004)
+ *          Github : https://github.com/opdev1004
  */
-jQuery.trumbowyg.langs.ko={viewHTML:"HTML 보기",undo:"되돌리기",redo:"다시 실행",formatting:"스타일",p:"본문",blockquote:"인용문",code:"코드",header:"제목",bold:"진하게",italic:"기울임",strikethrough:"취소선",underline:"밑줄",strong:"중요",em:"강조",del:"삭제",superscript:"위 첨자",subscript:"아래 첨자",unorderedList:"기호 목록",orderedList:"번호 목록",insertImage:"그림 넣기",link:"링크",createLink:"링크 넣기",unlink:"링크 지우기",justifyLeft:"왼쪽 정렬",justifyCenter:"가운데 정렬",justifyRight:"오른쪽 정렬",justifyFull:"양쪽 정렬",horizontalRule:"구분선 넣기",removeformat:"글꼴 효과 지우기",fullscreen:"전체 화면",close:"닫기",submit:"확인",reset:"취소",required:"필수 입력",description:"설명",title:"툴팁",text:"내용",target:"타겟",width:"너비"};
+jQuery.trumbowyg.langs.ko={viewHTML:"HTML 보기",undo:"되돌리기",redo:"다시 실행",formatting:"스타일",p:"본문",blockquote:"인용문",code:"코드",header:"제목",bold:"진하게",italic:"기울임",strikethrough:"취소선",underline:"밑줄",strong:"중요",em:"강조",del:"삭제",superscript:"위 첨자",subscript:"아래 첨자",unorderedList:"기호 목록",orderedList:"번호 목록",insertImage:"이미지 넣기",insertVideo:"비디오 넣기",link:"링크",createLink:"링크 넣기",unlink:"링크 지우기",justifyLeft:"왼쪽 정렬",justifyCenter:"가운데 정렬",justifyRight:"오른쪽 정렬",justifyFull:"양쪽 정렬",horizontalRule:"구분선 넣기",removeformat:"글꼴 효과 지우기",fullscreen:"전체 화면",close:"닫기",submit:"확인",reset:"취소",required:"필수 입력",description:"설명",title:"툴팁",text:"내용",target:"타겟",width:"너비"};
diff --git a/dist/langs/tr.js b/dist/langs/tr.js
@@ -5,6 +5,9 @@
  * ===========================================================
  * Author : Emrah Bilbay (munzur)
  *          Github : https://github.com/munzur
+ *
+ *          Özgür Görgülü (ozgurg)
+ *          Github : https://github.com/ozgurg
  */
 
 jQuery.trumbowyg.langs.tr = {
@@ -51,5 +54,8 @@ jQuery.trumbowyg.langs.tr = {
     required: 'Gerekli',
     description: 'Açıklama',
     title: 'Başlık',
-    text: 'Metin'
+    text: 'Metin',
+
+    undo: 'Geri al',
+    redo: 'İleri al'
 };
diff --git a/dist/langs/tr.min.js b/dist/langs/tr.min.js
@@ -5,5 +5,8 @@
  * ===========================================================
  * Author : Emrah Bilbay (munzur)
  *          Github : https://github.com/munzur
+ *
+ *          Özgür Görgülü (ozgurg)
+ *          Github : https://github.com/ozgurg
  */
-jQuery.trumbowyg.langs.tr={viewHTML:"HTML Kodu",formatting:"Biçimlendirme",p:"Paragraf",blockquote:"Alıntı",code:"Kod",header:"Başlık",bold:"Kalın",italic:"İtalik",strikethrough:"Üzeri çizgili",underline:"Altı çizgili",strong:"Koyu",em:"Vurgulu",del:"Üzeri çizgili",unorderedList:"Simgeli liste",orderedList:"Numaralı liste",insertImage:"Resim yerleştir",insertVideo:"Video yerleştir",link:"Link",createLink:"Link yerleştir",unlink:"Linki sil",justifyLeft:"Sola hizala",justifyCenter:"Ortaya hizala",justifyRight:"Sağa hizala",justifyFull:"Yasla",horizontalRule:"Yatay satır ekle",fullscreen:"Tam ekran",close:"Kapat",submit:"Onayla",reset:"Sıfırla",required:"Gerekli",description:"Açıklama",title:"Başlık",text:"Metin"};
+jQuery.trumbowyg.langs.tr={viewHTML:"HTML Kodu",formatting:"Biçimlendirme",p:"Paragraf",blockquote:"Alıntı",code:"Kod",header:"Başlık",bold:"Kalın",italic:"İtalik",strikethrough:"Üzeri çizgili",underline:"Altı çizgili",strong:"Koyu",em:"Vurgulu",del:"Üzeri çizgili",unorderedList:"Simgeli liste",orderedList:"Numaralı liste",insertImage:"Resim yerleştir",insertVideo:"Video yerleştir",link:"Link",createLink:"Link yerleştir",unlink:"Linki sil",justifyLeft:"Sola hizala",justifyCenter:"Ortaya hizala",justifyRight:"Sağa hizala",justifyFull:"Yasla",horizontalRule:"Yatay satır ekle",fullscreen:"Tam ekran",close:"Kapat",submit:"Onayla",reset:"Sıfırla",required:"Gerekli",description:"Açıklama",title:"Başlık",text:"Metin",undo:"Geri al",redo:"İleri al"};
diff --git a/dist/plugins/base64/trumbowyg.base64.js b/dist/plugins/base64/trumbowyg.base64.js
@@ -26,6 +26,10 @@
                 errFileReaderNotSupported: 'FileReader is not supported by your browser.',
                 errInvalidImage: 'Invalid image file.'
             },
+            cs: {
+                base64: 'Vložit obrázek',
+                file: 'Soubor'
+            },
             da: {
                 base64: 'Billede som base64',
                 file: 'Fil',
@@ -36,56 +40,58 @@
                 base64: 'Image en base64',
                 file: 'Fichier'
             },
-            cs: {
-                base64: 'Vložit obrázek',
-                file: 'Soubor'
+            hu: {
+                base64: 'Kép beszúrás inline',
+                file: 'Fájl',
+                errFileReaderNotSupported: 'Ez a böngésző nem támogatja a FileReader funkciót.',
+                errInvalidImage: 'Érvénytelen képfájl.'
             },
-            zh_cn: {
-                base64: '图片（Base64编码）',
-                file: '文件'
+            ja: {
+                base64: '画像 (Base64形式)',
+                file: 'ファイル',
+                errFileReaderNotSupported: 'あなたのブラウザーはFileReaderをサポートしていません',
+                errInvalidImage: '画像形式が正しくありません'
+            },
+            ko: {
+                base64: '그림 넣기(base64)',
+                file: '파일',
+                errFileReaderNotSupported: 'FileReader가 현재 브라우저를 지원하지 않습니다.',
+                errInvalidImage: '유효하지 않은 파일'
             },
             nl: {
                 base64: 'Afbeelding inline',
                 file: 'Bestand',
                 errFileReaderNotSupported: 'Uw browser ondersteunt deze functionaliteit niet.',
                 errInvalidImage: 'De gekozen afbeelding is ongeldig.'
             },
+            pt_br: {
+                base64: 'Imagem em base64',
+                file: 'Arquivo',
+                errFileReaderNotSupported: 'FileReader não é suportado pelo seu navegador.',
+                errInvalidImage: 'Arquivo de imagem inválido.'
+            },
             ru: {
                 base64: 'Изображение как код в base64',
                 file: 'Файл',
                 errFileReaderNotSupported: 'FileReader не поддерживается вашим браузером.',
                 errInvalidImage: 'Недопустимый файл изображения.'
             },
-            ja: {
-                base64: '画像 (Base64形式)',
-                file: 'ファイル',
-                errFileReaderNotSupported: 'あなたのブラウザーはFileReaderをサポートしていません',
-                errInvalidImage: '画像形式が正しくありません'
-            },
             tr: {
                 base64: 'Base64 olarak resim',
                 file: 'Dosya',
                 errFileReaderNotSupported: 'FileReader tarayıcınız tarafından desteklenmiyor.',
                 errInvalidImage: 'Geçersiz resim dosyası.'
             },
+            zh_cn: {
+                base64: '图片（Base64编码）',
+                file: '文件'
+            },
             zh_tw: {
                 base64: '圖片(base64編碼)',
                 file: '檔案',
                 errFileReaderNotSupported: '你的瀏覽器不支援FileReader',
                 errInvalidImage: '不正確的檔案格式'
             },
-            pt_br: {
-                base64: 'Imagem em base64',
-                file: 'Arquivo',
-                errFileReaderNotSupported: 'FileReader não é suportado pelo seu navegador.',
-                errInvalidImage: 'Arquivo de imagem inválido.'
-            },
-            ko: {
-                base64: '그림 넣기(base64)',
-                file: '파일',
-                errFileReaderNotSupported: 'FileReader가 현재 브라우저를 지원하지 않습니다.',
-                errInvalidImage: '유효하지 않은 파일'
-            },
         },
         // jshint camelcase:true
 

diff --git a/dist/plugins/base64/trumbowyg.base64.min.js b/dist/plugins/base64/trumbowyg.base64.min.js
diff --git a/dist/plugins/cleanpaste/trumbowyg.cleanpaste.js b/dist/plugins/cleanpaste/trumbowyg.cleanpaste.js
@@ -96,12 +96,48 @@
         plugins: {
             cleanPaste: {
                 init: function (trumbowyg) {
-                    trumbowyg.pasteHandlers.push(function () {
+                    trumbowyg.pasteHandlers.push(function (pasteEvent) {
                         setTimeout(function () {
-                          try {
-                              trumbowyg.$ed.html(cleanIt(trumbowyg.$ed.html()));
-                          } catch (c) {
-                          }
+                            try {
+                                trumbowyg.saveRange();
+
+                                var clipboardData = (pasteEvent.originalEvent || pasteEvent).clipboardData,
+                                pastedData = clipboardData.getData('Text'),
+                                node = trumbowyg.doc.getSelection().focusNode,
+                                range = trumbowyg.doc.createRange(),
+                                cleanedPaste = cleanIt(pastedData.trim()),
+                                newNode = $(cleanedPaste)[0] || trumbowyg.doc.createTextNode(cleanedPaste);
+
+                                if (trumbowyg.$ed.html() === '') {
+                                    // simply append if there is no content in editor
+                                    trumbowyg.$ed[0].appendChild(newNode);
+                                } else {
+                                    // insert pasted content behind last focused node
+                                    range.setStartAfter(node);
+                                    range.setEndAfter(node);
+                                    trumbowyg.doc.getSelection().removeAllRanges();
+                                    trumbowyg.doc.getSelection().addRange(range);
+
+                                    trumbowyg.range.insertNode(newNode);
+                                }
+
+                                // now set cursor right after pasted content
+                                range = trumbowyg.doc.createRange();
+                                range.setStartAfter(newNode);
+                                range.setEndAfter(newNode);
+                                trumbowyg.doc.getSelection().removeAllRanges();
+                                trumbowyg.doc.getSelection().addRange(range);
+
+                                // prevent defaults
+                                pasteEvent.stopPropagation();
+                                pasteEvent.preventDefault();
+
+                                // save new node as focused node
+                                trumbowyg.saveRange();
+                                trumbowyg.syncCode();
+                                trumbowyg.$c.trigger('tbwchange');
+                            } catch (c) {
+                            }
                         }, 0);
                     });
                 }

diff --git a/dist/plugins/cleanpaste/trumbowyg.cleanpaste.min.js b/dist/plugins/cleanpaste/trumbowyg.cleanpaste.min.js