From 7511fdd1e4c3df4ce52d713a9938b90a07a39bb8 Mon Sep 17 00:00:00 2001 From: Burak Ozdemir Date: Fri, 26 Oct 2018 01:21:40 +0300 Subject: [PATCH 01/36] fix issue with chrome wrapping contents with span. --- src/trumbowyg.js | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/trumbowyg.js b/src/trumbowyg.js index 329e9c8af..573f3bb54 100644 --- a/src/trumbowyg.js +++ b/src/trumbowyg.js @@ -570,6 +570,11 @@ Object.defineProperty(jQuery.trumbowyg, 'defaultOptions', { t.$ed .on('dblclick', 'img', t.o.imgDblClickHandler) .on('keydown', function (e) { + // append flags to differentiate Chrome spans + var keyCode = e.which; + if (keyCode === 8 || keyCode === 13 || keyCode === 46) { + t.toggleSpan(true); + } if ((e.ctrlKey || e.metaKey) && !e.altKey) { ctrl = true; var key = t.keys[String.fromCharCode(e.which).toUpperCase()]; @@ -597,6 +602,11 @@ Object.defineProperty(jQuery.trumbowyg, 'defaultOptions', { return; } + // remove Chrome generated span tags + if (keyCode === 8 || keyCode === 13 || keyCode === 46) { + t.toggleSpan(); + } + if ((e.ctrlKey || e.metaKey) && (keyCode === 89 || keyCode === 90)) { t.$c.trigger('tbwchange'); } else if (!ctrl && keyCode !== 17) { @@ -1022,6 +1032,18 @@ Object.defineProperty(jQuery.trumbowyg, 'defaultOptions', { }, 0); }, + // Remove or add flags to span tags to remove Chrome generated spans + toggleSpan: function (addFlag) { + var t = this; + t.$ed.find('span').each(function () { + if (addFlag === true) { + $(this).attr('data-tbw-flag', true); + } else { + $(this).attr('data-tbw-flag') ? $(this).removeAttr('data-tbw-flag') : $(this).contents().unwrap(); + } + }); + }, + // Open dropdown when click on a button which open that dropdown: function (name) { var t = this, From ad605a7812a97a843e7b953821f8b70e3134bb4e Mon Sep 17 00:00:00 2001 From: Sven Dunemann Date: Mon, 12 Mar 2018 15:50:15 +0100 Subject: [PATCH 02/36] Improve cleanpaste by only analyzing pasted content - only analyze new pasted content - add content right behind current cursor - set cursor right after pasted content --- plugins/cleanpaste/trumbowyg.cleanpaste.js | 41 ++++++++++++++++++++-- 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/plugins/cleanpaste/trumbowyg.cleanpaste.js b/plugins/cleanpaste/trumbowyg.cleanpaste.js index 861605470..f03422ca9 100644 --- a/plugins/cleanpaste/trumbowyg.cleanpaste.js +++ b/plugins/cleanpaste/trumbowyg.cleanpaste.js @@ -96,10 +96,45 @@ plugins: { cleanPaste: { init: function (trumbowyg) { - trumbowyg.pasteHandlers.push(function () { + trumbowyg.pasteHandlers.push(function (pasteEvent) { setTimeout(function () { try { - trumbowyg.$ed.html(cleanIt(trumbowyg.$ed.html())); + 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(); } catch (c) { } }, 0); @@ -108,4 +143,4 @@ } } }); -})(jQuery); +})(jQuery); \ No newline at end of file From ab61d0e420919abf60efde5f6c4f2a952db7f190 Mon Sep 17 00:00:00 2001 From: Marc Gruetzmacher Date: Thu, 18 Jul 2019 11:10:47 +0200 Subject: [PATCH 03/36] Create tables with tbody --- plugins/table/trumbowyg.table.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/table/trumbowyg.table.js b/plugins/table/trumbowyg.table.js index 0612c5d96..08af5688b 100644 --- a/plugins/table/trumbowyg.table.js +++ b/plugins/table/trumbowyg.table.js @@ -162,6 +162,7 @@ $dropdown.append(t.buildSubBtn('tableDestroy')); } else { var tableSelect = $(''); + $('').appendTo(tableSelect); for (var i = 0; i < t.o.plugins.table.rows; i += 1) { var row = $('').appendTo(tableSelect); for (var j = 0; j < t.o.plugins.table.columns; j += 1) { @@ -202,6 +203,7 @@ t.saveRange(); var tabler = $('
'); + $('').appendTo(tabler); if (t.o.plugins.table.styler) { tabler.attr('class', t.o.plugins.table.styler); } From 08a18b5c6668517a6d42af3b157e409d2c44b1d0 Mon Sep 17 00:00:00 2001 From: "Zane J. Chua" Date: Thu, 17 Oct 2019 13:46:29 +0800 Subject: [PATCH 04/36] Update emoji codepoints to JoyPixels v5.0.5 --- plugins/emoji/trumbowyg.emoji.js | 231 +++++++++++++++++++------------ 1 file changed, 146 insertions(+), 85 deletions(-) diff --git a/plugins/emoji/trumbowyg.emoji.js b/plugins/emoji/trumbowyg.emoji.js index 6bd09922e..1734806bf 100644 --- a/plugins/emoji/trumbowyg.emoji.js +++ b/plugins/emoji/trumbowyg.emoji.js @@ -90,6 +90,8 @@ '💙', '💜', '🖤', + '🤎', + '🤍', '💔', '💕', '💞', @@ -116,7 +118,6 @@ '♏', '🆔', '⚛', - '♾', '🉑', '📴', '📳', @@ -241,6 +242,7 @@ '🔃', '🎵', '🎶', + '♾', '💲', '💱', '©', @@ -257,6 +259,11 @@ '⚫', '🔴', '🔵', + '🟤', + '🟣', + '🟢', + '🟡', + '🟠', '🔺', '🔻', '🔸', @@ -273,6 +280,13 @@ '◻', '⬛', '⬜', + '🟧', + '🟦', + '🟥', + '🟫', + '🟪', + '🟩', + '🟨', '🔈', '🔇', '🔉', @@ -321,25 +335,26 @@ '🎾', '🏐', '🏉', + '🥏', '🎱', '🏓', '🏸', - '🥅', '🏒', '🏑', - '🏏', '🥍', + '🏏', + '🥅', '⛳', - '🥏', '🏹', '🎣', '🥊', '🥋', '🎽', '🛹', + '🛷', + '🪂', '⛸', '🥌', - '🛷', '🎿', '⛷', '🏂', @@ -381,13 +396,18 @@ '🥁', '🎷', '🎺', + '🪕', '🎸', '🎻', '🎲', + '♟', '🎯', + '🪁', + '🪀', '🎳', '🎮', '🎰', + '🧩', '⌚', '📱', '📲', @@ -397,8 +417,6 @@ '🖱', '🖲', '🕹', - '♟', - '🧩', '🗜', '💽', '💾', @@ -420,6 +438,7 @@ '🎙', '🎚', '🎛', + '🧭', '⏱', '⏲', '⏰', @@ -427,15 +446,12 @@ '⌛', '⏳', '📡', - '🧭', '🔋', '🔌', - '🧲', '💡', '🔦', '🕯', '🧯', - '🗑', '🛢', '💸', '💵', @@ -445,17 +461,20 @@ '💰', '💳', '💎', - '🧿', - '🧱', '🧰', '🔧', '🔨', '🛠', '⛏', '🔩', + '🧱', '⛓', + '🧲', '🔫', '💣', + '🧨', + '🪓', + '🪒', '🔪', '🗡', '🛡', @@ -463,32 +482,37 @@ '⚰', '⚱', '🏺', + '🪔', '🔮', '📿', + '🧿', '💈', - '🧪', - '🧫', - '🧬', - '🧮', '🔭', '🔬', '🕳', + '🦯', + '🩺', + '🩹', '💊', '💉', + '🩸', + '🧬', + '🦠', + '🧫', + '🧪', '🌡', + '🪑', + '🧹', + '🧺', + '🧻', '🚽', '🚰', '🚿', '🛁', '🛀', - '🧹', - '🧺', - '🧻', '🧼', '🧽', '🧴', - '🧵', - '🧶', '🛎', '🔑', '🗝', @@ -527,8 +551,8 @@ '📜', '📃', '📄', - '🧾', '📑', + '🧾', '📊', '📈', '📉', @@ -536,6 +560,7 @@ '🗓', '📆', '📅', + '🗑', '📇', '🗃', '🗳', @@ -556,12 +581,13 @@ '📚', '📖', '🔖', + '🧷', '🔗', '📎', '🖇', '📐', '📏', - '🧷', + '🧮', '📌', '📍', '🖊', @@ -574,17 +600,16 @@ '🔎', '🔏', '🔐', + '🔒', + '🔓', '🐶', '🐱', '🐭', '🐹', '🐰', '🦊', - '🦝', '🐻', '🐼', - '🦘', - '🦡', '🐨', '🐯', '🦁', @@ -604,11 +629,8 @@ '🐣', '🐥', '🦆', - '🦢', '🦅', '🦉', - '🦜', - '🦚', '🦇', '🐺', '🐗', @@ -621,12 +643,11 @@ '🐚', '🐞', '🐜', + '🦟', '🦗', '🕷', '🕸', '🦂', - '🦟', - '🦠', '🐢', '🐍', '🦎', @@ -635,8 +656,9 @@ '🐙', '🦑', '🦐', - '🦀', '🦞', + '🦪', + '🦀', '🐡', '🐠', '🐟', @@ -649,29 +671,41 @@ '🐆', '🦓', '🦍', + '🦧', '🐘', - '🦏', '🦛', + '🦏', '🐪', '🐫', '🦒', - '🦙', + '🦘', '🐃', '🐂', '🐄', '🐎', '🐖', '🐏', + '🦙', '🐑', '🐐', '🦌', '🐕', + '🦮', '🐩', '🐈', '🐓', '🦃', + '🦚', + '🦜', + '🦢', + '🦩', '🕊', '🐇', + '🦥', + '🦦', + '🦨', + '🦝', + '🦡', '🐁', '🐀', '🐿', @@ -719,6 +753,7 @@ '🌎', '🌍', '🌏', + '🪐', '💫', '⭐', '🌟', @@ -767,17 +802,20 @@ '🌶', '🌽', '🥕', + '🧅', + '🧄', '🥔', '🍠', '🥐', + '🥯', '🍞', '🥖', '🥨', - '🥯', '🧀', '🥚', '🍳', '🥞', + '🧇', '🥓', '🥩', '🍗', @@ -787,6 +825,7 @@ '🍟', '🍕', '🥪', + '🧆', '🥙', '🌮', '🌯', @@ -799,38 +838,41 @@ '🍛', '🍣', '🍱', + '🥟', '🍤', '🍙', '🍚', '🍘', '🍥', '🥠', + '🥮', '🍢', '🍡', '🍧', '🍨', '🍦', '🥧', + '🧁', '🍰', '🎂', - '🥮', - '🧁', '🍮', '🍭', '🍬', '🍫', '🍿', - '🧂', '🍩', - '🥟', '🍪', '🌰', '🥜', '🍯', + '🧈', '🥛', '🍼', '🍵', + '🧉', '🥤', + '🧃', + '🧊', '🍶', '🍺', '🍻', @@ -846,6 +888,7 @@ '🥣', '🥡', '🥢', + '🧂', '😀', '😃', '😄', @@ -862,8 +905,8 @@ '😉', '😌', '😍', - '😘', '🥰', + '😘', '😗', '😙', '😚', @@ -889,6 +932,7 @@ '😖', '😫', '😩', + '🥺', '😢', '😭', '😤', @@ -897,17 +941,17 @@ '🤬', '🤯', '😳', + '🥵', + '🥶', '😱', '😨', '😰', - '🥵', - '🥶', - '🥺', '😥', '😓', '🤗', '🤔', '🤭', + '🥱', '🤫', '🤥', '😶', @@ -971,6 +1015,7 @@ '🤟', '🤘', '👌', + '🤏', '👈', '👉', '👆', @@ -983,23 +1028,25 @@ '👋', '🤙', '💪', - '🦵', - '🦶', + '🦾', '🖕', '✍', '🙏', - '💍', + '🦶', + '🦵', + '🦿', '💄', '💋', '👄', + '🦷', + '🦴', '👅', '👂', + '🦻', '👃', '👣', '👀', '🧠', - '🦴', - '🦷', '🗣', '👤', '👥', @@ -1026,10 +1073,10 @@ '🤵', '👸', '🤴', - '🤶', - '🎅', '🦸', '🦹', + '🤶', + '🎅', '🧙', '🧝', '🧛', @@ -1045,6 +1092,7 @@ '🙅', '🙆', '🙋', + '🧏', '🤦', '🤷', '🙎', @@ -1060,28 +1108,38 @@ '🕴', '🚶', '🏃', + '🧍', + '🧎', '👫', '👭', '👬', '💑', '💏', '👪', + '🧶', + '🧵', '🧥', + '🥼', + '🦺', '👚', '👕', '👖', + '🩳', '👔', '👗', '👙', + '🩱', '👘', - '🥼', + '🥻', + '🥿', '👠', '👡', '👢', + '🩰', '👞', '👟', '🥾', - '🥿', + '🩲', '🧦', '🧤', '🧣', @@ -1091,45 +1149,22 @@ '🎓', '⛑', '👑', + '💍', '👝', '👛', '👜', '💼', '🎒', + '🧳', '👓', '🕶', '🥽', + '🤿', '🌂', - '🦰', '🦱', + '🦰', '🦳', '🦲', - '🇿', - '🇾', - '🇽', - '🇼', - '🇻', - '🇺', - '🇹', - '🇸', - '🇷', - '🇶', - '🇵', - '🇴', - '🇳', - '🇲', - '🇱', - '🇰', - '🇯', - '🇮', - '🇭', - '🇬', - '🇫', - '🇪', - '🇩', - '🇨', - '🇧', - '🇦', '🚗', '🚕', '🚙', @@ -1143,10 +1178,13 @@ '🚚', '🚛', '🚜', - '🛴', - '🚲', + '🛺', '🛵', '🏍', + '🛴', + '🚲', + '🦼', + '🦽', '🚨', '🚔', '🚍', @@ -1171,7 +1209,6 @@ '🛬', '🛩', '💺', - '🧳', '🛰', '🚀', '🛸', @@ -1229,6 +1266,7 @@ '🏛', '⛪', '🕌', + '🛕', '🕍', '🕋', '⛩', @@ -1242,16 +1280,39 @@ '🌠', '🎇', '🎆', - '🧨', '🌇', '🌆', '🏙', '🌃', '🌌', '🌉', - '🔒', - '🔓', '🌁', + '🇿', + '🇾', + '🇽', + '🇼', + '🇻', + '🇺', + '🇹', + '🇸', + '🇷', + '🇶', + '🇵', + '🇴', + '🇳', + '🇲', + '🇱', + '🇰', + '🇯', + '🇮', + '🇭', + '🇬', + '🇫', + '🇪', + '🇩', + '🇨', + '🇧', + '🇦', '🏳', '🏴', '🏁', From e70e3a14a4609bcdd64db712e127462fde4eb3be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Cebri=C3=A1n?= Date: Fri, 24 Jan 2020 23:47:10 +0100 Subject: [PATCH 05/36] [Highlight Plugin] Add line highlight via Prism Line Highlight plugin Extra: Add Spanish translation to the plugin --- plugins/highlight/trumbowyg.highlight.js | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/plugins/highlight/trumbowyg.highlight.js b/plugins/highlight/trumbowyg.highlight.js index 1ca737ca7..07e8c933e 100644 --- a/plugins/highlight/trumbowyg.highlight.js +++ b/plugins/highlight/trumbowyg.highlight.js @@ -5,9 +5,9 @@ // My plugin default options var defaultOptions = {}; - function highlightIt(text, language) { + function highlightIt(text, language, lineHighlight) { return [ - '
',
+            '
',
             '' + Prism.highlight(text, Prism.languages[language]) + '',
             '
',
         ].join('');
@@ -36,14 +36,20 @@
                     '
',
                     '   ',
                     '
',
+                    '
',
+                    '   ',
+                    '
'
                 ].join('\n')),
                 $language = $modal.find('.language'),
-                $code = $modal.find('.code');
+                $code = $modal.find('.code'),
+                $lineHighlight = $modal.find('.trumbowyg-line-highlight');
 
                 // Listen clicks on modal box buttons
                 $modal.on('tbwconfirm', function () {
                     trumbowyg.restoreRange();
-                    trumbowyg.execCmd('insertHTML', highlightIt($code.val(), $language.val()));
+                    trumbowyg.execCmd('insertHTML', highlightIt($code.val(), $language.val(), $lineHighlight.val()));
                     trumbowyg.execCmd('insertHTML', '

');
 
                     trumbowyg.closeModal();
@@ -61,7 +67,14 @@
         langs: {
             // jshint camelcase:false
             en: {
-                highlight: 'Code syntax highlight'
+                highlight: 'Code syntax highlight',
+                highlight_line: 'Highlight lines, e.g.: 1,3-5',
+                prism_highlight_plugin_alert: 'You must have Prism Line Highlight plugin installed'
+            },
+            es: {
+                highlight: 'Resaltado de sintaxis de código',
+                highlight_line: 'Resaltar lineas, ej: 1,3-5',
+                prism_highlight_plugin_alert: 'Debes de tener el plugin Prism Line Highlight instalado'
             },
             pt_br: {
                 highlight: 'Realçar sintaxe de código'

From 94b4ca9f132ac6147cd6734a67738541a391d3e8 Mon Sep 17 00:00:00 2001
From: Gabe Cook 
Date: Thu, 30 Jan 2020 11:40:35 -0600
Subject: [PATCH 06/36] Fix(plugin/fontsize): Change how font-size is applied
 to retain child tags.

---
 plugins/fontsize/trumbowyg.fontsize.js | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/plugins/fontsize/trumbowyg.fontsize.js b/plugins/fontsize/trumbowyg.fontsize.js
index 03bcbc4c1..0cdedf5d7 100644
--- a/plugins/fontsize/trumbowyg.fontsize.js
+++ b/plugins/fontsize/trumbowyg.fontsize.js
@@ -201,16 +201,21 @@
     function setFontSize(trumbowyg, size) {
         trumbowyg.$ed.focus();
         trumbowyg.saveRange();
-        var text = trumbowyg.range.startContainer.parentElement;
-        var selectedText = trumbowyg.getRangeText();
-        if ($(text).html() === selectedText) {
-            $(text).css('font-size', size);
-        } else {
-            trumbowyg.range.deleteContents();
-            var html = '' + selectedText + '';
-            var node = $(html)[0];
-            trumbowyg.range.insertNode(node);
-        }
+
+        // Temporary size
+        trumbowyg.execCmd('fontSize', '1');
+
+        // Find  elements that were added and change to  with chosen size
+        trumbowyg.$ed.find('font[size="1"]').replaceWith(function() {
+            return $('', {
+                css: { 'font-size': size },
+                html: this.innerHTML,
+            });
+        });
+
+        // Remove and leftover  elements
+        $(trumbowyg.range.startContainer.parentElement).find('span[style=""]').contents().unwrap();
+
         trumbowyg.restoreRange();
     }
 

From f218559608accf7df414650ca7abbdd3d591d31a Mon Sep 17 00:00:00 2001
From: Alex-D 
Date: Tue, 4 Feb 2020 15:50:56 +0100
Subject: [PATCH 07/36] docs: update google site verification

---
 docs/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/index.html b/docs/index.html
index 61887332a..6b3d26a98 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -9,7 +9,7 @@
 
     
 
-    
+    
 
     
     

From c7762018a71d28313b17f6dc71990067d7886622 Mon Sep 17 00:00:00 2001
From: Peter Aba 
Date: Wed, 5 Feb 2020 12:01:41 +0100
Subject: [PATCH 08/36] Sort plugin translations alphabetically

---
 plugins/base64/trumbowyg.base64.js            |  48 +++---
 plugins/colors/trumbowyg.colors.js            |  58 ++++----
 plugins/emoji/trumbowyg.emoji.js              |  14 +-
 plugins/fontfamily/trumbowyg.fontfamily.js    |  16 +-
 plugins/fontsize/trumbowyg.fontsize.js        | 138 +++++++++---------
 plugins/highlight/trumbowyg.highlight.js      |   6 +-
 plugins/insertaudio/trumbowyg.insertaudio.js  |  14 +-
 plugins/lineheight/trumbowyg.lineheight.js    |  54 +++----
 plugins/mathml/trumbowyg.mathml.js            |  20 +--
 plugins/mention/trumbowyg.mention.js          |  12 +-
 plugins/noembed/trumbowyg.noembed.js          |  30 ++--
 .../preformatted/trumbowyg.preformatted.js    |  22 +--
 plugins/table/trumbowyg.table.js              | 110 +++++++-------
 plugins/upload/trumbowyg.upload.js            |  58 ++++----
 14 files changed, 300 insertions(+), 300 deletions(-)

diff --git a/plugins/base64/trumbowyg.base64.js b/plugins/base64/trumbowyg.base64.js
index 41f9f2e18..29bc32e4b 100644
--- a/plugins/base64/trumbowyg.base64.js
+++ b/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,13 +40,17 @@
                 base64: 'Image en base64',
                 file: 'Fichier'
             },
-            cs: {
-                base64: 'Vložit obrázek',
-                file: 'Soubor'
+            ja: {
+                base64: '画像 (Base64形式)',
+                file: 'ファイル',
+                errFileReaderNotSupported: 'あなたのブラウザーはFileReaderをサポートしていません',
+                errInvalidImage: '画像形式が正しくありません'
             },
-            zh_cn: {
-                base64: '图片（Base64编码）',
-                file: '文件'
+            ko: {
+                base64: '그림 넣기(base64)',
+                file: '파일',
+                errFileReaderNotSupported: 'FileReader가 현재 브라우저를 지원하지 않습니다.',
+                errInvalidImage: '유효하지 않은 파일'
             },
             nl: {
                 base64: 'Afbeelding inline',
@@ -50,42 +58,34 @@
                 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/plugins/colors/trumbowyg.colors.js b/plugins/colors/trumbowyg.colors.js
index f01b95f2f..8a0404054 100644
--- a/plugins/colors/trumbowyg.colors.js
+++ b/plugins/colors/trumbowyg.colors.js
@@ -14,67 +14,67 @@
     $.extend(true, $.trumbowyg, {
         langs: {
             // jshint camelcase:false
-            cs: {
-                foreColor: 'Barva textu',
-                backColor: 'Barva pozadí'
-            },
             en: {
                 foreColor: 'Text color',
                 backColor: 'Background color',
                 foreColorRemove: 'Remove text color',
                 backColorRemove: 'Remove background color'
             },
+            cs: {
+                foreColor: 'Barva textu',
+                backColor: 'Barva pozadí'
+            },
             da: {
                 foreColor: 'Tekstfarve',
                 backColor: 'Baggrundsfarve'
             },
+            de: {
+                foreColor: 'Textfarbe',
+                backColor: 'Hintergrundfarbe'
+            },
             fr: {
                 foreColor: 'Couleur du texte',
                 backColor: 'Couleur de fond',
                 foreColorRemove: 'Supprimer la couleur du texte',
                 backColorRemove: 'Supprimer la couleur de fond'
             },
-            de: {
-                foreColor: 'Textfarbe',
-                backColor: 'Hintergrundfarbe'
+            ja: {
+                foreColor: '文字色',
+                backColor: '背景色'
+            },
+            ko: {
+                foreColor: '글자색',
+                backColor: '배경색',
+                foreColorRemove: '글자색 지우기',
+                backColorRemove: '배경색 지우기'
             },
             nl: {
                 foreColor: 'Tekstkleur',
                 backColor: 'Achtergrondkleur'
             },
-            sk: {
-                foreColor: 'Farba textu',
-                backColor: 'Farba pozadia'
-            },
-            zh_cn: {
-                foreColor: '文字颜色',
-                backColor: '背景颜色'
-            },
-            zh_tw: {
-                foreColor: '文字顏色',
-                backColor: '背景顏色'
+            pt_br: {
+                foreColor: 'Cor de fonte',
+                backColor: 'Cor de fundo'
             },
             ru: {
                 foreColor: 'Цвет текста',
                 backColor: 'Цвет выделения текста'
             },
-            ja: {
-                foreColor: '文字色',
-                backColor: '背景色'
+            sk: {
+                foreColor: 'Farba textu',
+                backColor: 'Farba pozadia'
             },
             tr: {
                 foreColor: 'Yazı rengi',
                 backColor: 'Arkaplan rengi'
             },
-            pt_br: {
-                foreColor: 'Cor de fonte',
-                backColor: 'Cor de fundo'
+            zh_cn: {
+                foreColor: '文字颜色',
+                backColor: '背景颜色'
             },
-            ko: {
-                foreColor: '글자색',
-                backColor: '배경색',
-                foreColorRemove: '글자색 지우기',
-                backColorRemove: '배경색 지우기'
+            zh_tw: {
+                foreColor: '文字顏色',
+                backColor: '背景顏色'
             },
         }
     });
diff --git a/plugins/emoji/trumbowyg.emoji.js b/plugins/emoji/trumbowyg.emoji.js
index d4b456b35..54b56001c 100644
--- a/plugins/emoji/trumbowyg.emoji.js
+++ b/plugins/emoji/trumbowyg.emoji.js
@@ -1281,20 +1281,20 @@
             fr: {
                 emoji: 'Ajouter un emoji'
             },
-            zh_cn: {
-                emoji: '添加表情'
+            ja: {
+                emoji: '絵文字の挿入'
+            },
+            ko: {
+                emoji: '이모지 넣기'
             },
             ru: {
                 emoji: 'Вставить emoji'
             },
-            ja: {
-                emoji: '絵文字の挿入'
-            },
             tr: {
                 emoji: 'Emoji ekle'
             },
-            ko: {
-                emoji: '이모지 넣기'
+            zh_cn: {
+                emoji: '添加表情'
             },
         },
         // jshint camelcase:true
diff --git a/plugins/fontfamily/trumbowyg.fontfamily.js b/plugins/fontfamily/trumbowyg.fontfamily.js
index a0952214f..08db4862d 100644
--- a/plugins/fontfamily/trumbowyg.fontfamily.js
+++ b/plugins/fontfamily/trumbowyg.fontfamily.js
@@ -10,27 +10,27 @@
             da: {
                 fontFamily: 'Skrifttype'
             },
+            de: {
+                fontFamily: 'Schriftart'
+            },
             fr: {
                 fontFamily: 'Police'
             },
-            de: {
-                fontFamily: 'Schriftart'
+            ko: {
+                fontFamily: '글꼴'
             },
             nl: {
                 fontFamily: 'Lettertype'
             },
+            pt_br: {
+                fontFamily: 'Fonte',
+            },
             tr: {
                 fontFamily: 'Yazı Tipi'
             },
             zh_tw: {
                 fontFamily: '字體',
             },
-            pt_br: {
-                fontFamily: 'Fonte',
-            },
-            ko: {
-                fontFamily: '글꼴'
-            },
         }
     });
     // jshint camelcase:true
diff --git a/plugins/fontsize/trumbowyg.fontsize.js b/plugins/fontsize/trumbowyg.fontsize.js
index 0cdedf5d7..f2fd75af8 100644
--- a/plugins/fontsize/trumbowyg.fontsize.js
+++ b/plugins/fontsize/trumbowyg.fontsize.js
@@ -20,6 +20,33 @@
                     value: '48px'
                 }
             },
+            da: {
+                fontsize: 'Skriftstørrelse',
+                fontsizes: {
+                    'x-small': 'Ekstra lille',
+                    'small': 'Lille',
+                    'medium': 'Normal',
+                    'large': 'Stor',
+                    'x-large': 'Ekstra stor',
+                    'custom': 'Brugerdefineret'
+                }
+            },
+            de: {
+                fontsize: 'Schriftgröße',
+                fontsizes: {
+                    'x-small': 'Sehr klein',
+                    'small': 'Klein',
+                    'medium': 'Normal',
+                    'large': 'Groß',
+                    'x-large': 'Sehr groß',
+                    'custom': 'Benutzerdefiniert'
+                },
+                fontCustomSize: {
+                    title: 'Benutzerdefinierte Schriftgröße',
+                    label: 'Schriftgröße',
+                    value: '48px'
+                }
+            },
             es: {
                 fontsize: 'Tamaño de Fuente',
                 fontsizes: {
@@ -36,17 +63,6 @@
                     value: '48px'
                 }
             },
-            da: {
-                fontsize: 'Skriftstørrelse',
-                fontsizes: {
-                    'x-small': 'Ekstra lille',
-                    'small': 'Lille',
-                    'medium': 'Normal',
-                    'large': 'Stor',
-                    'x-large': 'Ekstra stor',
-                    'custom': 'Brugerdefineret'
-                }
-            },
             fr: {
                 fontsize: 'Taille de la police',
                 fontsizes: {
@@ -63,19 +79,35 @@
                     value: '48px'
                 }
             },
-            de: {
-                fontsize: 'Schriftgröße',
+            it: {
+                fontsize: 'Dimensioni del testo',
                 fontsizes: {
-                    'x-small': 'Sehr klein',
-                    'small': 'Klein',
-                    'medium': 'Normal',
-                    'large': 'Groß',
-                    'x-large': 'Sehr groß',
-                    'custom': 'Benutzerdefiniert'
+                    'x-small': 'Molto piccolo',
+                    'small': 'piccolo',
+                    'regular': 'normale',
+                    'large': 'grande',
+                    'x-large': 'Molto grande',
+                    'custom': 'Personalizzato'
                 },
                 fontCustomSize: {
-                    title: 'Benutzerdefinierte Schriftgröße',
-                    label: 'Schriftgröße',
+                    title: 'Dimensioni del testo personalizzato',
+                    label: 'Dimensioni del testo',
+                    value: '48px'
+                }
+            },
+            ko: {
+                fontsize: '글꼴 크기',
+                fontsizes: {
+                    'x-small': '아주 작게',
+                    'small': '작게',
+                    'medium': '보통',
+                    'large': '크게',
+                    'x-large': '아주 크게',
+                    'custom': '사용자 지정'
+                },
+                fontCustomSize: {
+                    title: '사용자 지정 글꼴 크기',
+                    label: '글꼴 크기',
                     value: '48px'
                 }
             },
@@ -90,6 +122,22 @@
                     'custom': 'Tilpasset'
                 }
             },
+            pt_br: {
+                fontsize: 'Tamanho da fonte',
+                fontsizes: {
+                    'x-small': 'Extra pequeno',
+                    'small': 'Pequeno',
+                    'regular': 'Médio',
+                    'large': 'Grande',
+                    'x-large': 'Extra grande',
+                    'custom': 'Personalizado'
+                },
+                fontCustomSize: {
+                    title: 'Tamanho de Fonte Personalizado',
+                    label: 'Tamanho de Fonte',
+                    value: '48px'
+                }
+            },
             tr: {
                 fontsize: 'Yazı Boyutu',
                 fontsizes: {
@@ -117,54 +165,6 @@
                     value: '48px'
                 }
             },
-            pt_br: {
-                fontsize: 'Tamanho da fonte',
-                fontsizes: {
-                    'x-small': 'Extra pequeno',
-                    'small': 'Pequeno',
-                    'regular': 'Médio',
-                    'large': 'Grande',
-                    'x-large': 'Extra grande',
-                    'custom': 'Personalizado'
-                },
-                fontCustomSize: {
-                    title: 'Tamanho de Fonte Personalizado',
-                    label: 'Tamanho de Fonte',
-                    value: '48px'
-                }
-            },
-            it: {
-                fontsize: 'Dimensioni del testo',
-                fontsizes: {
-                    'x-small': 'Molto piccolo',
-                    'small': 'piccolo',
-                    'regular': 'normale',
-                    'large': 'grande',
-                    'x-large': 'Molto grande',
-                    'custom': 'Personalizzato'
-                },
-                fontCustomSize: {
-                    title: 'Dimensioni del testo personalizzato',
-                    label: 'Dimensioni del testo',
-                    value: '48px'
-                }
-            },
-            ko: {
-                fontsize: '글꼴 크기',
-                fontsizes: {
-                    'x-small': '아주 작게',
-                    'small': '작게',
-                    'medium': '보통',
-                    'large': '크게',
-                    'x-large': '아주 크게',
-                    'custom': '사용자 지정'
-                },
-                fontCustomSize: {
-                    title: '사용자 지정 글꼴 크기',
-                    label: '글꼴 크기',
-                    value: '48px'
-                }
-            },
         }
     });
     // jshint camelcase:true
diff --git a/plugins/highlight/trumbowyg.highlight.js b/plugins/highlight/trumbowyg.highlight.js
index 1ca737ca7..9f839577d 100644
--- a/plugins/highlight/trumbowyg.highlight.js
+++ b/plugins/highlight/trumbowyg.highlight.js
@@ -63,12 +63,12 @@
             en: {
                 highlight: 'Code syntax highlight'
             },
-            pt_br: {
-                highlight: 'Realçar sintaxe de código'
-            },
             ko: {
                 highlight: '코드 문법 하이라이트'
             },
+            pt_br: {
+                highlight: 'Realçar sintaxe de código'
+            },
             // jshint camelcase:true
         },
         // Add our plugin to Trumbowyg registered plugins
diff --git a/plugins/insertaudio/trumbowyg.insertaudio.js b/plugins/insertaudio/trumbowyg.insertaudio.js
index 821c315e5..f71aa31c1 100644
--- a/plugins/insertaudio/trumbowyg.insertaudio.js
+++ b/plugins/insertaudio/trumbowyg.insertaudio.js
@@ -43,20 +43,20 @@
             fr: {
                 insertAudio: 'Insérer un son'
             },
-            ru: {
-                insertAudio: 'Вставить аудио'
-            },
             ja: {
                 insertAudio: '音声の挿入'
             },
-            tr: {
-                insertAudio: 'Ses Ekle'
+            ko: {
+                insertAudio: '소리 넣기'
             },
             pt_br: {
                 insertAudio: 'Inserir áudio'
             },
-            ko: {
-                insertAudio: '소리 넣기'
+            ru: {
+                insertAudio: 'Вставить аудио'
+            },
+            tr: {
+                insertAudio: 'Ses Ekle'
             },
             // jshint camelcase:true
         },
diff --git a/plugins/lineheight/trumbowyg.lineheight.js b/plugins/lineheight/trumbowyg.lineheight.js
index 148a4a6e8..eeda0d07c 100644
--- a/plugins/lineheight/trumbowyg.lineheight.js
+++ b/plugins/lineheight/trumbowyg.lineheight.js
@@ -31,6 +31,24 @@
                     '2.0': 'Très grande'
                 }
             },
+            it: {
+                lineheight: 'Altezza linea',
+                lineheights: {
+                    '0.9': 'Bassa',
+                    'normal': 'Normale',
+                    '1.5': 'Alta',
+                    '2.0': 'Molto alta'
+                }
+            },
+            ko: {
+                lineheight: '줄 간격',
+                lineheights: {
+                    '0.9': '좁게',
+                    'normal': '보통',
+                    '1.5': '넓게',
+                    '2.0': '아주 넓게'
+                }
+            },
             nl: {
                 lineheight: 'Regelhoogte',
                 lineheights: {
@@ -40,6 +58,15 @@
                     '2.0': 'Extra groot'
                 }
             },
+            pt_br: {
+                lineheight: 'Altura de linha',
+                lineheights: {
+                    '0.9': 'Pequena',
+                    'normal': 'Regular',
+                    '1.5': 'Grande',
+                    '2.0': 'Extra grande'
+                }
+            },
             tr: {
                 lineheight: 'Satır yüksekliği',
                 lineheights: {
@@ -58,33 +85,6 @@
                     '2.0': '特大'
                 }
             },
-            pt_br: {
-                lineheight: 'Altura de linha',
-                lineheights: {
-                    '0.9': 'Pequena',
-                    'normal': 'Regular',
-                    '1.5': 'Grande',
-                    '2.0': 'Extra grande'
-                }
-            },
-            it: {
-                lineheight: 'Altezza linea',
-                lineheights: {
-                    '0.9': 'Bassa',
-                    'normal': 'Normale',
-                    '1.5': 'Alta',
-                    '2.0': 'Molto alta'
-                }
-            },
-            ko: {
-                lineheight: '줄 간격',
-                lineheights: {
-                    '0.9': '좁게',
-                    'normal': '보통',
-                    '1.5': '넓게',
-                    '2.0': '아주 넓게'
-                }
-            },
         }
     });
     // jshint camelcase:true
diff --git a/plugins/mathml/trumbowyg.mathml.js b/plugins/mathml/trumbowyg.mathml.js
index f3fee8a46..a472a8a85 100644
--- a/plugins/mathml/trumbowyg.mathml.js
+++ b/plugins/mathml/trumbowyg.mathml.js
@@ -27,6 +27,16 @@
                 formulas: 'Formule',
                 inline: 'En ligne'
             },
