build: 2.27.2

Alex-D · Feb 27, 2023 · f84c846 · f84c846
1 parent e1cc2c2
commit f84c846
Show file tree

Hide file tree

Showing 32 changed files with 199 additions and 92 deletions.
diff --git a/dist/plugins/colors/ui/sass/trumbowyg.colors.scss b/dist/plugins/colors/ui/sass/trumbowyg.colors.scss
@@ -1,8 +1,8 @@
 /**
- * Trumbowyg v2.27.1 - A lightweight WYSIWYG editor
+ * Trumbowyg v2.27.2 - A lightweight WYSIWYG editor
  * Default stylesheet for Trumbowyg editor plugin
  * ------------------------
- * @link http://alex-d.github.io/Trumbowyg
+ * @link https://alex-d.github.io/Trumbowyg/
  * @license MIT
  * @author Alexandre Demode (Alex-D)
  *         Twitter : @AlexandreDemode

diff --git a/dist/plugins/colors/ui/trumbowyg.colors.css b/dist/plugins/colors/ui/trumbowyg.colors.css
@@ -1,8 +1,8 @@
 /**
- * Trumbowyg v2.27.1 - A lightweight WYSIWYG editor
+ * Trumbowyg v2.27.2 - A lightweight WYSIWYG editor
  * Trumbowyg plugin stylesheet
  * ------------------------
- * @link http://alex-d.github.io/Trumbowyg
+ * @link https://alex-d.github.io/Trumbowyg/
  * @license MIT
  * @author Alexandre Demode (Alex-D)
  *         Twitter : @AlexandreDemode

diff --git a/dist/plugins/colors/ui/trumbowyg.colors.min.css b/dist/plugins/colors/ui/trumbowyg.colors.min.css
diff --git a/dist/plugins/emoji/ui/sass/trumbowyg.emoji.scss b/dist/plugins/emoji/ui/sass/trumbowyg.emoji.scss
@@ -1,8 +1,8 @@
 /**
- * Trumbowyg v2.27.1 - A lightweight WYSIWYG editor
+ * Trumbowyg v2.27.2 - A lightweight WYSIWYG editor
  * Default stylesheet for Trumbowyg editor plugin
  * ------------------------
- * @link http://alex-d.github.io/Trumbowyg
+ * @link https://alex-d.github.io/Trumbowyg/
  * @license MIT
  * @author Alexandre Demode (Alex-D)
  *         Twitter : @AlexandreDemode

diff --git a/dist/plugins/emoji/ui/trumbowyg.emoji.css b/dist/plugins/emoji/ui/trumbowyg.emoji.css
@@ -1,8 +1,8 @@
 /**
- * Trumbowyg v2.27.1 - A lightweight WYSIWYG editor
+ * Trumbowyg v2.27.2 - A lightweight WYSIWYG editor
  * Trumbowyg plugin stylesheet
  * ------------------------
- * @link http://alex-d.github.io/Trumbowyg
+ * @link https://alex-d.github.io/Trumbowyg/
  * @license MIT
  * @author Alexandre Demode (Alex-D)
  *         Twitter : @AlexandreDemode

diff --git a/dist/plugins/emoji/ui/trumbowyg.emoji.min.css b/dist/plugins/emoji/ui/trumbowyg.emoji.min.css
diff --git a/dist/plugins/giphy/ui/sass/trumbowyg.giphy.scss b/dist/plugins/giphy/ui/sass/trumbowyg.giphy.scss
@@ -1,8 +1,8 @@
 /**
- * Trumbowyg v2.27.1 - A lightweight WYSIWYG editor
+ * Trumbowyg v2.27.2 - A lightweight WYSIWYG editor
  * Default stylesheet for Trumbowyg editor plugin
  * ------------------------
- * @link http://alex-d.github.io/Trumbowyg
+ * @link https://alex-d.github.io/Trumbowyg/
  * @license MIT
  * @author Alexandre Demode (Alex-D)
  *         Twitter : @AlexandreDemode

diff --git a/dist/plugins/giphy/ui/trumbowyg.giphy.css b/dist/plugins/giphy/ui/trumbowyg.giphy.css
@@ -1,8 +1,8 @@
 /**
- * Trumbowyg v2.27.1 - A lightweight WYSIWYG editor
+ * Trumbowyg v2.27.2 - A lightweight WYSIWYG editor
  * Trumbowyg plugin stylesheet
  * ------------------------
- * @link http://alex-d.github.io/Trumbowyg
+ * @link https://alex-d.github.io/Trumbowyg/
  * @license MIT
  * @author Alexandre Demode (Alex-D)
  *         Twitter : @AlexandreDemode

diff --git a/dist/plugins/giphy/ui/trumbowyg.giphy.min.css b/dist/plugins/giphy/ui/trumbowyg.giphy.min.css
diff --git a/dist/plugins/highlight/ui/sass/trumbowyg.highlight.scss b/dist/plugins/highlight/ui/sass/trumbowyg.highlight.scss
@@ -1,8 +1,8 @@
 /**
- * Trumbowyg v2.27.1 - A lightweight WYSIWYG editor
+ * Trumbowyg v2.27.2 - A lightweight WYSIWYG editor
  * Default stylesheet for Trumbowyg editor plugin
  * ------------------------
- * @link http://alex-d.github.io/Trumbowyg
+ * @link https://alex-d.github.io/Trumbowyg/
  * @license MIT
  * @author Alexandre Demode (Alex-D)
  *         Twitter : @AlexandreDemode

diff --git a/dist/plugins/highlight/ui/trumbowyg.highlight.css b/dist/plugins/highlight/ui/trumbowyg.highlight.css
@@ -1,8 +1,8 @@
 /**
- * Trumbowyg v2.27.1 - A lightweight WYSIWYG editor
+ * Trumbowyg v2.27.2 - A lightweight WYSIWYG editor
  * Trumbowyg plugin stylesheet
  * ------------------------
- * @link http://alex-d.github.io/Trumbowyg
+ * @link https://alex-d.github.io/Trumbowyg/
  * @license MIT
  * @author Alexandre Demode (Alex-D)
  *         Twitter : @AlexandreDemode

diff --git a/dist/plugins/highlight/ui/trumbowyg.highlight.min.css b/dist/plugins/highlight/ui/trumbowyg.highlight.min.css
diff --git a/dist/plugins/mathml/ui/sass/trumbowyg.mathml.scss b/dist/plugins/mathml/ui/sass/trumbowyg.mathml.scss
@@ -1,8 +1,8 @@
 /**
- * Trumbowyg v2.27.1 - A lightweight WYSIWYG editor
+ * Trumbowyg v2.27.2 - A lightweight WYSIWYG editor
  * Default stylesheet for Trumbowyg editor plugin
  * ------------------------
- * @link http://alex-d.github.io/Trumbowyg
+ * @link https://alex-d.github.io/Trumbowyg/
  * @license MIT
  * @author Alexandre Demode (Alex-D)
  *         Twitter : @AlexandreDemode

diff --git a/dist/plugins/mathml/ui/trumbowyg.mathml.css b/dist/plugins/mathml/ui/trumbowyg.mathml.css
@@ -1,8 +1,8 @@
 /**
- * Trumbowyg v2.27.1 - A lightweight WYSIWYG editor
+ * Trumbowyg v2.27.2 - A lightweight WYSIWYG editor
  * Trumbowyg plugin stylesheet
  * ------------------------
- * @link http://alex-d.github.io/Trumbowyg
+ * @link https://alex-d.github.io/Trumbowyg/
  * @license MIT
  * @author Alexandre Demode (Alex-D)
  *         Twitter : @AlexandreDemode

diff --git a/dist/plugins/mathml/ui/trumbowyg.mathml.min.css b/dist/plugins/mathml/ui/trumbowyg.mathml.min.css
diff --git a/dist/plugins/mention/ui/sass/trumbowyg.mention.scss b/dist/plugins/mention/ui/sass/trumbowyg.mention.scss
@@ -1,8 +1,8 @@
 /**
- * Trumbowyg v2.27.1 - A lightweight WYSIWYG editor
+ * Trumbowyg v2.27.2 - A lightweight WYSIWYG editor
  * Default stylesheet for Trumbowyg editor plugin
  * ------------------------
- * @link http://alex-d.github.io/Trumbowyg
+ * @link https://alex-d.github.io/Trumbowyg/
  * @license MIT
  * @author Alexandre Demode (Alex-D)
  *         Twitter : @AlexandreDemode

diff --git a/dist/plugins/mention/ui/trumbowyg.mention.css b/dist/plugins/mention/ui/trumbowyg.mention.css
@@ -1,8 +1,8 @@
 /**
- * Trumbowyg v2.27.1 - A lightweight WYSIWYG editor
+ * Trumbowyg v2.27.2 - A lightweight WYSIWYG editor
  * Trumbowyg plugin stylesheet
  * ------------------------
- * @link http://alex-d.github.io/Trumbowyg
+ * @link https://alex-d.github.io/Trumbowyg/
  * @license MIT
  * @author Alexandre Demode (Alex-D)
  *         Twitter : @AlexandreDemode

diff --git a/dist/plugins/mention/ui/trumbowyg.mention.min.css b/dist/plugins/mention/ui/trumbowyg.mention.min.css
diff --git a/dist/plugins/specialchars/ui/sass/trumbowyg.specialchars.scss b/dist/plugins/specialchars/ui/sass/trumbowyg.specialchars.scss
@@ -1,8 +1,8 @@
 /**
- * Trumbowyg v2.27.1 - A lightweight WYSIWYG editor
+ * Trumbowyg v2.27.2 - A lightweight WYSIWYG editor
  * Default stylesheet for Trumbowyg editor plugin
  * ------------------------
- * @link http://alex-d.github.io/Trumbowyg
+ * @link https://alex-d.github.io/Trumbowyg/
  * @license MIT
  * @author Alexandre Demode (Alex-D)
  *         Twitter : @AlexandreDemode

diff --git a/dist/plugins/specialchars/ui/trumbowyg.specialchars.css b/dist/plugins/specialchars/ui/trumbowyg.specialchars.css
@@ -1,8 +1,8 @@
 /**
- * Trumbowyg v2.27.1 - A lightweight WYSIWYG editor
+ * Trumbowyg v2.27.2 - A lightweight WYSIWYG editor
  * Trumbowyg plugin stylesheet
  * ------------------------
- * @link http://alex-d.github.io/Trumbowyg
+ * @link https://alex-d.github.io/Trumbowyg/
  * @license MIT
  * @author Alexandre Demode (Alex-D)
  *         Twitter : @AlexandreDemode

diff --git a/dist/plugins/specialchars/ui/trumbowyg.specialchars.min.css b/dist/plugins/specialchars/ui/trumbowyg.specialchars.min.css
diff --git a/dist/plugins/table/trumbowyg.table.js b/dist/plugins/table/trumbowyg.table.js
@@ -550,13 +550,17 @@
                             t.saveRange();
 
                             var node = t.doc.getSelection().anchorNode;
-                            var $focusedRow = $(node).closest('tr');
                             var $table = $(node).closest('table');
 
                             if ($table.length === 0) {
                                 return;
                             }
 
+                            if (node.tagName === 'TR') {
+                                node = $('td, th', node)[0];
+                            }
+                            var $focusedRow = $(node).closest('tr');
+
                             var tableState = getTableState($table);
 
                             callback($table, $focusedRow, node, tableState);
@@ -778,7 +782,7 @@
                         text: t.lang.tableDeleteRow,
                         ico: 'row-delete',
 
-                        fn: tableButtonAction(function ($table, $focusedRow) {
+                        fn: tableButtonAction(function ($table, $focusedRow, node, tableState) {
                             // Only one row is remaining in the table, remove the table
                             if ($('tbody tr', $table).length === 1) {
                                 $table.remove();
@@ -791,7 +795,41 @@
                             if ($focusedRowParent.is('thead')) {
                                 $elementToRemove = $focusedRowParent;
                             }
+
+                            // Manage merged cells
+                            var $rows = $('tr', $table);
+                            var rowIndex = $rows.index($(node).closest('tr'));
+                            for (var y = 0; y < tableState[0].length; y += 1) {
+                                var cellState = getCellState(tableState, [rowIndex, y], false);
+
+                                if (cellState.rowspan === 1) {
+                                    continue;
+                                }
+
+                                var originCellState = getCellState(tableState, [rowIndex, y]);
+                                originCellState.element.setAttribute('rowspan', originCellState.rowspan - 1);
+
+                                // If origin cell is not in this row, continue
+                                if (cellState.mergedIn !== undefined) {
+                                    continue;
+                                }
+
+                                // If origin cell is in this row, move it to the next row
+                                var originCellIndex = getCellIndex(cellState.element, tableState[rowIndex]);
+                                if (originCellIndex === 0) {
+                                    $($rows[rowIndex + 1]).prepend(originCellState.element);
+                                    continue;
+                                }
+                                var nextRowPreviousColumnCellState = getCellState(tableState, [
+                                    rowIndex + 1,
+                                    originCellIndex - 1
+                                ]);
+                                $(nextRowPreviousColumnCellState.element).after(originCellState.element);
+                            }
+
                             $elementToRemove.remove();
+                            simplifyCells($table);
+                            redrawResizeLayers();
                         }),
                     };
 
@@ -800,12 +838,27 @@
                         text: t.lang.tableDeleteColumn,
                         ico: 'col-delete',
 
-                        fn: tableButtonAction(function ($table, $focusedRow, node) {
-                            var cellIndex = $(node).closest('td').index();
+                        fn: tableButtonAction(function ($table, $focusedRow, node, tableState) {
+                            var $rows = $('tr', $table);
+                            var rowIndex = $rows.index($(node).closest('tr'));
+                            var columnIndex = getCellIndex($(node).closest('td, th')[0], tableState[rowIndex]);
 
-                            $table.find('tr').each(function () {
-                                $(this).find('td:eq(' + cellIndex + '), th:eq(' + cellIndex + ')').remove();
-                            });
+                            for (var x = 0; x < tableState.length; x += 1) {
+                                var cellState = getCellState(tableState, [x, columnIndex], false);
+
+                                // Reduce cell colspan by 1
+                                if (cellState.colspan > 1) {
+                                    var originCellState = getCellState(tableState, [x, columnIndex]);
+                                    originCellState.element.setAttribute('colspan', originCellState.colspan - 1);
+                                    continue;
+                                }
+
+                                // Delete cell if not merged
+                                cellState.element.remove();
+                            }
+
+                            simplifyCells();
+                            redrawResizeLayers();
                         })
                     };
 
@@ -1279,6 +1332,7 @@
 
                                 // Update HTML
                                 t.syncCode();
+                                redrawResizeLayers();
                             });
 
                         $(window)

diff --git a/dist/plugins/table/trumbowyg.table.min.js b/dist/plugins/table/trumbowyg.table.min.js
diff --git a/dist/plugins/table/ui/sass/trumbowyg.table.scss b/dist/plugins/table/ui/sass/trumbowyg.table.scss
@@ -1,8 +1,8 @@
 /**
- * Trumbowyg v2.27.1 - A lightweight WYSIWYG editor
+ * Trumbowyg v2.27.2 - A lightweight WYSIWYG editor
  * Default stylesheet for Trumbowyg editor plugin
  * ------------------------
- * @link http://alex-d.github.io/Trumbowyg
+ * @link https://alex-d.github.io/Trumbowyg/
  * @license MIT
  * @author Alexandre Demode (Alex-D)
  *         Twitter : @AlexandreDemode

diff --git a/dist/plugins/table/ui/trumbowyg.table.css b/dist/plugins/table/ui/trumbowyg.table.css
@@ -1,8 +1,8 @@
 /**
- * Trumbowyg v2.27.1 - A lightweight WYSIWYG editor
+ * Trumbowyg v2.27.2 - A lightweight WYSIWYG editor
  * Trumbowyg plugin stylesheet
  * ------------------------
- * @link http://alex-d.github.io/Trumbowyg
+ * @link https://alex-d.github.io/Trumbowyg/
  * @license MIT
  * @author Alexandre Demode (Alex-D)
  *         Twitter : @AlexandreDemode