Merge pull request #1180 from edissyum/3.0.5_fix#1

3.0.6

dist/tinymce/CHANGELOG.md

@@ -6,6 +6,78 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## 6.8.1 - 2023-11-29
+
+### Improved
+- Colorpicker now includes the Brightness/Saturation selector and hue slider in the keyboard navigable items. #TINY-9287
+
+### Fixed
+- Translation syntax for announcement text in the table grid was incorrectly formatted. #TINY-10141
+- The functions `schema.isWrapper` and `schema.isInline` did not exclude node names that started with `#` which should not be considered as elements. #TINY-10385
+
+## 6.8.0 - 2023-11-22
+
+### Added
+- CSS files are now also generated as separate JS files to improve bundling of all resources. #TINY-10352
+- Added new `StylesheetLoader.loadRawCss` API that can be used to load CSS into a style element. #TINY-10352
+- Added new `StylesheetLoader.unloadRawCss` API that can be used to unload CSS that was loaded into a style element. #TINY-10352
+- Added `force_hex_color` editor option. Option `'always'` converts all RGB & RGBA colours to hex, `'rgb_only'` will only convert RGB and *not* RGBA colours to hex, `'off'` won't convert any colours to hex. #TINY-9819
+- Added `default_font_stack` editor option that makes it possible to define what is considered a system font stack. #TINY-10290
+- New `sandbox_iframes` option that controls whether iframe elements will be added a `sandbox=""` attribute to mitigate malicious intent. #TINY-10348
+- New `convert_unsafe_embeds` option that controls whether `<object>` and `<embed>` elements will be converted to more restrictive alternatives, namely `<img>` for image MIME types, `<video>` for video MIME types, `<audio>` audio MIME types, or `<iframe>` for other or unspecified MIME types. #TINY-10349
+
+### Improved
+- Improved the tooltips of picker buttons for the urlinput components in the "Insert/Edit Image" and "Insert/Edit Link" dialogs. #TINY-10155
+- Inline dialog will now respect `size: 'large'` argument in the dialog spec. #TINY-10209
+- SVG elements and their children are now retained when configured as valid elements. #TINY-10237
+- Bespoke dropdown toolbar buttons including `align`, `fontfamily`, `fontsize`, `blocks`, and `styles` did not include their visible text labels in their accessible names. #TINY-10147
+
+### Fixed
+- Editor would convert urls that are not http/s or relative resulting in broken links. #TINY-10153
+- Calling the `setProgressState` API would cause the window to be scrolled when the editor wasn't fully visible. #TINY-10172
+- Applying heading formatting to the content of the `summary` element extended its application to the content of the parent `details` element. #TINY-10154
+- Setting the content with an attribute that contains a self-closing HTML tag did not preserve the tag. #TINY-10088
+- Screen readers now announce the selected color of `forecolor` and `backcolor` buttons. #TINY-9796
+- Resize handles would not appear on editable images in a non-editable context. #TINY-10118
+- Corrections and copy-edits to the `addIcon` API documentation. #TINY-10230
+- The dialog size was not updated when the `size` argument was changed when redialling a dialog. #TINY-10209
+- Toggling a list that contains an LI element having another list as its first child would remove the remaining content within that LI element. #TINY-10213
+- Custom block element wasn't considered block element in some cases. #TINY-10139
+- The editor no longer forcefully takes focus when a notification closes while the focus is outside of the editor. #TINY-10282
+- An empty element with a `contenteditable="true"` attribute within a table cell would not be treated as content and get removed if backspace or delete was being pressed. #TINY-10010
+- Removing an LI element containing a `details` element would incorrectly merge its content. #TINY-10133
+- The function `getModifierState` did not work on events passed through the editor as expected. #TINY-10263
+- Search and replace plugin would incorrectly find matching text inside non-editable root elements. #TINY-10162
+- Removed use of `async` for editor rendering which caused visual blinking when reloading the editor in-place. #TINY-10249
+- Toggling off one format on the caret when multiple formats was toggled on would toggle all of them off. #TINY-10132
+- Merging an external `p` inside a `list` via delete or backspace would incorrectly try to move a parent element inside a child element. #TINY-10289
+- Directionality would not be consistently applied to the entire `accordion` block. #TINY-10291
+- The `fontsizeinput` toolbar item was causing console warnings when toolbar items were clicked. #TINY-10330
+- Menubar buttons with more than one word would sometimes wrap into two lines. #TINY-10343
+- Creating a new `li` via enter inside a nested list would not inherit styles from the source `li`. #TINY-10316
+- Screen readers now announce the active autocompleter item. #TINY-9393
+- Dialog collection items would not display any icons chosen from icon pack. #TINY-10174
+
+## 6.7.3 - 2023-11-15
+
+### Changed
+- Zero width no-break space (U+FEFF) characters are removed from content passed to `setContent`, `insertContent`, and `resetContent` APIs. #TINY-10305
+- Zero width no-break space (U+FEFF) characters in initial content are not loaded into the editor upon initialization. #TINY-10305
+
+### Fixed
+- Specific HTML content containing unescaped text nodes caused mXSS when using undo/redo. #TINY-10305
+- Specific HTML content containing unescaped text nodes caused mXSS when using the `getContent` and `setContent` APIs with the `format: 'raw'` option, which also affected the `resetContent` API and the draft restoration feature of the Autosave plugin. #TINY-10305
+
+## 6.7.2 - 2023-10-25
+
+### Fixed
+- The function `getModifierState` did not work on events passed through the editor as expected. #TINY-10263
+- Removed use of `async` for editor rendering which caused visual blinking when reloading the editor in-place. #TINY-10249
+- Toggling a list that contains an LI element having another list as its first child would remove the remaining content within that LI element. #TINY-10213
+- List items containing a list element surrounded by non list nodes would cause some list operations to fail. #TINY-10268
+- The `accordion` toggling with the Enter key press would behave incorrectly on Safari. #TINY-10177
+- Deleting a range that included both text of a cell and a nested table in that cell removed the entire content of the cell. #TINY-10254
+
 ## 6.7.1 - 2023-10-19
 
 ### Fixed