+            ko: {
+                mathml: '수식 넣기',
+                formulas: '수식',
+                inline: '글 안에 넣기'
+            },
+            pt_br: {
+                mathml: 'Inserir fórmulas',
+                formulas: 'Fórmulas',
+                inline: 'Em linha'
+            },
             tr: {
                 mathml: 'Formül Ekle',
                 formulas: 'Formüller',
@@ -37,16 +47,6 @@
                 formulas: '方程式',
                 inline: '內嵌'
             },
-            pt_br: {
-                mathml: 'Inserir fórmulas',
-                formulas: 'Fórmulas',
-                inline: 'Em linha'
-            },
-            ko: {
-                mathml: '수식 넣기',
-                formulas: '수식',
-                inline: '글 안에 넣기'
-            },
         },
         // jshint camelcase:true
 
diff --git a/plugins/mention/trumbowyg.mention.js b/plugins/mention/trumbowyg.mention.js
index 379fd0041..1c30b44ab 100644
--- a/plugins/mention/trumbowyg.mention.js
+++ b/plugins/mention/trumbowyg.mention.js
@@ -29,6 +29,12 @@
             fr: {
                 mention: 'Mentionner'
             },
+            ko: {
+                mention: '언급'
+            },
+            pt_br: {
+                mention: 'Menção'
+            },
             ru: {
                 mention: 'Упомянуть'
             },