dist/tinymce/composer.json

@@ -1,6 +1,6 @@
 {
 	"name": "tinymce/tinymce",
-	"version": "6.7.1",
+	"version": "6.8.1",
 	"description": "Web based JavaScript HTML WYSIWYG editor control.",
 	"license": [
 		"MIT-only"

dist/tinymce/models/dom/model.js

@@ -1,5 +1,5 @@
 /**
- * TinyMCE version 6.7.1 (2023-10-19)
+ * TinyMCE version 6.8.1 (2023-11-29)
  */
 
 (function () {

dist/tinymce/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "tinymce",
-	"version": "6.7.1",
+	"version": "6.8.1",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/tinymce/tinymce.git",

dist/tinymce/plugins/accordion/plugin.js

@@ -1,11 +1,11 @@
 /**
- * TinyMCE version 6.7.1 (2023-10-19)
+ * TinyMCE version 6.8.1 (2023-11-29)
  */
 
 (function () {
     'use strict';
 
-    var global$3 = tinymce.util.Tools.resolve('tinymce.PluginManager');
+    var global$4 = tinymce.util.Tools.resolve('tinymce.PluginManager');
 
     let unique = 0;
     const generate = prefix => {
@@ -735,7 +735,7 @@
     const accordionBodyWrapperClass = 'mce-accordion-body';
     const accordionBodyWrapperTag = 'div';
 
-    var global$2 = tinymce.util.Tools.resolve('tinymce.util.Tools');
+    var global$3 = tinymce.util.Tools.resolve('tinymce.util.Tools');
 
     const isSummary = node => (node === null || node === void 0 ? void 0 : node.nodeName) === 'SUMMARY';
     const isDetails = node => (node === null || node === void 0 ? void 0 : node.nodeName) === 'DETAILS';
@@ -744,6 +744,10 @@
       const node = editor.selection.getNode();
       return isSummary(node) || Boolean(editor.dom.getParent(node, isSummary));
     };
+    const isAtDetailsStart = editor => {
+      const rng = editor.selection.getRng();
+      return isDetails(rng.startContainer) && rng.collapsed && rng.startOffset === 0;
+    };
     const isInsertAllowed = editor => !isInSummary(editor) && editor.dom.isEditable(editor.selection.getNode());
     const getSelectedDetails = editor => Optional.from(editor.dom.getParent(editor.selection.getNode(), isDetails));
     const isDetailsSelected = editor => getSelectedDetails(editor).isSome();
@@ -777,7 +781,7 @@
       normalizeSummary(editor, accordion);
     };
     const normalizeDetails = editor => {
-      global$2.each(global$2.grep(editor.dom.select('details', editor.getBody())), normalizeAccordion(editor));
+      global$3.each(global$3.grep(editor.dom.select('details', editor.getBody())), normalizeAccordion(editor));
     };
 
     const insertAccordion = editor => {
@@ -851,7 +855,7 @@
       editor.addCommand('RemoveAccordion', () => removeAccordion(editor));
     };
 
-    var global$1 = tinymce.util.Tools.resolve('tinymce.html.Node');
+    var global$2 = tinymce.util.Tools.resolve('tinymce.html.Node');
 
     const getClassList = node => {
       var _a, _b;
@@ -895,12 +899,12 @@
       };
     };
     const padInputNode = node => {
-      const br = new global$1('br', 1);
+      const br = new global$2('br', 1);
       br.attr('data-mce-bogus', '1');
       node.empty();
       node.append(br);
     };
-    const setup$1 = editor => {
+    const setup$2 = editor => {
       editor.on('PreInit', () => {
         const {serializer, parser} = editor;
         parser.addNodeFilter(accordionTag, nodes => {
@@ -910,7 +914,7 @@
               const accordionNode = node;
               const {summaryNode, wrapperNode, otherNodes} = getAccordionChildren(accordionNode);
               const hasSummaryNode = isNonNullable(summaryNode);
-              const newSummaryNode = hasSummaryNode ? summaryNode : new global$1('summary', 1);
+              const newSummaryNode = hasSummaryNode ? summaryNode : new global$2('summary', 1);
               if (isNullable(newSummaryNode.firstChild)) {
                 padInputNode(newSummaryNode);
               }
@@ -923,7 +927,8 @@
                 }
               }
               const hasWrapperNode = isNonNullable(wrapperNode);
-              const newWrapperNode = hasWrapperNode ? wrapperNode : new global$1(accordionBodyWrapperTag, 1);
+              const newWrapperNode = hasWrapperNode ? wrapperNode : new global$2(accordionBodyWrapperTag, 1);
+              newWrapperNode.attr('data-mce-bogus', '1');
               addClasses(newWrapperNode, [accordionBodyWrapperClass]);
               if (otherNodes.length > 0) {
                 for (let j = 0; j < otherNodes.length; j++) {
@@ -932,7 +937,7 @@
                 }
               }
               if (isNullable(newWrapperNode.firstChild)) {
-                const pNode = new global$1('p', 1);
+                const pNode = new global$2('p', 1);
                 padInputNode(pNode);
                 newWrapperNode.append(pNode);
               }
@@ -961,18 +966,17 @@
       });
     };
 
-    var global = tinymce.util.Tools.resolve('tinymce.util.VK');
+    var global$1 = tinymce.util.Tools.resolve('tinymce.util.VK');
 
     const setupEnterKeyInSummary = editor => {
       editor.on('keydown', event => {
-        if (event.shiftKey || event.keyCode !== global.ENTER || !isInSummary(editor)) {
-          return;
+        if (!event.shiftKey && event.keyCode === global$1.ENTER && isInSummary(editor) || isAtDetailsStart(editor)) {
+          event.preventDefault();
+          editor.execCommand('ToggleAccordion');
         }
-        event.preventDefault();
-        editor.execCommand('ToggleAccordion');
       });
     };
-    const setup = editor => {
+    const setup$1 = editor => {
       setupEnterKeyInSummary(editor);
       editor.on('ExecCommand', e => {
         const cmd = e.command.toLowerCase();
@@ -982,6 +986,22 @@
       });
     };
 
+    var global = tinymce.util.Tools.resolve('tinymce.Env');
+
+    const setup = editor => {
+      if (global.browser.isSafari()) {
+        editor.on('click', e => {
+          if (isSummary(e.target)) {
+            const summary = e.target;
+            const rng = editor.selection.getRng();
+            if (rng.collapsed && rng.startContainer === summary.parentNode && rng.startOffset === 0) {
+              editor.selection.setCursorLocation(summary, 0);
+            }
+          }
+        });
+      }
+    };
+
     const onSetup = editor => buttonApi => {
       const onNodeChange = () => buttonApi.setEnabled(isInsertAllowed(editor));
       editor.on('NodeChange', onNodeChange);
@@ -1020,11 +1040,12 @@
     };
 
     var Plugin = () => {
-      global$3.add('accordion', editor => {
+      global$4.add('accordion', editor => {
         register(editor);
         register$1(editor);
-        setup(editor);
         setup$1(editor);
+        setup$2(editor);
+        setup(editor);
       });
     };