@@ -38,12 +44,6 @@
             zh_tw: {
                 mention: '標記'
             },
-            pt_br: {
-                mention: 'Menção'
-            },
-            ko: {
-                mention: '언급'
-            },
             // jshint camelcase:true
         },
 
diff --git a/plugins/noembed/trumbowyg.noembed.js b/plugins/noembed/trumbowyg.noembed.js
index 212d6784f..e0e4df37a 100644
--- a/plugins/noembed/trumbowyg.noembed.js
+++ b/plugins/noembed/trumbowyg.noembed.js
@@ -24,23 +24,31 @@
                 noembed: 'Noembed',
                 noembedError: 'Error'
             },
+            cs: {
+                noembedError: 'Chyba'
+            },
             da: {
                 noembedError: 'Fejl'
             },
-            sk: {
-                noembedError: 'Chyba'
-            },
             fr: {
                 noembedError: 'Erreur'
             },
-            cs: {
-                noembedError: 'Chyba'
+            ja: {
+                noembedError: 'エラー'
+            },
+            ko: {
+                noembed: 'oEmbed 넣기',
+                noembedError: '에러'
+            },
+            pt_br: {
+                noembed: 'Incorporar',
+                noembedError: 'Erro'
             },
             ru: {
                 noembedError: 'Ошибка'
             },
-            ja: {
-                noembedError: 'エラー'
+            sk: {
+                noembedError: 'Chyba'
             },
             tr: {
                 noembedError: 'Hata'
@@ -49,14 +57,6 @@
                 noembed: '插入影片',
                 noembedError: '錯誤'
             },
-            pt_br: {
-                noembed: 'Incorporar',
-                noembedError: 'Erro'
-            },
-            ko: {
-                noembed: 'oEmbed 넣기',
-                noembedError: '에러'
-            },
             // jshint camelcase:true
         },
 
diff --git a/plugins/preformatted/trumbowyg.preformatted.js b/plugins/preformatted/trumbowyg.preformatted.js
index a42de4bb5..13b2668ce 100644
--- a/plugins/preformatted/trumbowyg.preformatted.js
+++ b/plugins/preformatted/trumbowyg.preformatted.js
@@ -22,30 +22,30 @@
             fr: {
                 preformatted: 'Exemple de code 
'
             },
+            ja: {
+                preformatted: 'コードサンプル 
'
+            },
             it: {
                 preformatted: 'Codice 
'
             },
-            zh_cn: {
-                preformatted: '代码示例 
'
+            ko: {
+                preformatted: '코드 예제 
'
+            },
+            pt_br: {
+                preformatted: 'Exemple de código 
'
             },
             ru: {
                 preformatted: 'Пример кода 
'
             },
-            ja: {
-                preformatted: 'コードサンプル 
'
-            },
             tr: {
                 preformatted: 'Kod örneği 
'
             },
+            zh_cn: {
+                preformatted: '代码示例 
'
+            },
             zh_tw: {
                 preformatted: '代碼範例 
'
             },
-            pt_br: {
-                preformatted: 'Exemple de código 
'
-            },
-            ko: {
-                preformatted: '코드 예제 
'
-            },
         },
         // jshint camelcase:true
 
diff --git a/plugins/table/trumbowyg.table.js b/plugins/table/trumbowyg.table.js
index f04f5a42c..b620d7cf1 100644
--- a/plugins/table/trumbowyg.table.js
+++ b/plugins/table/trumbowyg.table.js
@@ -29,6 +29,14 @@
                 tableDestroy: 'Delete table',
                 error: 'Error'
             },
+            cs: {
+                table: 'Vytvořit příkaz Table',
+                tableAddRow: 'Přidat řádek',
+                tableAddRowAbove: 'Přidat řádek',
+                tableAddColumnLeft: 'Přidat sloupec',
+                tableAddColumn: 'Přidat sloupec',
+                error: 'Chyba'
+            },
             da: {
                 table: 'Indsæt tabel',
                 tableAddRow: 'Tilføj række',
@@ -51,14 +59,6 @@
                 tableDestroy: 'Tabelle löschen',
                 error: 'Error'
             },
-            sk: {
-                table: 'Vytvoriť tabuľky',
-                tableAddRow: 'Pridať riadok',
-                tableAddRowAbove: 'Pridať riadok',
-                tableAddColumnLeft: 'Pridať stĺpec',
-                tableAddColumn: 'Pridať stĺpec',
-                error: 'Chyba'
-            },
             fr: {
                 table: 'Insérer un tableau',
                 tableAddRow: 'Ajouter des lignes',
@@ -70,13 +70,46 @@
                 tableDestroy: 'Effacer le tableau',
                 error: 'Erreur'
             },
-            cs: {
-                table: 'Vytvořit příkaz Table',
-                tableAddRow: 'Přidat řádek',
-                tableAddRowAbove: 'Přidat řádek',
-                tableAddColumnLeft: 'Přidat sloupec',
-                tableAddColumn: 'Přidat sloupec',
-                error: 'Chyba'
+            id: {
+                table: 'Sisipkan tabel',
+                tableAddRow: 'Sisipkan baris',
+                tableAddRowAbove: 'Sisipkan baris',
+                tableAddColumnLeft: 'Sisipkan kolom',
+                tableAddColumn: 'Sisipkan kolom',
+                tableDeleteRow: 'Hapus baris',
+                tableDeleteColumn: 'Hapus kolom',
+                tableDestroy: 'Hapus tabel',
+                error: 'Galat'
+            },
+            ja: {
+                table: '表の挿入',
+                tableAddRow: '行の追加',
+                tableAddRowAbove: '行の追加',
+                tableAddColumnLeft: '列の追加',
+                tableAddColumn: '列の追加',
+                error: 'エラー'
+            },
+            ko: {
+                table: '표 넣기',
+                tableAddRow: '줄 추가',
+                tableAddRowAbove: '줄 추가',
+                tableAddColumnLeft: '칸 추가',
+                tableAddColumn: '칸 추가',
+                tableDeleteRow: '줄 삭제',
+                tableDeleteColumn: '칸 삭제',
+                tableDestroy: '표 지우기',
+                error: '에러'
+            },
+            pt_br: {
+                table: 'Inserir tabela',
+                tableAddRow: 'Adicionar linha',
+                tableAddRowAbove: 'Adicionar linha',
+                tableAddColumnLeft: 'Adicionar coluna',
+                tableAddColumn: 'Adicionar coluna',
+                tableDeleteRow: 'Deletar linha',
+                tableDeleteColumn: 'Deletar coluna',
+                tableDestroy: 'Deletar tabela',
+                error: 'Erro'
             },
             ru: {
                 table: 'Вставить таблицу',
@@ -89,13 +122,13 @@
                 tableDestroy: 'Удалить таблицу',
                 error: 'Ошибка'
             },
-            ja: {
-                table: '表の挿入',
-                tableAddRow: '行の追加',
-                tableAddRowAbove: '行の追加',
-                tableAddColumnLeft: '列の追加',
-                tableAddColumn: '列の追加',
-                error: 'エラー'
+            sk: {
+                table: 'Vytvoriť tabuľky',
+                tableAddRow: 'Pridať riadok',
+                tableAddRowAbove: 'Pridať riadok',
+                tableAddColumnLeft: 'Pridať stĺpec',
+                tableAddColumn: 'Pridať stĺpec',
+                error: 'Chyba'
             },
             tr: {
                 table: 'Tablo ekle',
@@ -116,39 +149,6 @@
                 tableDestroy: '刪除表格',
                 error: '錯誤'
             },
-            id: {
-                table: 'Sisipkan tabel',
-                tableAddRow: 'Sisipkan baris',
-                tableAddRowAbove: 'Sisipkan baris',
-                tableAddColumnLeft: 'Sisipkan kolom',
-                tableAddColumn: 'Sisipkan kolom',
-                tableDeleteRow: 'Hapus baris',
-                tableDeleteColumn: 'Hapus kolom',
-                tableDestroy: 'Hapus tabel',
-                error: 'Galat'
-            },
-            pt_br: {
-                table: 'Inserir tabela',
-                tableAddRow: 'Adicionar linha',
-                tableAddRowAbove: 'Adicionar linha',
-                tableAddColumnLeft: 'Adicionar coluna',
-                tableAddColumn: 'Adicionar coluna',
-                tableDeleteRow: 'Deletar linha',
-                tableDeleteColumn: 'Deletar coluna',
-                tableDestroy: 'Deletar tabela',
-                error: 'Erro'
-            },
-            ko: {
-                table: '표 넣기',
-                tableAddRow: '줄 추가',
-                tableAddRowAbove: '줄 추가',
-                tableAddColumnLeft: '칸 추가',
-                tableAddColumn: '칸 추가',
-                tableDeleteRow: '줄 삭제',
-                tableDeleteColumn: '칸 삭제',
-                tableDestroy: '표 지우기',
-                error: '에러'
-            },
             // jshint camelcase:true
         },
 
diff --git a/plugins/upload/trumbowyg.upload.js b/plugins/upload/trumbowyg.upload.js
index 54f75090e..058eea037 100644
--- a/plugins/upload/trumbowyg.upload.js
+++ b/plugins/upload/trumbowyg.upload.js
@@ -53,6 +53,11 @@
                 file: 'File',
                 uploadError: 'Error'
             },
+            cs: {
+                upload: 'Nahrát obrázek',
+                file: 'Soubor',
+                uploadError: 'Chyba'
+            },
             da: {
                 upload: 'Upload',
                 file: 'Fil',
@@ -63,55 +68,50 @@
                 file: 'Datei',
                 uploadError: 'Fehler'
             },
-            sk: {
-                upload: 'Nahrať',
-                file: 'Súbor',
-                uploadError: 'Chyba'
-            },
             fr: {
                 upload: 'Envoi',
                 file: 'Fichier',
                 uploadError: 'Erreur'
             },
-            cs: {
-                upload: 'Nahrát obrázek',
-                file: 'Soubor',
-                uploadError: 'Chyba'
-            },
-            zh_cn: {
-                upload: '上传',
-                file: '文件',
-                uploadError: '错误'
-            },
-            zh_tw: {
-                upload: '上傳',
-                file: '文件',
-                uploadError: '錯誤'
-            },
-            ru: {
-                upload: 'Загрузка',
-                file: 'Файл',
-                uploadError: 'Ошибка'
-            },
             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'
             },
-            ko: {
-                upload: '그림 올리기',
-                file: '파일',
-                uploadError: '에러'
+            zh_cn: {
+                upload: '上传',
+                file: '文件',
+                uploadError: '错误'
+            },
+            zh_tw: {
+                upload: '上傳',
+                file: '文件',
+                uploadError: '錯誤'
             },
         },
         // jshint camelcase:true

From ed52d7185461e46fee9233c2b07e860c9670a546 Mon Sep 17 00:00:00 2001
From: Peter Aba 
Date: Wed, 5 Feb 2020 20:43:52 +0100
Subject: [PATCH 09/36] Add Hungarian plugin translations

---
 plugins/base64/trumbowyg.base64.js            |  6 ++++
 plugins/colors/trumbowyg.colors.js            |  6 ++++
 plugins/emoji/trumbowyg.emoji.js              |  3 ++
 plugins/fontfamily/trumbowyg.fontfamily.js    |  3 ++
 plugins/fontsize/trumbowyg.fontsize.js        | 16 +++++++++
 plugins/giphy/trumbowyg.giphy.js              |  3 ++
 plugins/highlight/trumbowyg.highlight.js      |  3 ++
 plugins/history/trumbowyg.history.js          | 36 +++++++++++--------
 plugins/insertaudio/trumbowyg.insertaudio.js  |  3 ++
 plugins/lineheight/trumbowyg.lineheight.js    |  9 +++++
 plugins/mathml/trumbowyg.mathml.js            |  5 +++
 plugins/mention/trumbowyg.mention.js          |  3 ++
 plugins/noembed/trumbowyg.noembed.js          |  4 +++
 .../preformatted/trumbowyg.preformatted.js    |  7 ++--
 plugins/ruby/trumbowyg.ruby.js                |  5 +++
 .../specialchars/trumbowyg.specialchars.js    |  3 ++
 plugins/table/trumbowyg.table.js              | 11 ++++++
 plugins/template/trumbowyg.template.js        |  3 ++
 plugins/upload/trumbowyg.upload.js            |  5 +++
 19 files changed, 117 insertions(+), 17 deletions(-)

diff --git a/plugins/base64/trumbowyg.base64.js b/plugins/base64/trumbowyg.base64.js
index 29bc32e4b..633e37870 100644
--- a/plugins/base64/trumbowyg.base64.js
+++ b/plugins/base64/trumbowyg.base64.js
@@ -40,6 +40,12 @@
                 base64: 'Image en base64',
                 file: 'Fichier'
             },
+            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.'
+            },
             ja: {
                 base64: '画像 (Base64形式)',
                 file: 'ファイル',
diff --git a/plugins/colors/trumbowyg.colors.js b/plugins/colors/trumbowyg.colors.js
index 8a0404054..e544beaf5 100644
--- a/plugins/colors/trumbowyg.colors.js
+++ b/plugins/colors/trumbowyg.colors.js
@@ -38,6 +38,12 @@
                 foreColorRemove: 'Supprimer la couleur du texte',
                 backColorRemove: 'Supprimer la couleur de fond'
             },
+            hu: {
+                foreColor: 'Betű szín',
+                backColor: 'Háttér szín',
+                foreColorRemove: 'Betű szín eltávolítása',
+                backColorRemove: 'Háttér szín eltávolítása'
+            },
             ja: {
                 foreColor: '文字色',
                 backColor: '背景色'
diff --git a/plugins/emoji/trumbowyg.emoji.js b/plugins/emoji/trumbowyg.emoji.js
index 54b56001c..4752727b1 100644
--- a/plugins/emoji/trumbowyg.emoji.js
+++ b/plugins/emoji/trumbowyg.emoji.js
@@ -1281,6 +1281,9 @@
             fr: {
                 emoji: 'Ajouter un emoji'
             },
+            hu: {
+                emoji: 'Emoji beszúrás'
+            },
             ja: {
                 emoji: '絵文字の挿入'
             },
diff --git a/plugins/fontfamily/trumbowyg.fontfamily.js b/plugins/fontfamily/trumbowyg.fontfamily.js
index 08db4862d..308f6d051 100644
--- a/plugins/fontfamily/trumbowyg.fontfamily.js
+++ b/plugins/fontfamily/trumbowyg.fontfamily.js
@@ -16,6 +16,9 @@
             fr: {
                 fontFamily: 'Police'
             },
+            hu: {
+                fontFamily: 'Betűtípus'
+            },
             ko: {
                 fontFamily: '글꼴'
             },
diff --git a/plugins/fontsize/trumbowyg.fontsize.js b/plugins/fontsize/trumbowyg.fontsize.js
index f2fd75af8..843e3bb2f 100644
--- a/plugins/fontsize/trumbowyg.fontsize.js
+++ b/plugins/fontsize/trumbowyg.fontsize.js
@@ -79,6 +79,22 @@
                     value: '48px'
                 }
             },
+            hu: {
+                fontsize: 'Betű méret',
+                fontsizes: {
+                    'x-small': 'Extra kicsi',
+                    'small': 'Kicsi',
+                    'medium': 'Normális',
+                    'large': 'Nagy',
+                    'x-large': 'Extra nagy',
+                    'custom': 'Egyedi'
+                },
+                fontCustomSize: {
+                    title: 'Egyedi betű méret',
+                    label: 'Betű méret',
+                    value: '48px'
+                }
+            },
             it: {
                 fontsize: 'Dimensioni del testo',
                 fontsizes: {
diff --git a/plugins/giphy/trumbowyg.giphy.js b/plugins/giphy/trumbowyg.giphy.js
index 4c3dc75e5..afaae49bf 100644
--- a/plugins/giphy/trumbowyg.giphy.js
+++ b/plugins/giphy/trumbowyg.giphy.js
@@ -10,6 +10,9 @@
       fr: {
         giphy: 'Insérer un GIF',
       },
+      hu: {
+        giphy: 'GIF beszúrás',
+      },
       // jshint camelcase:true
     }
   });
diff --git a/plugins/highlight/trumbowyg.highlight.js b/plugins/highlight/trumbowyg.highlight.js
index 9f839577d..3cb63ba46 100644
--- a/plugins/highlight/trumbowyg.highlight.js
+++ b/plugins/highlight/trumbowyg.highlight.js
@@ -63,6 +63,9 @@
             en: {
                 highlight: 'Code syntax highlight'
             },
+            hu: {
+                highlight: 'Kód kiemelés'
+            },
             ko: {
                 highlight: '코드 문법 하이라이트'
             },
diff --git a/plugins/history/trumbowyg.history.js b/plugins/history/trumbowyg.history.js
index a66769932..4a495c743 100644
--- a/plugins/history/trumbowyg.history.js
+++ b/plugins/history/trumbowyg.history.js
@@ -11,12 +11,6 @@
     $.extend(true, $.trumbowyg, {
         langs: {
             // jshint camelcase:false
-            de: {
-                history: {
-                    redo: 'Wiederholen',
-                    undo: 'Rückgängig'
-                }
-            },
             en: {
                 history: {
                     redo: 'Redo',
@@ -29,22 +23,22 @@
                     undo: 'Fortryd'
                 }
             },
+            de: {
+                history: {
+                    redo: 'Wiederholen',
+                    undo: 'Rückgängig'
+                }
+            },
             fr: {
                 history: {
                     redo: 'Annuler',
                     undo: 'Rétablir'
                 }
             },
-            zh_tw: {
-               history: {
-                   redo: '重做',
-                   undo: '復原'
-               }
-            },
-            pt_br: {
+            hu: {
                 history: {
-                    redo: 'Refazer',
-                    undo: 'Desfazer'
+                    redo: 'Visszállít',
+                    undo: 'Visszavon'
                 }
             },
             ko: {
@@ -53,6 +47,18 @@
                     undo: '되돌리기'
                 }
             },
+            pt_br: {
+                history: {
+                    redo: 'Refazer',
+                    undo: 'Desfazer'
+                }
+            },
+            zh_tw: {
+               history: {
+                   redo: '重做',
+                   undo: '復原'
+               }
+            },
             // jshint camelcase:true
         },
         plugins: {
diff --git a/plugins/insertaudio/trumbowyg.insertaudio.js b/plugins/insertaudio/trumbowyg.insertaudio.js
index f71aa31c1..62c65834e 100644
--- a/plugins/insertaudio/trumbowyg.insertaudio.js
+++ b/plugins/insertaudio/trumbowyg.insertaudio.js
@@ -43,6 +43,9 @@
             fr: {
                 insertAudio: 'Insérer un son'
             },
+            hu: {
+                insertAudio: 'Audio beszúrás'
+            },
             ja: {
                 insertAudio: '音声の挿入'
             },
diff --git a/plugins/lineheight/trumbowyg.lineheight.js b/plugins/lineheight/trumbowyg.lineheight.js
index eeda0d07c..5425983a7 100644
--- a/plugins/lineheight/trumbowyg.lineheight.js
+++ b/plugins/lineheight/trumbowyg.lineheight.js
@@ -31,6 +31,15 @@
                     '2.0': 'Très grande'
                 }
             },
+            hu: {
+                lineheight: 'Line height',
+                lineheights: {
+                    '0.9': 'Small',
+                    'normal': 'Regular',
+                    '1.5': 'Large',
+                    '2.0': 'Extra large'
+                }
+            },
             it: {
                 lineheight: 'Altezza linea',
                 lineheights: {
diff --git a/plugins/mathml/trumbowyg.mathml.js b/plugins/mathml/trumbowyg.mathml.js
index a472a8a85..7deba1e2f 100644
--- a/plugins/mathml/trumbowyg.mathml.js
+++ b/plugins/mathml/trumbowyg.mathml.js
@@ -27,6 +27,11 @@
                 formulas: 'Formule',
                 inline: 'En ligne'
             },
+            hu: {
+                mathml: 'Formulák beszúrás',
+                formulas: 'Formulák',
+                inline: 'Inline'
+            },
             ko: {
                 mathml: '수식 넣기',
                 formulas: '수식',
diff --git a/plugins/mention/trumbowyg.mention.js b/plugins/mention/trumbowyg.mention.js
index 1c30b44ab..24c13805f 100644
--- a/plugins/mention/trumbowyg.mention.js
+++ b/plugins/mention/trumbowyg.mention.js
@@ -29,6 +29,9 @@
             fr: {
                 mention: 'Mentionner'
             },
+            hu: {
+                mention: 'Említ'
+            },
             ko: {
                 mention: '언급'
             },
diff --git a/plugins/noembed/trumbowyg.noembed.js b/plugins/noembed/trumbowyg.noembed.js
index e0e4df37a..3bc69d503 100644
--- a/plugins/noembed/trumbowyg.noembed.js
+++ b/plugins/noembed/trumbowyg.noembed.js
@@ -33,6 +33,10 @@
             fr: {
                 noembedError: 'Erreur'
             },
+            hu: {
+                noembed: 'Noembed',
+                noembedError: 'Hiba'
+            },
             ja: {
                 noembedError: 'エラー'
             },
diff --git a/plugins/preformatted/trumbowyg.preformatted.js b/plugins/preformatted/trumbowyg.preformatted.js
index 13b2668ce..2c36ad85a 100644
--- a/plugins/preformatted/trumbowyg.preformatted.js
+++ b/plugins/preformatted/trumbowyg.preformatted.js
@@ -22,12 +22,15 @@
             fr: {
                 preformatted: 'Exemple de code 
'
             },
-            ja: {
-                preformatted: 'コードサンプル 
'
+            hu: {
+                preformatted: 'Kód minta 
'
             },
             it: {
                 preformatted: 'Codice 
'
             },
+            ja: {
+                preformatted: 'コードサンプル 
'
+            },
             ko: {
                 preformatted: '코드 예제 
'
             },
diff --git a/plugins/ruby/trumbowyg.ruby.js b/plugins/ruby/trumbowyg.ruby.js
index ac1bd4705..5392c2f21 100644
--- a/plugins/ruby/trumbowyg.ruby.js
+++ b/plugins/ruby/trumbowyg.ruby.js
@@ -29,6 +29,11 @@
                 rubyModal: 'Modale ruby',
                 rubyText: 'Texte ruby'
             },
+            hu: {
+                ruby: 'Ruby szöveg hozzáadás',
+                rubyModal: 'Ruby modal',
+                rubyText: 'Ruby szöveg'
+            },
             id: {
                 ruby: 'Sisipkan teks ruby',
                 rubyModal: 'Modal teks ruby',
diff --git a/plugins/specialchars/trumbowyg.specialchars.js b/plugins/specialchars/trumbowyg.specialchars.js
index a341b0795..d9649c0f4 100644
--- a/plugins/specialchars/trumbowyg.specialchars.js
+++ b/plugins/specialchars/trumbowyg.specialchars.js
@@ -31,6 +31,9 @@
             fr: {
                 specialChars: 'Caractères spéciaux'
             },
+            hu: {
+                specialChars: 'Speciális karakterek'
+            },
             ko: {
                 specialChars: '특수문자'
             },
diff --git a/plugins/table/trumbowyg.table.js b/plugins/table/trumbowyg.table.js
index b620d7cf1..5e6aa2ee8 100644
--- a/plugins/table/trumbowyg.table.js
+++ b/plugins/table/trumbowyg.table.js
@@ -70,6 +70,17 @@
                 tableDestroy: 'Effacer le tableau',
                 error: 'Erreur'
             },
+            hu: {
+                table: 'Táblázat beszúrás',
+                tableAddRow: 'Sor hozzáadás',
+                tableAddRowAbove: 'Sor beszúrás fönt',
+                tableAddColumnLeft: 'Sor beszúrás balra',
+                tableAddColumn: 'Sor beszúrás jobbra',
+                tableDeleteRow: 'Sor törlés',
+                tableDeleteColumn: 'Oszlop törlés',
+                tableDestroy: 'Táblázat törlés',
+                error: 'Hiba'
+            },
             id: {
                 table: 'Sisipkan tabel',
                 tableAddRow: 'Sisipkan baris',
diff --git a/plugins/template/trumbowyg.template.js b/plugins/template/trumbowyg.template.js
index b23f111da..5e92e2d87 100644
--- a/plugins/template/trumbowyg.template.js
+++ b/plugins/template/trumbowyg.template.js
@@ -17,6 +17,9 @@
             fr: {
                 template: 'Patron'
             },
+            hu: {
+                template: 'Sablon'
+            },
             ja: {
                 template: 'テンプレート'
             },
diff --git a/plugins/upload/trumbowyg.upload.js b/plugins/upload/trumbowyg.upload.js
index 058eea037..2075c3a7a 100644
--- a/plugins/upload/trumbowyg.upload.js
+++ b/plugins/upload/trumbowyg.upload.js
@@ -73,6 +73,11 @@
                 file: 'Fichier',
                 uploadError: 'Erreur'
             },
+            hu: {
+                upload: 'Feltöltés',
+                file: 'Fájl',
+                uploadError: 'Hiba'
+            },
             ja: {
                 upload: 'アップロード',
                 file: 'ファイル',

From 19e10906a61ca711b95713b32ae3bdba97d161f8 Mon Sep 17 00:00:00 2001
From: Oleg Abrahaev 
Date: Mon, 10 Feb 2020 16:39:14 +0100
Subject: [PATCH 10/36] fix for #1078 - jquery peer warn on packages install

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3822ecc7c..c49fa1a83 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
     "vinyl-paths": "2.1.0"
   },
   "peerDependencies": {
-    "jQuery": ">=1.8"
+    "jquery": ">=1.8"
   },
   "scripts": {
     "start": "gulp",

From ebc28ff7ba43330da3464a9f9222d5daaebf28ed Mon Sep 17 00:00:00 2001
From: kurozumi 
Date: Thu, 16 Apr 2020 14:46:00 +0900
Subject: [PATCH 11/36] width bug fix

---
 plugins/upload/trumbowyg.upload.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/upload/trumbowyg.upload.js b/plugins/upload/trumbowyg.upload.js
index 2075c3a7a..3eb38c018 100644
--- a/plugins/upload/trumbowyg.upload.js
+++ b/plugins/upload/trumbowyg.upload.js
@@ -211,7 +211,7 @@
                                                     trumbowyg.execCmd('insertImage', url, false, true);
                                                     var $img = $('img[src="' + url + '"]:not([alt])', trumbowyg.$box);
                                                     $img.attr('alt', values.alt);
-                                                    if (trumbowyg.o.imageWidthModalEdit && parseInt(values.width) > 0) {
+                                                    if (trumbowyg.o.plugins.upload.imageWidthModalEdit && parseInt(values.width) > 0) {
                                                         $img.attr({
                                                             width: values.width
                                                         });

From dd81df4f898c9aa1ed6f2012dda0aec1b99b6803 Mon Sep 17 00:00:00 2001
From: Bert Verhelst 
Date: Thu, 16 Apr 2020 08:45:44 +0200
Subject: [PATCH 12/36] Add link popup "URL" to translatable strings

So people can add a different label if they want to.
I've made it backwards compatible by adding the `|| 'URL'` since no translation file has this string yet.

People can then override this string by overriding the translation. eg:
`
($ as any).trumbowyg.langs.nl = {
	...($ as any).trumbowyg.langs.nl,
	url: 'Link',
	target: 'Open in',
};
`
---
 src/trumbowyg.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/trumbowyg.js b/src/trumbowyg.js
index 0133f2c5a..9605b3d9d 100644
--- a/src/trumbowyg.js
+++ b/src/trumbowyg.js
@@ -1276,7 +1276,7 @@ Object.defineProperty(jQuery.trumbowyg, 'defaultOptions', {
 
             var options = {
                 url: {
-                    label: 'URL',
+                    label: t.lang.linkUrl || 'URL',
                     required: true,
                     value: url
                 },

From ddc70074abb623322092101198c847c87176a836 Mon Sep 17 00:00:00 2001
From: Marius Burkard 
Date: Tue, 28 Apr 2020 15:43:03 +0200
Subject: [PATCH 13/36] - allow toggling of bold, italic etc., fixes #1092 and
 others - allow disabling strikethrough, fixes #638 and others

---
 src/trumbowyg.js | 34 +++++++++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/src/trumbowyg.js b/src/trumbowyg.js
index 0133f2c5a..6b398787a 100644
--- a/src/trumbowyg.js
+++ b/src/trumbowyg.js
@@ -1208,16 +1208,17 @@ Object.defineProperty(jQuery.trumbowyg, 'defaultOptions', {
                     t.$ed.find('p:empty').remove();
                 }
 
-                if (!keepRange) {
+                /*if (!keepRange) {
                     t.restoreRange();
-                }
+                }*/
 
                 t.syncTextarea();
             }
         },
 
-        semanticTag: function (oldTag, copyAttributes) {
-            var newTag;
+        semanticTag: function (oldTag, copyAttributes, revert) {
+            var newTag, t = this;
+            var tmpTag = oldTag;
 
             if (this.o.semantic != null && typeof this.o.semantic === 'object' && this.o.semantic.hasOwnProperty(oldTag)) {
                 newTag = this.o.semantic[oldTag];
@@ -1227,19 +1228,34 @@ Object.defineProperty(jQuery.trumbowyg, 'defaultOptions', {
                 return;
             }
 
+            if(revert) {
+                oldTag = newTag;
+                newTag = tmpTag;
+            }
+
             $(oldTag, this.$ed).each(function () {
+                var resetRange = false;
                 var $oldTag = $(this);
                 if($oldTag.contents().length === 0) {
                     return false;
                 }
 
-                $oldTag.wrap('<' + newTag + '/>');
+                if(t.range.startContainer.parentNode && t.range.startContainer.parentNode === this) {
+                    resetRange = true;
+                }
+                var $newTag = $('<' + newTag + '/>');
+                $newTag.insertBefore($oldTag);
                 if (copyAttributes) {
                     $.each($oldTag.prop('attributes'), function () {
-                        $oldTag.parent().attr(this.name, this.value);
+                        $newTag.attr(this.name, this.value);
                     });
                 }
-                $oldTag.contents().unwrap();
+                $newTag.html($oldTag.html());
+                $oldTag.remove();
+                if(resetRange === true) {
+                    t.range.selectNodeContents($newTag.get(0));
+                    t.range.collapse(false);
+                }
             });
         },
 
@@ -1434,6 +1450,10 @@ Object.defineProperty(jQuery.trumbowyg, 'defaultOptions', {
                 t.$ed.focus();
             }
 
+            if(cmd === 'strikethrough' && t.o.semantic) {
+                t.semanticTag('strike', t.o.semanticKeepAttributes, true); // browsers cannot undo e.g.  as they expect 
+            }
+
             try {
                 t.doc.execCommand('styleWithCSS', false, forceCss || false);
             } catch (c) {

From ba100ef826fbd2694bb2abbf668d0726d895c193 Mon Sep 17 00:00:00 2001
From: Marius Burkard 
Date: Tue, 28 Apr 2020 15:55:35 +0200
Subject: [PATCH 14/36] - restore range if not collapsed (chrome bug)

---
 src/trumbowyg.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/trumbowyg.js b/src/trumbowyg.js
index 6b398787a..303ef07bc 100644
--- a/src/trumbowyg.js
+++ b/src/trumbowyg.js
@@ -1173,6 +1173,11 @@ Object.defineProperty(jQuery.trumbowyg, 'defaultOptions', {
             t.saveRange();
             t.syncCode(force);
 
+            var restoreRange = true;
+            if (t.range && t.range.collapsed) {
+                restoreRange = false;
+            }
+
             if (t.o.semantic) {
                 t.semanticTag('b', t.o.semanticKeepAttributes);
                 t.semanticTag('i', t.o.semanticKeepAttributes);
@@ -1208,9 +1213,9 @@ Object.defineProperty(jQuery.trumbowyg, 'defaultOptions', {
                     t.$ed.find('p:empty').remove();
                 }
 
-                /*if (!keepRange) {
+                if (!keepRange && restoreRange) {
                     t.restoreRange();
-                }*/
+                }
 
                 t.syncTextarea();
             }

From d7f968048b6914a730a31cee28ae3d34afa37173 Mon Sep 17 00:00:00 2001
From: Victor Chanil Park 
Date: Sun, 3 May 2020 14:34:32 +1200
Subject: [PATCH 15/36] Update ko.js
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

For insertImage, changing 그림 to 이미지. Because 그림 has more meaning of drawn piece of art. Just making sure it to be more familiar to majority of people as 이미지 is more being used for web editors. Added translation for insertVideo.
---
 src/langs/ko.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/langs/ko.js b/src/langs/ko.js
index 2047b38bf..4fc0282fd 100644
--- a/src/langs/ko.js
+++ b/src/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: '링크 지우기',

From 78ea4c928037ff042de4fda50a75d815a6f845b5 Mon Sep 17 00:00:00 2001
From: Daniel Harvey 
Date: Sat, 25 Apr 2020 00:12:52 -0600
Subject: [PATCH 16/36] feat: new option svgSideLoad = false

Allows the svgSideLoad option (default true) to force use of the svgPath in the href of the svg. The svgSideLoad option allows skipping dom insertion and makes it explicit how the svg is being handled since the default behavior is surprising when passing in an svgPath (maybe I was not the only one confused by this? https://github.com/Alex-D/Trumbowyg/issues/325).

The angularjs application I was working on was rendering trumbowyg inside a dynamic tab. Switching tabs would cause the dom reference technique to fail whenever it re-rendered via client side rendering, tab switches. I saw the option for svgPath and immediately assumed I could just pass in an explicit url. Instead I found the current page URL always and the current implementation, which exists to allow styling of the svg (https://github.com/Alex-D/Trumbowyg/issues/253#issuecomment-217642450). Editing the svg html and setting the href to the svgPath I passed into to trumbowyg revealed that just letting the browser do it solved my re-rendering problem.

In my case I'm stuck with a legacy app and just want them to work so the browser caching them is fine.
---
 src/trumbowyg.js | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/trumbowyg.js b/src/trumbowyg.js
index 9605b3d9d..731f00325 100644
--- a/src/trumbowyg.js
+++ b/src/trumbowyg.js
@@ -112,7 +112,8 @@ Object.defineProperty(jQuery.trumbowyg, 'defaultOptions', {
         plugins: {},
         urlProtocol: false,
         minimalLinks: false,
-        defaultLinkTarget: undefined
+        defaultLinkTarget: undefined,
+        svgSideLoad: true
     },
     writable: false,
     enumerable: true,
@@ -214,11 +215,19 @@ Object.defineProperty(jQuery.trumbowyg, 'defaultOptions', {
 
         t.hideButtonTexts = $trumbowyg.hideButtonTexts != null ? $trumbowyg.hideButtonTexts : options.hideButtonTexts;
 
+        // Defaults Options
+        t.o = $.extend(true, {}, $trumbowyg.defaultOptions, options);
+
         // SVG path
         var svgPathOption = $trumbowyg.svgPath != null ? $trumbowyg.svgPath : options.svgPath;
         t.hasSvg = svgPathOption !== false;
-        t.svgPath = !!t.doc.querySelector('base') ? window.location.href.split('#')[0] : '';
-        if ($('#' + trumbowygIconsId, t.doc).length === 0 && svgPathOption !== false) {
+        if (!options.svgSideLoad && svgPathOption == null) {
+          console.warn('You must define svgPath: https://goo.gl/CfTY9U'); // jshint ignore:line
+        }
+        var baseHref = !!t.doc.querySelector('base') ? window.location.href.split('#')[0] : ''
+        t.svgPath = options.svgSideLoad ? baseHref : svgPathOption;
+        
+        if (options.svgSideLoad && $('#' + trumbowygIconsId, t.doc).length === 0 && svgPathOption !== false) {
             if (svgPathOption == null) {
                 // Hack to get svgPathOption based on trumbowyg.js path
                 var scriptElements = document.getElementsByTagName('script');
@@ -407,8 +416,6 @@ Object.defineProperty(jQuery.trumbowyg, 'defaultOptions', {
             }
         };
 
-        // Defaults Options
-        t.o = $.extend(true, {}, $trumbowyg.defaultOptions, options);
         if (!t.o.hasOwnProperty('imgDblClickHandler')) {
             t.o.imgDblClickHandler = t.getDefaultImgDblClickHandler();
         }

From 0e26ad501d89bf3f00ca53abf9a77fa04331b495 Mon Sep 17 00:00:00 2001
From: Evan Lemke 
Date: Mon, 18 May 2020 12:13:24 -0600
Subject: [PATCH 17/36] fix(Trumbo): stop p tags from wrapping markup

This code adds 
 tags if the Trumbo contains no mark-up.  The check is run
before a setTimeout and the 
 tags are added after.  When using the table
plugin the content is empty before the check but contains a table after the
timeout executes.
---
 src/trumbowyg.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/trumbowyg.js b/src/trumbowyg.js
index 9605b3d9d..e7df97eb3 100644
--- a/src/trumbowyg.js
+++ b/src/trumbowyg.js
@@ -677,7 +677,7 @@ Object.defineProperty(jQuery.trumbowyg, 'defaultOptions', {
                     }
                 })
                 .on('keyup focus', function () {
-                    if (!t.$ta.val().match(/<.*>/)) {
+                  if (!t.$ta.val().match(/<.*>/) && !t.$ed.html().match(/<.*>/)) {
                         setTimeout(function () {
                             var block = t.isIE ? '
' : 'p';
                             t.doc.execCommand('formatBlock', false, block);

From 2a05b759cb71b991edabfd9e590c243a422b6821 Mon Sep 17 00:00:00 2001
From: Alex-D 
Date: Fri, 10 Jul 2020 03:28:52 +0200
Subject: [PATCH 18/36] chore: add paypal.me donate link to funding.yml

---
 .github/FUNDING.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index d721e6f73..464afbb7e 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,4 +1,3 @@
-# These are supported funding model platforms
-
-github: [Alex-D]
+github: Alex-D
 patreon: AlexandreDemode
+custom: https://paypal.me/demodealexandre

From 8175c3c0557e731f13cab1b43b503f5fd1de335a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=96zg=C3=BCr=20G=C3=B6rg=C3=BCl=C3=BC?=
 
Date: Fri, 25 Sep 2020 16:02:41 +0300
Subject: [PATCH 19/36] Added missing translations

---
 src/langs/tr.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/langs/tr.js b/src/langs/tr.js
index 0a16604d9..0aef137ff 100644
--- a/src/langs/tr.js
+++ b/src/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'
 };

From e181d373a298e595f84f1bcfa2affc01f4784a75 Mon Sep 17 00:00:00 2001
From: Alex-D 
Date: Mon, 5 Oct 2020 22:13:41 +0200
Subject: [PATCH 20/36] chore: bump version to 2.22.0

---
 BACKERS.md                |  12 +++---------
 README.md                 |  10 +++-------
 bower.json                |   2 +-
 docs/index.html           |   3 ---
 package.json              |   2 +-
 sponsors/bookingninja.png | Bin 11789 -> 0 bytes
 6 files changed, 8 insertions(+), 21 deletions(-)
 delete mode 100644 sponsors/bookingninja.png

diff --git a/BACKERS.md b/BACKERS.md
index b47b90486..a8e797b06 100644
--- a/BACKERS.md
+++ b/BACKERS.md
@@ -2,10 +2,10 @@
 
 Trumbowyg is an MIT-licensed open source project and completely free to use.
 
-However, the amount of effort needed to maintain and develop new features for 
-the project is not sustainable without proper financial backing. 
+However, the amount of effort needed to maintain and develop new features for
+the project is not sustainable without proper financial backing.
 You can support it's ongoing development by being a backer or a sponsor:
- 
+
 - [Become a backer or sponsor on Patreon](https://www.patreon.com/alexandredemode)
 - [One-time donation via PayPal](https://www.paypal.me/demodealexandre/20eur)
 
@@ -17,12 +17,6 @@ You can support it's ongoing development by being a backer or a sponsor:
     
 

 
-

-    
-        BookingNinja
-    
-

-
 

     
         Become a Sponsor
diff --git a/README.md b/README.md
index 9587493f3..4596bbc7d 100644
--- a/README.md
+++ b/README.md
@@ -17,10 +17,10 @@
 
 Trumbowyg is an MIT-licensed open source project and completely free to use.
 
-However, the amount of effort needed to maintain and develop new features for 
-the project is not sustainable without proper financial backing. 
+However, the amount of effort needed to maintain and develop new features for
+the project is not sustainable without proper financial backing.
 You can support it's ongoing development by being a backer or a sponsor:
- 
+
 - [Become a backer or sponsor on Patreon](https://www.patreon.com/alexandredemode)
 - [One-time donation via PayPal](https://www.paypal.me/demodealexandre/20eur)
 
@@ -32,10 +32,6 @@ You can support it's ongoing development by being a backer or a sponsor:
     
         avot®
     
-         
-    
-        BookingNinja
-    
 

 
 

diff --git a/bower.json b/bower.json
index 48c70a24d..07c0ba123 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "trumbowyg",
-  "version": "2.21.0",
+  "version": "2.22.0",
   "homepage": "https://github.com/Alex-D/Trumbowyg",
   "authors": [
     {
diff --git a/docs/index.html b/docs/index.html
index 6b3d26a98..0a58b3991 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -808,9 +808,6 @@ 

             
                 avot®
             
-            
-                BookingNinja
-            
 
             

             

diff --git a/package.json b/package.json
index c49fa1a83..7156fcf51 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "trumbowyg",
   "title": "Trumbowyg",
   "description": "A lightweight WYSIWYG editor",
-  "version": "2.21.0",
+  "version": "2.22.0",
   "main": "dist/trumbowyg.js",
   "homepage": "http://alex-d.github.io/Trumbowyg",
   "author": {
diff --git a/sponsors/bookingninja.png b/sponsors/bookingninja.png
deleted file mode 100644
index 9cf0f87b38e9bfd91091c3c13ba6847819ce97c1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11789
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
R{?AqjIVoky8gY~0{{stGR9FB2


From 85a9e66fc55fda57de69ef1ccdc0e2bb291c9ac0 Mon Sep 17 00:00:00 2001
From: Alex-D 
Date: Thu, 26 Nov 2020 00:21:51 +0100
Subject: [PATCH 21/36] feat: allow multiline placeholder

fix #1174
---
 src/ui/sass/trumbowyg.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/ui/sass/trumbowyg.scss b/src/ui/sass/trumbowyg.scss
index 7b205cfd6..d7c432877 100644
--- a/src/ui/sass/trumbowyg.scss
+++ b/src/ui/sass/trumbowyg.scss
@@ -132,6 +132,7 @@ $slow-transition-duration: 300ms !default;
     content: attr(placeholder);
     color: #999;
     pointer-events: none;
+    white-space: break-spaces;
 }
 
 .trumbowyg-button-pane {

From 276efec0464119282dd6dbd67533cbfae08353a7 Mon Sep 17 00:00:00 2001
From: tempcode 
Date: Thu, 26 Nov 2020 00:35:00 +0100
Subject: [PATCH 22/36] fix(resizimg): clean code and add missing syncCode
 calls (#1116)

---
 docs/demos/plugins/resizimg.html       |  2 +-
 plugins/resizimg/trumbowyg.resizimg.js | 66 ++++++++++++++++----------
 2 files changed, 41 insertions(+), 27 deletions(-)

diff --git a/docs/demos/plugins/resizimg.html b/docs/demos/plugins/resizimg.html
index 46abac9d2..a6af61ef2 100644
--- a/docs/demos/plugins/resizimg.html
+++ b/docs/demos/plugins/resizimg.html
@@ -14,7 +14,7 @@ 
Resizimg plugin

         

             
Basic usage

             

-                Images can be resized by click over the image and dragging their bottom-right corner (the red ones).
+                Images can be resized by click over the image and dragging their bottom-right corner (the white ones).
             

 
             Read resizimg plugin documentation
diff --git a/plugins/resizimg/trumbowyg.resizimg.js b/plugins/resizimg/trumbowyg.resizimg.js
index d62356985..8a8528db0 100644
--- a/plugins/resizimg/trumbowyg.resizimg.js
+++ b/plugins/resizimg/trumbowyg.resizimg.js
@@ -1,4 +1,4 @@
-;(function ($) {
+; (function ($) {
     'use strict';
 
     var defaultOptions = {
@@ -11,7 +11,7 @@
         e.preventDefault();
     }
 
-    var ResizeWithCanvas = function () {
+    var ResizeWithCanvas = function (trumbowyg) {
         // variable to create canvas and save img in resize mode
         this.resizeCanvas = document.createElement('canvas');
         // to allow canvas to get focus
@@ -24,8 +24,13 @@
             obj.reset();
         };
         this.pressBackspaceOrDelete = function (obj) {
-            $(obj.resizeCanvas).replaceWith('');
+            $(obj.resizeCanvas).remove();
             obj.resizeImg = null;
+            if (trumbowyg !== null){
+                trumbowyg.syncCode();
+				// notify changes
+                trumbowyg.$c.trigger('tbwchange');
+			}
         };
 
         // PRIVATE FUNCTION
@@ -109,10 +114,8 @@
                 return;
             }
 
-            this.resizeImg.width = this.resizeCanvas.clientWidth - 10;
-            this.resizeImg.height = this.resizeCanvas.clientHeight - 10;
-            // clear style of image to avoid issue on resize because this attribute have priority over width and height attribute
-            this.resizeImg.removeAttribute('style');
+            // set style of image to avoid issue on resize because this attribute have priority over width and height attribute
+            this.resizeImg.setAttribute('style', 'width: 100%; max-width: ' + (this.resizeCanvas.clientWidth - 10) + 'px; height: auto; max-height: ' + (this.resizeCanvas.clientHeight - 10) + 'px;');
 
             $(this.resizeCanvas).replaceWith($(this.resizeImg));
 
@@ -172,7 +175,16 @@
                         _this.pressBackspaceOrDelete(_this);
                     }
                 })
-                .on('focus', preventDefault);
+                .on('focus', preventDefault)
+                .on('blur', function (e) {
+                    _this.reset();
+                    // save changes
+                    if (trumbowyg !== null){
+                        trumbowyg.syncCode();
+						// notify changes
+                        trumbowyg.$c.trigger('tbwchange');
+					}
+                });
 
             this.resizeCanvas.focus();
 
@@ -191,25 +203,26 @@
         };
     };
 
-    // object to interact with canvas
-    var resizeWithCanvas = new ResizeWithCanvas();
-
-    function destroyResizable(trumbowyg) {
-        // clean html code
-        trumbowyg.$ed.find('canvas.resizable')
-            .resizable('destroy')
-            .off('mousedown', preventDefault)
-            .removeClass('resizable');
-
-        resizeWithCanvas.reset();
-
-        trumbowyg.syncCode();
-    }
-
     $.extend(true, $.trumbowyg, {
         plugins: {
             resizimg: {
                 init: function (trumbowyg) {
+
+                    // object to interact with canvas
+                    var resizeWithCanvas = new ResizeWithCanvas(trumbowyg);
+
+                    function destroyResizable(trumbowyg) {
+                        // clean html code
+                        trumbowyg.$ed.find('canvas.resizable')
+                            .resizable('destroy')
+                            .off('mousedown', preventDefault)
+                            .removeClass('resizable');
+
+                        resizeWithCanvas.reset();
+
+                        trumbowyg.syncCode();
+                    }
+
                     trumbowyg.o.plugins.resizimg = $.extend(true, {},
                         defaultOptions,
                         trumbowyg.o.plugins.resizimg || {},
@@ -269,8 +282,9 @@
 
                             preventDefault(e);
                             resizeWithCanvas.reset();
-
-                            // save changes
+							//sync
+							trumbowyg.syncCode();
+                            // notify changes
                             trumbowyg.$c.trigger('tbwchange');
                         });
 
@@ -286,7 +300,7 @@
 
                     // Destroy
                     trumbowyg.$c.on('tbwblur', function () {
-                        // if I have already focused the canvas avoid destroy
+                        // when canvas is created the tbwblur is called - this code avoid to destroy the canvas that allow the image resizing
                         if (resizeWithCanvas.isFocusedNow()) {
                             resizeWithCanvas.blurNow();
                         } else {

From b1adae03f2f01b4b41269c4cf93fa66708417a2e Mon Sep 17 00:00:00 2001
From: holema 
Date: Thu, 26 Nov 2020 00:43:29 +0100
Subject: [PATCH 23/36] feat: add the ability to add classes to tags (#1082)

---
 src/trumbowyg.js | 79 +++++++++++++++++++++++++++++++-----------------
 1 file changed, 51 insertions(+), 28 deletions(-)

diff --git a/src/trumbowyg.js b/src/trumbowyg.js
index 84a70c66a..12c5301f7 100644
--- a/src/trumbowyg.js
+++ b/src/trumbowyg.js
@@ -77,7 +77,14 @@ Object.defineProperty(jQuery.trumbowyg, 'defaultOptions', {
         imageWidthModalEdit: false,
 
         prefix: 'trumbowyg-',
-
+// classes for inputs
+        tagClasses:{
+            'h1': null,
+            'h2': null,
+            'h3': null,
+            'h4': null,
+            'p': null,
+        },
         semantic: true,
         semanticKeepAttributes: false,
         resetCss: false,
@@ -496,7 +503,7 @@ Object.defineProperty(jQuery.trumbowyg, 'defaultOptions', {
                 return;
             }
 
-            if (typeof(protocol) !== 'string') {
+            if (typeof (protocol) !== 'string') {
                 return 'https://';
             }
             return protocol.replace('://', '') + '://';
@@ -596,7 +603,8 @@ Object.defineProperty(jQuery.trumbowyg, 'defaultOptions', {
                         try {
                             t.execCmd(key.fn, key.param);
                             return false;
-                        } catch (c) {}
+                        } catch (c) {
+                        }
                     } else {
                         if (t.o.tabToIndent && e.key === 'Tab') {
                             try {
@@ -606,7 +614,8 @@ Object.defineProperty(jQuery.trumbowyg, 'defaultOptions', {
                                     t.execCmd('indent', true, null);
                                 }
                                 return false;
-                            } catch (c) {}
+                            } catch (c) {
+                            }
                         }
                     }
                 })
@@ -669,8 +678,7 @@ Object.defineProperty(jQuery.trumbowyg, 'defaultOptions', {
                         if (e.type === 'focus') {
                             t.autogrowOnEnterWasFocused = true;
                             t.autogrowEditorOnEnter();
-                        }
-                        else if (!t.o.autogrow) {
+                        } else if (!t.o.autogrow) {
                             t.$ed.css({height: t.$ed.css('min-height')});
                             t.$c.trigger('tbwresize');
                         }
@@ -882,8 +890,8 @@ Object.defineProperty(jQuery.trumbowyg, 'defaultOptions', {
                 type: 'button',
                 class: prefix + btnName + '-dropdown-button ' + (btn.class || '') + (btn.ico ? ' ' + prefix + btn.ico + '-button' : ''),
                 html: t.hasSvg && hasIcon ?
-                  '' + (btn.text || btn.title || t.lang[btnName] || btnName) :
-                  (btn.text || btn.title || t.lang[btnName] || btnName),
+                    '' + (btn.text || btn.title || t.lang[btnName] || btnName) :
+                    (btn.text || btn.title || t.lang[btnName] || btnName),
                 title: (btn.key ? '(' + (t.isMac ? 'Cmd' : 'Ctrl') + ' + ' + btn.key + ')' : null),
                 style: btn.style || null,
                 mousedown: function () {
@@ -1241,7 +1249,7 @@ Object.defineProperty(jQuery.trumbowyg, 'defaultOptions', {
             $(oldTag, this.$ed).each(function () {
                 var resetRange = false;
                 var $oldTag = $(this);
-                if($oldTag.contents().length === 0) {
+                if ($oldTag.contents().length === 0) {
                     return false;
                 }
 
@@ -1480,6 +1488,21 @@ Object.defineProperty(jQuery.trumbowyg, 'defaultOptions', {
 
                     t.syncCode();
                     t.semanticCode(false, true);
+                    try {
+                        var listId = window.getSelection().focusNode;
+                        if(!$(window.getSelection().focusNode.parentNode).hasClass('trumbowyg-editor')){
+                            listId = window.getSelection().focusNode.parentNode;
+                        }
+                        var arr = t.o.tagClasses[param];
+                        if (arr) {
+                            for (var i = 0; i < arr.length; i++) {
+                                $(listId).addClass(arr[i]);
+                            }
+                        }
+                    } catch (e) {
+
+                    }
+
                 }
 
                 if (cmd !== 'dropdown') {
@@ -1532,19 +1555,19 @@ Object.defineProperty(jQuery.trumbowyg, 'defaultOptions', {
                     action: '',
                     html: content
                 })
-                  .on('submit', function () {
-                      $modal.trigger(CONFIRM_EVENT);
-                      return false;
-                  })
-                  .on('reset', function () {
-                      $modal.trigger(CANCEL_EVENT);
-                      return false;
-                  })
-                  .on('submit reset', function () {
-                      if (t.o.autogrowOnEnter) {
-                          t.autogrowOnEnterDontClose = false;
-                      }
-                  });
+                    .on('submit', function () {
+                        $modal.trigger(CONFIRM_EVENT);
+                        return false;
+                    })
+                    .on('reset', function () {
+                        $modal.trigger(CANCEL_EVENT);
+                        return false;
+                    })
+                    .on('submit reset', function () {
+                        if (t.o.autogrowOnEnter) {
+                            t.autogrowOnEnterDontClose = false;
+                        }
+                    });
             } else {
                 formOrContent = content;
             }
@@ -1856,9 +1879,9 @@ Object.defineProperty(jQuery.trumbowyg, 'defaultOptions', {
 
         clearButtonPaneStatus: function () {
             var t = this,
-              prefix = t.o.prefix,
-              activeClasses = prefix + 'active-button ' + prefix + 'active',
-              originalIconClass = prefix + 'original-icon';
+                prefix = t.o.prefix,
+                activeClasses = prefix + 'active-button ' + prefix + 'active',
+                originalIconClass = prefix + 'original-icon';
 
             // Reset all buttons and dropdown state
             $('.' + prefix + 'active-button', t.$btnPane).removeClass(activeClasses);
@@ -1896,12 +1919,12 @@ Object.defineProperty(jQuery.trumbowyg, 'defaultOptions', {
                         if (t.o.changeActiveDropdownIcon && $btnSvgUse.length > 0) {
                             // Save original icon
                             $dropdownBtn
-                              .addClass(originalIconClass)
-                              .data(originalIconClass, $dropdownBtnSvgUse.attr('xlink:href'));
+                                .addClass(originalIconClass)
+                                .data(originalIconClass, $dropdownBtnSvgUse.attr('xlink:href'));
 
                             // Put the active sub-button's icon
                             $dropdownBtnSvgUse
-                              .attr('xlink:href', $btnSvgUse.attr('xlink:href'));
+                                .attr('xlink:href', $btnSvgUse.attr('xlink:href'));
                         }
                     } catch (e) {
                     }

From 1926f91c1f2ba8db2c60ae370d932e104abd48cf Mon Sep 17 00:00:00 2001
From: Alex-D 
Date: Thu, 26 Nov 2020 01:37:13 +0100
Subject: [PATCH 24/36] style: tabs -> spaces

---
 plugins/resizimg/trumbowyg.resizimg.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugins/resizimg/trumbowyg.resizimg.js b/plugins/resizimg/trumbowyg.resizimg.js
index 8a8528db0..780626c22 100644
--- a/plugins/resizimg/trumbowyg.resizimg.js
+++ b/plugins/resizimg/trumbowyg.resizimg.js
@@ -28,9 +28,9 @@
             obj.resizeImg = null;
             if (trumbowyg !== null){
                 trumbowyg.syncCode();
-				// notify changes
+                // notify changes
                 trumbowyg.$c.trigger('tbwchange');
-			}
+            }
         };
 
         // PRIVATE FUNCTION
@@ -181,9 +181,9 @@
                     // save changes
                     if (trumbowyg !== null){
                         trumbowyg.syncCode();
-						// notify changes
+                        // notify changes
                         trumbowyg.$c.trigger('tbwchange');
-					}
+                    }
                 });
 
             this.resizeCanvas.focus();
@@ -282,8 +282,8 @@
 
                             preventDefault(e);
                             resizeWithCanvas.reset();
-							//sync
-							trumbowyg.syncCode();
+                            //sync
+                            trumbowyg.syncCode();
                             // notify changes
                             trumbowyg.$c.trigger('tbwchange');
                         });

From 0cff83e49ec8e491f06e580ac6a1ac672cb9059d Mon Sep 17 00:00:00 2001
From: Alex-D 
Date: Thu, 26 Nov 2020 02:23:39 +0100
Subject: [PATCH 25/36] refactor: rename svgSideLoad into svgAbsoluteUseHref

---
 src/trumbowyg.js | 74 +++++++++++++++++++++++-------------------------
 1 file changed, 36 insertions(+), 38 deletions(-)

diff --git a/src/trumbowyg.js b/src/trumbowyg.js
index 89cb5e774..d0aabea1c 100644
--- a/src/trumbowyg.js
+++ b/src/trumbowyg.js
@@ -61,6 +61,7 @@ jQuery.trumbowyg = {
 
     // SVG Path globally
     svgPath: null,
+    svgAbsoluteUseHref: false,
 
     hideButtonTexts: null
 };
@@ -77,13 +78,13 @@ Object.defineProperty(jQuery.trumbowyg, 'defaultOptions', {
         imageWidthModalEdit: false,
 
         prefix: 'trumbowyg-',
-// classes for inputs
+        // classes for inputs
         tagClasses:{
-            'h1': null,
-            'h2': null,
-            'h3': null,
-            'h4': null,
-            'p': null,
+            h1: null,
+            h2: null,
+            h3: null,
+            h4: null,
+            p: null,
         },
         semantic: true,
         semanticKeepAttributes: false,
@@ -119,8 +120,7 @@ Object.defineProperty(jQuery.trumbowyg, 'defaultOptions', {
         plugins: {},
         urlProtocol: false,
         minimalLinks: false,
-        defaultLinkTarget: undefined,
-        svgSideLoad: true
+        defaultLinkTarget: undefined
     },
     writable: false,
     enumerable: true,
@@ -222,19 +222,11 @@ Object.defineProperty(jQuery.trumbowyg, 'defaultOptions', {
 
         t.hideButtonTexts = $trumbowyg.hideButtonTexts != null ? $trumbowyg.hideButtonTexts : options.hideButtonTexts;
 
-        // Defaults Options
-        t.o = $.extend(true, {}, $trumbowyg.defaultOptions, options);
-
         // SVG path
         var svgPathOption = $trumbowyg.svgPath != null ? $trumbowyg.svgPath : options.svgPath;
         t.hasSvg = svgPathOption !== false;
-        if (!options.svgSideLoad && svgPathOption == null) {
-          console.warn('You must define svgPath: https://goo.gl/CfTY9U'); // jshint ignore:line
-        }
-        var baseHref = !!t.doc.querySelector('base') ? window.location.href.split('#')[0] : ''
-        t.svgPath = options.svgSideLoad ? baseHref : svgPathOption;
-        
-        if (options.svgSideLoad && $('#' + trumbowygIconsId, t.doc).length === 0 && svgPathOption !== false) {
+
+        if (svgPathOption !== false && ($trumbowyg.svgAbsoluteUseHref || $('#' + trumbowygIconsId, t.doc).length === 0)) {
             if (svgPathOption == null) {
                 // Hack to get svgPathOption based on trumbowyg.js path
                 var scriptElements = document.getElementsByTagName('script');
@@ -245,30 +237,36 @@ Object.defineProperty(jQuery.trumbowyg, 'defaultOptions', {
                         svgPathOption = source.substring(0, source.indexOf(matches[0])) + 'ui/icons.svg';
                     }
                 }
-                if (svgPathOption == null) {
-                    console.warn('You must define svgPath: https://goo.gl/CfTY9U'); // jshint ignore:line
-                }
             }
 
-            var div = t.doc.createElement('div');
-            div.id = trumbowygIconsId;
-            t.doc.body.insertBefore(div, t.doc.body.childNodes[0]);
-            $.ajax({
-                async: true,
-                type: 'GET',
-                contentType: 'application/x-www-form-urlencoded; charset=UTF-8',
-                dataType: 'xml',
-                crossDomain: true,
-                url: svgPathOption,
-                data: null,
-                beforeSend: null,
-                complete: null,
-                success: function (data) {
-                    div.innerHTML = new XMLSerializer().serializeToString(data.documentElement);
-                }
-            });
+            // Do not merge with previous if block: svgPathOption can be redefined in it.
+            // Here we are checking that we find a match
+            if (svgPathOption == null) {
+                console.warn('You must define svgPath: https://goo.gl/CfTY9U'); // jshint ignore:line
+            } else if (!$trumbowyg.svgAbsoluteUseHref) {
+                var div = t.doc.createElement('div');
+                div.id = trumbowygIconsId;
+                t.doc.body.insertBefore(div, t.doc.body.childNodes[0]);
+                $.ajax({
+                    async: true,
+                    type: 'GET',
+                    contentType: 'application/x-www-form-urlencoded; charset=UTF-8',
+                    dataType: 'xml',
+                    crossDomain: true,
+                    url: svgPathOption,
+                    data: null,
+                    beforeSend: null,
+                    complete: null,
+                    success: function (data) {
+                        div.innerHTML = new XMLSerializer().serializeToString(data.documentElement);
+                    }
+                });
+            }
         }
 
+        var baseHref = !!t.doc.querySelector('base') ? window.location.href.split(/[?#]/)[0] : ''
+        t.svgPath = $trumbowyg.svgAbsoluteUseHref ? svgPathOption : baseHref;
+
 
         /**
          * When the button is associated to a empty object

From 9ce8ec2d92e2371524419b0294dbe1aa890b4242 Mon Sep 17 00:00:00 2001
From: Alex-D 
Date: Thu, 26 Nov 2020 02:24:21 +0100
Subject: [PATCH 26/36] chore: rename npm run start to npm run dev

---
 README.md    | 9 ++++-----
 package.json | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 4596bbc7d..01068e98e 100644
--- a/README.md
+++ b/README.md
@@ -76,11 +76,10 @@ Thanks to `node` and `gulp`, you can improve core script, style or icons easily.
 First, fork and clone the repository
 
 ```bash
-cd Trumbowyg # to go into the project's root directory
-npm install # to install development dependencies
-npm install -g bower gulp # to install bower and gulp command if you don't have them already
-bower install # to install Trumbowyg dependencies (ie: jQuery)
-gulp build # to build the project
+cd Trumbowyg # go into the project's root directory
+npm install # install development dependencies
+npm run dev # watch mode
+npm run build # to build the project
 ```
 
 `gulp` command launch default Gulp task watcher and rebuild on the fly.
diff --git a/package.json b/package.json
index 7156fcf51..a91fc4638 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
     "jquery": ">=1.8"
   },
   "scripts": {
-    "start": "gulp",
+    "dev": "gulp",
     "build": "gulp build",
     "clean": "gulp clean",
     "test": "gulp test"

From 39f5c56a6e6919a79de89e7603367c22577b39e1 Mon Sep 17 00:00:00 2001
From: Alex-D 
Date: Thu, 26 Nov 2020 02:41:06 +0100
Subject: [PATCH 27/36] chore: upgrade to gulp 4

---
 gulpfile.js  | 66 ++++++++++++++++++++++++++++------------------------
 package.json |  2 +-
 2 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/gulpfile.js b/gulpfile.js
index e588c9b4c..7fbf56cea 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -40,29 +40,29 @@ const bannerLight = [
 ].join('');
 
 
-gulp.task('clean', function () {
+const clean = function () {
     return gulp.src('dist/*')
         .pipe(vinylPaths(del));
-});
+};
 
-gulp.task('test', ['test-scripts', 'test-plugins-scripts', 'test-langs']);
-gulp.task('test-scripts', function () {
+const testScripts = function () {
     return gulp.src(paths.scripts)
         .pipe($.jshint())
         .pipe($.jshint.reporter('jshint-stylish'));
-});
-gulp.task('test-plugins-scripts', function () {
+};
+const testPluginsScripts = function () {
     return gulp.src(paths.pluginsScripts)
         .pipe($.jshint())
         .pipe($.jshint.reporter('jshint-stylish'));
-});
-gulp.task('test-langs', function () {
+};
+const testLangs = function () {
     return gulp.src(paths.langs)
         .pipe($.jshint())
         .pipe($.jshint.reporter('jshint-stylish'));
-});
+};
+const test = gulp.parallel(testScripts, testPluginsScripts, testLangs);
 
-gulp.task('scripts', ['test-scripts'], function () {
+const scripts = gulp.series(testScripts, function scripts() {
     return gulp.src(paths.scripts)
         .pipe($.header(banner, {pkg: pkg, description: 'Trumbowyg core file'}))
         .pipe($.newer('dist/trumbowyg.js'))
@@ -76,7 +76,7 @@ gulp.task('scripts', ['test-scripts'], function () {
         .pipe($.size({title: 'trumbowyg.min.js'}));
 });
 
-gulp.task('plugins-scripts', ['test-scripts'], function () {
+const pluginsScripts = gulp.series(testScripts, function pluginsScripts() {
     return gulp.src(paths.pluginsScripts)
         .pipe(gulp.dest('dist/plugins/'))
         .pipe($.rename({suffix: '.min'}))
@@ -84,7 +84,7 @@ gulp.task('plugins-scripts', ['test-scripts'], function () {
         .pipe(gulp.dest('dist/plugins/'));
 });
 
-gulp.task('langs', ['test-langs'], function () {
+const langs = gulp.series(testLangs, function langs() {
     return gulp.src(paths.langs)
         .pipe(gulp.dest('dist/langs/'))
         .pipe($.rename({suffix: '.min'}))
@@ -95,16 +95,16 @@ gulp.task('langs', ['test-langs'], function () {
 });
 
 
-gulp.task('icons', function () {
+const icons = function () {
     return gulp.src(paths.icons)
         .pipe($.rename({prefix: 'trumbowyg-'}))
         .pipe($.svgmin())
         .pipe($.svgstore({inlineSvg: true}))
         .pipe(gulp.dest('dist/ui/'));
-});
+};
 
 
-gulp.task('styles', function () {
+const styles = function () {
     return gulp.src(paths.styles)
         .pipe($.sass())
         .pipe($.autoprefixer(['last 1 version', '> 1%', 'ff >= 20', 'ie >= 9', 'opera >= 12', 'Android >= 2.2'], {cascade: true}))
@@ -116,15 +116,15 @@ gulp.task('styles', function () {
         .pipe($.header(bannerLight, {pkg: pkg}))
         .pipe(gulp.dest('dist/ui/'))
         .pipe($.size({title: 'trumbowyg.min.css'}));
-});
+};
 
-gulp.task('sass-dist', ['styles'], function () {
+const sassDist = gulp.series(styles, function sassDist() {
     return gulp.src(paths.styles)
         .pipe($.header(banner, {pkg: pkg, description: 'Default stylesheet for Trumbowyg editor'}))
         .pipe(gulp.dest('dist/ui/sass'));
 });
 
-gulp.task('plugins-styles', function () {
+const pluginsStyles = function () {
     return gulp.src(paths.pluginsStyles)
         .pipe($.sass())
         .pipe($.autoprefixer(['last 1 version', '> 1%', 'ff >= 20', 'ie >= 9', 'opera >= 12', 'Android >= 2.2'], {cascade: true}))
@@ -138,30 +138,36 @@ gulp.task('plugins-styles', function () {
         .pipe($.header(bannerLight, {pkg: pkg}))
         .pipe(gulp.dest('dist/plugins/'))
         .pipe($.size({title: 'Plugins styles'}));
-});
+};
 
-gulp.task('plugins-sass-dist', ['plugins-styles'], function () {
+const pluginsSassDist = gulp.series(pluginsStyles, function pluginsSassDist() {
     return gulp.src(paths.pluginsStyles)
         .pipe($.header(banner, {pkg: pkg, description: 'Default stylesheet for Trumbowyg editor plugin'}))
         .pipe(gulp.dest('dist/plugins'));
 });
 
 
-gulp.task('watch', function () {
-    gulp.watch(paths.icons, ['icons']);
-    gulp.watch(paths.scripts, ['scripts']);
-    gulp.watch(paths.langs, ['langs']);
-    gulp.watch(paths.pluginsScripts, ['plugins-scripts']);
-    gulp.watch(paths.pluginsStyles, ['plugins-styles']);
-    gulp.watch(paths.styles, ['styles']);
+const watch = function () {
+    gulp.watch(paths.icons, icons);
+    gulp.watch(paths.scripts, scripts);
+    gulp.watch(paths.langs, langs);
+    gulp.watch(paths.pluginsScripts, pluginsScripts);
+    gulp.watch(paths.pluginsStyles, pluginsStyles);
+    gulp.watch(paths.styles, styles);
 
     gulp.watch(['dist/**', 'dist/*/**'], function (file) {
         $.livereload.changed(file);
     });
 
     $.livereload.listen();
-});
+};
 
-gulp.task('build', ['scripts', 'plugins-scripts', 'langs', 'icons', 'sass-dist', 'plugins-sass-dist']);
+const build = gulp.parallel(scripts, pluginsScripts, langs, icons, sassDist, pluginsSassDist);
 
-gulp.task('default', ['build', 'watch']);
+module.exports = {
+    default: gulp.series(build, watch),
+    clean,
+    build,
+    test,
+    watch,
+}
diff --git a/package.json b/package.json
index a91fc4638..521d24282 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
   "license": "MIT",
   "devDependencies": {
     "del": "2.0.2",
-    "gulp": "3.9.1",
+    "gulp": "4.0.2",
     "gulp-autoprefixer": "2.2.0",
     "gulp-concat": "2.6.0",
     "gulp-header": "1.7.1",

From c6dffe51f8a68c8b7c4091b940411157fcc654d3 Mon Sep 17 00:00:00 2001
From: Alex-D 
Date: Thu, 26 Nov 2020 02:55:07 +0100
Subject: [PATCH 28/36] style: fix lint issues

---
 plugins/cleanpaste/trumbowyg.cleanpaste.js | 74 +++++++++++-----------
 plugins/giphy/trumbowyg.giphy.js           |  2 +-
 plugins/highlight/trumbowyg.highlight.js   | 12 ++--
 plugins/resizimg/trumbowyg.resizimg.js     | 26 +++-----
 src/trumbowyg.js                           | 10 ++-
 5 files changed, 61 insertions(+), 63 deletions(-)

diff --git a/plugins/cleanpaste/trumbowyg.cleanpaste.js b/plugins/cleanpaste/trumbowyg.cleanpaste.js
index f03422ca9..93a69abea 100644
--- a/plugins/cleanpaste/trumbowyg.cleanpaste.js
+++ b/plugins/cleanpaste/trumbowyg.cleanpaste.js
@@ -98,49 +98,49 @@
                 init: function (trumbowyg) {
                     trumbowyg.pasteHandlers.push(function (pasteEvent) {
                         setTimeout(function () {
-                          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);
+                            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);
 
-                                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();
-                          } catch (c) {
-                          }
+                                // prevent defaults
+                                pasteEvent.stopPropagation();
+                                pasteEvent.preventDefault();
+
+                                // save new node as focused node
+                                trumbowyg.saveRange();
+                                trumbowyg.syncCode();
+                            } catch (c) {
+                            }
                         }, 0);
                     });
                 }
             }
         }
     });
-})(jQuery);
\ No newline at end of file
+})(jQuery);
diff --git a/plugins/giphy/trumbowyg.giphy.js b/plugins/giphy/trumbowyg.giphy.js
index afaae49bf..f4ce91bc7 100644
--- a/plugins/giphy/trumbowyg.giphy.js
+++ b/plugins/giphy/trumbowyg.giphy.js
@@ -17,7 +17,7 @@
     }
   });
 
-  var giphyLogo = '';
+  var giphyLogo = ''; // jshint ignore:line
 
   var CANCEL_EVENT = 'tbwcancel';
 
diff --git a/plugins/highlight/trumbowyg.highlight.js b/plugins/highlight/trumbowyg.highlight.js
index c4b8b6de2..4873892c1 100644
--- a/plugins/highlight/trumbowyg.highlight.js
+++ b/plugins/highlight/trumbowyg.highlight.js
@@ -37,8 +37,8 @@
                     '   ',
                     '
',
                     '
',
-                    '   ',
                     '
'
                 ].join('\n')),
@@ -68,13 +68,13 @@
             // jshint camelcase:false
             en: {
                 highlight: 'Code syntax highlight',
-                highlight_line: 'Highlight lines, e.g.: 1,3-5',
-                prism_highlight_plugin_alert: 'You must have Prism Line Highlight plugin installed'
+                highlightLine: 'Highlight lines, e.g.: 1,3-5',
+                prismHighlightPluginAlert: 'You must have Prism Line Highlight plugin installed'
             },
             es: {
                 highlight: 'Resaltado de sintaxis de código',
-                highlight_line: 'Resaltar lineas, ej: 1,3-5',
-                prism_highlight_plugin_alert: 'Debes de tener el plugin Prism Line Highlight instalado'
+                highlightLine: 'Resaltar lineas, ej: 1,3-5',
+                prismHighlightPluginAlert: 'Debes de tener el plugin Prism Line Highlight instalado'
             },
             hu: {
                 highlight: 'Kód kiemelés'
diff --git a/plugins/resizimg/trumbowyg.resizimg.js b/plugins/resizimg/trumbowyg.resizimg.js
index 780626c22..3a0e4b232 100644
--- a/plugins/resizimg/trumbowyg.resizimg.js
+++ b/plugins/resizimg/trumbowyg.resizimg.js
@@ -45,15 +45,6 @@
             offsetY = BB.top;
         };
 
-        var drawRect = function (shapeData, ctx) {
-            // Inner
-            ctx.beginPath();
-            ctx.fillStyle = 'rgb(255, 255, 255)';
-            ctx.rect(shapeData.points.x, shapeData.points.y, shapeData.points.width, shapeData.points.height);
-            ctx.fill();
-            ctx.stroke();
-        };
-
         var updateCanvas = function (canvas, ctx, img, canvasWidth, canvasHeight) {
             ctx.translate(0.5, 0.5);
             ctx.lineWidth = 1;
@@ -176,7 +167,7 @@
                     }
                 })
                 .on('focus', preventDefault)
-                .on('blur', function (e) {
+                .on('blur', function () {
                     _this.reset();
                     // save changes
                     if (trumbowyg !== null){
@@ -206,12 +197,14 @@
     $.extend(true, $.trumbowyg, {
         plugins: {
             resizimg: {
+                destroyResizable: function () {},
                 init: function (trumbowyg) {
+                    var destroyResizable = this.destroyResizable;
 
                     // object to interact with canvas
                     var resizeWithCanvas = new ResizeWithCanvas(trumbowyg);
 
-                    function destroyResizable(trumbowyg) {
+                    this.destroyResizable = function () {
                         // clean html code
                         trumbowyg.$ed.find('canvas.resizable')
                             .resizable('destroy')
@@ -221,7 +214,7 @@
                         resizeWithCanvas.reset();
 
                         trumbowyg.syncCode();
-                    }
+                    };
 
                     trumbowyg.o.plugins.resizimg = $.extend(true, {},
                         defaultOptions,
@@ -300,16 +293,17 @@
 
                     // Destroy
                     trumbowyg.$c.on('tbwblur', function () {
-                        // when canvas is created the tbwblur is called - this code avoid to destroy the canvas that allow the image resizing
+                        // when canvas is created the tbwblur is called
+                        // this code avoid to destroy the canvas that allow the image resizing
                         if (resizeWithCanvas.isFocusedNow()) {
                             resizeWithCanvas.blurNow();
                         } else {
-                            destroyResizable(trumbowyg);
+                            destroyResizable();
                         }
                     });
                 },
-                destroy: function (trumbowyg) {
-                    destroyResizable(trumbowyg);
+                destroy: function () {
+                    this.destroyResizable();
                 }
             }
         }
diff --git a/src/trumbowyg.js b/src/trumbowyg.js
index d0aabea1c..b142ac34b 100644
--- a/src/trumbowyg.js
+++ b/src/trumbowyg.js
@@ -264,7 +264,7 @@ Object.defineProperty(jQuery.trumbowyg, 'defaultOptions', {
             }
         }
 
-        var baseHref = !!t.doc.querySelector('base') ? window.location.href.split(/[?#]/)[0] : ''
+        var baseHref = !!t.doc.querySelector('base') ? window.location.href.split(/[?#]/)[0] : '';
         t.svgPath = $trumbowyg.svgAbsoluteUseHref ? svgPathOption : baseHref;
 
 
@@ -1091,7 +1091,11 @@ Object.defineProperty(jQuery.trumbowyg, 'defaultOptions', {
                 if (addFlag === true) {
                     $(this).attr('data-tbw-flag', true);
                 } else {
-                    $(this).attr('data-tbw-flag') ? $(this).removeAttr('data-tbw-flag') : $(this).contents().unwrap();
+                    if ($(this).attr('data-tbw-flag')) {
+                        $(this).removeAttr('data-tbw-flag');
+                    } else {
+                        $(this).contents().unwrap();
+                    }
                 }
             });
         },
@@ -1500,7 +1504,7 @@ Object.defineProperty(jQuery.trumbowyg, 'defaultOptions', {
                         }
                         var arr = t.o.tagClasses[param];
                         if (arr) {
-                            for (var i = 0; i < arr.length; i++) {
+                            for (var i = 0; i < arr.length; i+=1) {
                                 $(listId).addClass(arr[i]);
                             }
                         }

From ce32382d4b2725ce5b34b6833afa49531faf347f Mon Sep 17 00:00:00 2001
From: Alex-D 
Date: Thu, 26 Nov 2020 03:13:45 +0100
Subject: [PATCH 29/36] fix: restore missing t.o init

---
 src/trumbowyg.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/trumbowyg.js b/src/trumbowyg.js
index b142ac34b..6ff7634fb 100644
--- a/src/trumbowyg.js
+++ b/src/trumbowyg.js
@@ -421,6 +421,8 @@ Object.defineProperty(jQuery.trumbowyg, 'defaultOptions', {
             }
         };
 
+        // Default Options
+        t.o = $.extend(true, {}, $trumbowyg.defaultOptions, options);
         if (!t.o.hasOwnProperty('imgDblClickHandler')) {
             t.o.imgDblClickHandler = t.getDefaultImgDblClickHandler();
         }

From 6ee053247aea63a051c1fb19c014a84e318050f7 Mon Sep 17 00:00:00 2001
From: Alex-D 
Date: Thu, 26 Nov 2020 03:37:00 +0100
Subject: [PATCH 30/36] fix: only try to get src on script tags with src attr

fix #1059
---
 src/trumbowyg.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/trumbowyg.js b/src/trumbowyg.js
index 6ff7634fb..0f806edc4 100644
--- a/src/trumbowyg.js
+++ b/src/trumbowyg.js
@@ -229,14 +229,14 @@ Object.defineProperty(jQuery.trumbowyg, 'defaultOptions', {
         if (svgPathOption !== false && ($trumbowyg.svgAbsoluteUseHref || $('#' + trumbowygIconsId, t.doc).length === 0)) {
             if (svgPathOption == null) {
                 // Hack to get svgPathOption based on trumbowyg.js path
-                var scriptElements = document.getElementsByTagName('script');
-                for (var i = 0; i < scriptElements.length; i += 1) {
-                    var source = scriptElements[i].src;
+                var $scriptElements = $('script[src]');
+                $scriptElements.each(function (i, scriptElement) {
+                    var source = scriptElement.src;
                     var matches = source.match('trumbowyg(\.min)?\.js');
                     if (matches != null) {
                         svgPathOption = source.substring(0, source.indexOf(matches[0])) + 'ui/icons.svg';
                     }
-                }
+                })
             }
 
             // Do not merge with previous if block: svgPathOption can be redefined in it.

From 4f93094bf9e8b9262121c99a207047e032a3f563 Mon Sep 17 00:00:00 2001
From: Alex-D 
Date: Thu, 26 Nov 2020 03:40:25 +0100
Subject: [PATCH 31/36] fix(fontsize): add missing syncCode call

fix #1089
---
 plugins/fontsize/trumbowyg.fontsize.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/fontsize/trumbowyg.fontsize.js b/plugins/fontsize/trumbowyg.fontsize.js
index 843e3bb2f..e69efa70d 100644
--- a/plugins/fontsize/trumbowyg.fontsize.js
+++ b/plugins/fontsize/trumbowyg.fontsize.js
@@ -233,6 +233,7 @@
         $(trumbowyg.range.startContainer.parentElement).find('span[style=""]').contents().unwrap();
 
         trumbowyg.restoreRange();
+        trumbowyg.syncCode();
     }
 
     function buildDropdown(trumbowyg) {

From 040e7023b36dbec7c658a5fe56634a3ddce91bdd Mon Sep 17 00:00:00 2001
From: Alex-D 
Date: Thu, 26 Nov 2020 03:45:01 +0100
Subject: [PATCH 32/36] fix(fontsize): add missing tbwchange call

fix #1117
---
 plugins/fontsize/trumbowyg.fontsize.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/fontsize/trumbowyg.fontsize.js b/plugins/fontsize/trumbowyg.fontsize.js
index e69efa70d..cfa55beb1 100644
--- a/plugins/fontsize/trumbowyg.fontsize.js
+++ b/plugins/fontsize/trumbowyg.fontsize.js
@@ -234,6 +234,7 @@
 
         trumbowyg.restoreRange();
         trumbowyg.syncCode();
+        trumbowyg.$c.trigger('tbwchange');
     }
 
     function buildDropdown(trumbowyg) {

From d77ee142545c7e30f085cb9d65ef81b07b99f93a Mon Sep 17 00:00:00 2001
From: Alex-D 
Date: Thu, 26 Nov 2020 03:58:12 +0100
Subject: [PATCH 33/36] fix: remove useless margin on box and editor

fix #1037
---
 src/ui/sass/trumbowyg.scss | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/ui/sass/trumbowyg.scss b/src/ui/sass/trumbowyg.scss
index d7c432877..3d79ca829 100644
--- a/src/ui/sass/trumbowyg.scss
+++ b/src/ui/sass/trumbowyg.scss
@@ -41,7 +41,6 @@ $slow-transition-duration: 300ms !default;
     border: 1px solid #DDD;
     width: 100%;
     min-height: 300px;
-    margin: 17px auto;
 }
 
 .trumbowyg-box .trumbowyg-editor {

From 5c6ab17e940a328e9563c41420c6a76d6033b1b6 Mon Sep 17 00:00:00 2001
From: Alex-D 
Date: Thu, 26 Nov 2020 04:03:20 +0100
Subject: [PATCH 34/36] fix(upload): prevent multiple submissions while
 uploading

fix #1035
---
 plugins/upload/trumbowyg.upload.js | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/plugins/upload/trumbowyg.upload.js b/plugins/upload/trumbowyg.upload.js
index 3eb38c018..d63fd8883 100644
--- a/plugins/upload/trumbowyg.upload.js
+++ b/plugins/upload/trumbowyg.upload.js
@@ -21,7 +21,7 @@
         headers: {},                    // Additional headers
         xhrFields: {},                  // Additional fields
         urlPropertyName: 'file',        // How to get url from the json response (for instance 'url' for {url: ....})
-        statusPropertyName: 'success',  // How to get status from the json response 
+        statusPropertyName: 'success',  // How to get status from the json response
         success: undefined,             // Success callback: function (data, trumbowyg, $modal, values) {}
         error: undefined,               // Error callback: function () {}
         imageWidthModalEdit: false      // Add ability to edit image width
@@ -152,6 +152,9 @@
                                 };
                             }
 
+                            // Prevent multiple submissions while uploading
+                            var isUploading = false;
+
                             var $modal = trumbowyg.openModalInsert(
                                 // Title
                                 trumbowyg.lang.upload,
@@ -161,6 +164,11 @@
 
                                 // Callback
                                 function (values) {
+                                    if (isUploading) {
+                                        return;
+                                    }
+                                    isUploading = true;
+
                                     var data = new FormData();
                                     data.append(trumbowyg.o.plugins.upload.fileFieldName, file);
 
@@ -228,6 +236,8 @@
                                                     trumbowyg.$c.trigger('tbwuploaderror', [trumbowyg, data]);
                                                 }
                                             }
+
+                                            isUploading = false;
                                         },
 
                                         error: trumbowyg.o.plugins.upload.error || function () {
@@ -236,6 +246,8 @@
                                                 trumbowyg.lang.uploadError
                                             );
                                             trumbowyg.$c.trigger('tbwuploaderror', [trumbowyg]);
+
+                                            isUploading = false;
                                         }
                                     });
                                 }

From cf3a5abca4d5f595fa859a39325dc278f026b5cd Mon Sep 17 00:00:00 2001
From: Alex-D 
Date: Thu, 26 Nov 2020 04:21:45 +0100
Subject: [PATCH 35/36] fix(cleanpaste): add missing tbwchange

---
 plugins/cleanpaste/trumbowyg.cleanpaste.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/cleanpaste/trumbowyg.cleanpaste.js b/plugins/cleanpaste/trumbowyg.cleanpaste.js
index 93a69abea..444fd5f9c 100644
--- a/plugins/cleanpaste/trumbowyg.cleanpaste.js
+++ b/plugins/cleanpaste/trumbowyg.cleanpaste.js
@@ -135,6 +135,7 @@
                                 // save new node as focused node
                                 trumbowyg.saveRange();
                                 trumbowyg.syncCode();
+                                trumbowyg.$c.trigger('tbwchange');
                             } catch (c) {
                             }
                         }, 0);

From 3420382116ab119648672f3f6465330a39b9d09e Mon Sep 17 00:00:00 2001
From: Alex-D 
Date: Thu, 26 Nov 2020 04:30:46 +0100
Subject: [PATCH 36/36] chor(gulpfile)e: fix pluginPluginScript call

---
 gulpfile.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gulpfile.js b/gulpfile.js
index 7fbf56cea..599498c03 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -76,7 +76,7 @@ const scripts = gulp.series(testScripts, function scripts() {
         .pipe($.size({title: 'trumbowyg.min.js'}));
 });
 
-const pluginsScripts = gulp.series(testScripts, function pluginsScripts() {
+const pluginsScripts = gulp.series(testPluginsScripts, function pluginsScripts() {
     return gulp.src(paths.pluginsScripts)
         .pipe(gulp.dest('dist/plugins/'))
         .pipe($.rename({suffix: '.min'}))