Merge branch 'tinymce/7' into hotfix/7/DOC-2582

Author: kemister85

.api-version

@@ -1 +1 @@
-7.5.1
+7.6.0

.github/workflows/codeql.yml

@@ -25,15 +25,15 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@v3
         with:
           languages: ${{ matrix.language }}
           queries: +security-and-quality
 
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v2
+        uses: github/codeql-action/autobuild@v3
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v3
         with:
           category: "/language:${{ matrix.language }}"

antora.yml

@@ -15,7 +15,7 @@ asciidoc:
     webcomponent_url: https://cdn.jsdelivr.net/npm/@tinymce/tinymce-webcomponent@2/dist/tinymce-webcomponent.min.js
     jquery_url: https://cdn.jsdelivr.net/npm/@tinymce/tinymce-jquery@2/dist/tinymce-jquery.min.js
     openai_proxy_url: https://openai.ai-demo-proxy.tiny.cloud/v1/chat/completions
-    openai_proxy_token: eyJhbGciOiJFUzM4NCJ9.eyJhdWQiOlsiaHR0cHM6Ly9vcGVuYWkuYWktZGVtby1wcm94eS50aW55LmNsb3VkLyJdLCJleHAiOjE3MzMwMTEyMDAsImh0dHBzOi8vb3BlbmFpLmFpLWRlbW8tcHJveHkudGlueS5jbG91ZC9yb2xlIjoicHVibGljLWRlbW8iLCJpc3MiOiJodHRwczovL2FpLWRlbW8tcHJveHkudGlueS5jbG91ZC8iLCJqdGkiOiIyMmM0MjBkNy1hNjVmLTQ3NDQtODEwZS1jZWY3ZDY2ODQ1ZGYiLCJzdWIiOiJhaS1hc3Npc3RhbnQtZGVtbyJ9.H0MgAgu6EUFLO2zx6fnsnmCMw_0MWtc3Ne4ue6N_CFAowPkIjBqr022ypJqj5i3FMJNad5cWYj84jKKfPHTUaFN5RNurl09K2SDnY2OqNnhcXOT9rl3owhrGxgODOR9G
+    openai_proxy_token: eyJhbGciOiJFUzM4NCJ9.eyJhdWQiOlsiaHR0cHM6Ly9vcGVuYWkuYWktZGVtby1wcm94eS50aW55LmNsb3VkLyJdLCJleHAiOjE3NTEzMjgwMDAsImh0dHBzOi8vb3BlbmFpLmFpLWRlbW8tcHJveHkudGlueS5jbG91ZC9yb2xlIjoicHVibGljLWRlbW8iLCJpc3MiOiJodHRwczovL2FpLWRlbW8tcHJveHkudGlueS5jbG91ZC8iLCJqdGkiOiJmOGFmY2EyNC1mN2FhLTQxMjktYTc2Yy02YThlZDU3YjAyZjYiLCJzdWIiOiJhaS1hc3Npc3RhbnQtZGVtbyJ9.Xu0apHCbxgmRQTeTqrTIDFFhh2CgKeARRXa3mCxSGoCwZqkoQaFRZBCzDo8Xz7DuUa5mW2XHl-HYcYiXJM9ly16d0oY7lJefHBeLlmJEBE1CSttHBkCRWZS8eFLCasL6
     default_meta_keywords: tinymce, documentation, docs, plugins, customizable skins, configuration, examples, html, php, java, javascript, image editor, inline editor, distraction-free editor, classic editor, wysiwyg
     # product docker variables
     dockerimageimportfromwordexporttoword: registry.containers.tiny.cloud/docx-converter-tiny
@@ -26,7 +26,7 @@ asciidoc:
     # product variables
     productname: TinyMCE
     productmajorversion: 7
-    productminorversion: '7.5'
+    productminorversion: '7.6'
     ##### product name in codeblock
     prodnamecode: tinymce
     #### more names

modules/ROOT/examples/live-demos/comments-callback/example.js

@@ -48,7 +48,11 @@ const tinycomments_reply = (req, done, fail) => {
     })
     .then((req2) => {
       const commentUid = req2.commentUid;
-      done({ commentUid });
+      done({
+        commentUid: replyUid,
+        author: currentUser.id,
+        authorName: currentUser.fullName
+      });
     })
     .catch((e) => {
       fail(e);

modules/ROOT/examples/live-demos/context-toolbar-labels/index.html

@@ -0,0 +1,9 @@
+<textarea id="context-toolbar-labels">
+  <p>Clicking on the example image below will show the newly configured context toolbar.</p>
+
+  {{logofordemoshtml}}
+
+  <p>Select a word in this sentence, to see the other newly configured context toolbar.</p>
+
+  <p>Clicking on text should not invoke the context toolbar</p>
+</textarea>

modules/ROOT/examples/live-demos/context-toolbar-labels/index.js

@@ -0,0 +1,34 @@
+tinymce.init({
+  selector: 'textarea#context-toolbar-labels',
+  height: 350,
+  setup: (editor) => {
+    editor.ui.registry.addContextToolbar('imagealignment', {
+      predicate: (node) => node.nodeName.toLowerCase() === 'img',
+      position: 'node',
+      scope: 'node',
+      items: [
+        {
+          name: 'Formatting',
+          items: ['alignleft', 'aligncenter', 'alignright']
+        },
+        {
+          label: 'Copy',
+          items: ['copy', 'paste']
+        }
+      ],
+    });
+
+    editor.ui.registry.addContextToolbar('textselection', {
+      predicate: (node) => !editor.selection.isCollapsed(),
+      position: 'selection',
+      scope: 'node',
+      items: [
+        {
+          name: 'Format',
+          items: ['bold', 'italic', 'underline']
+        },
+      ],
+    });
+  },
+  content_style: 'body { font-family:Helvetica,Arial,sans-serif; font-size:16px }'
+});

modules/ROOT/examples/live-demos/uploadcare/index.html

@@ -0,0 +1,86 @@
+<textarea id="uploadcare">
+  <h1>Discover Your Dream Home on Mallorca: Where Paradise Meets Investment</h1>
+  <p>
+    <span style="color: #4e5c73;">
+      Mallorca, the jewel of the Mediterranean, is not just a place of beauty&mdash;it&rsquo;s a smart investment. With property values consistently on the rise, now is the perfect time to secure your piece of this sun-soaked paradise.&nbsp;
+    </span>
+  </p>
+  <figure class="image">
+    <img style="width: min(2048px, 100%); aspect-ratio: 2048 / 718;"
+      src="https://ucarecdn.com/b51db038-86df-4a83-bd9d-6942151306d0/-/preview/"
+      sizes="(min-width: 2048px) 2048px, 100vw"
+      srcset="https://ucarecdn.com/b51db038-86df-4a83-bd9d-6942151306d0/-/resize/100x/ 100w,
+              https://ucarecdn.com/b51db038-86df-4a83-bd9d-6942151306d0/-/resize/200x/ 200w,
+              https://ucarecdn.com/b51db038-86df-4a83-bd9d-6942151306d0/-/resize/300x/ 300w,
+              https://ucarecdn.com/b51db038-86df-4a83-bd9d-6942151306d0/-/resize/500x/ 500w,
+              https://ucarecdn.com/b51db038-86df-4a83-bd9d-6942151306d0/-/resize/750x/ 750w,
+              https://ucarecdn.com/b51db038-86df-4a83-bd9d-6942151306d0/-/resize/1000x/ 1000w,
+              https://ucarecdn.com/b51db038-86df-4a83-bd9d-6942151306d0/-/resize/1250x/ 1250w,
+              https://ucarecdn.com/b51db038-86df-4a83-bd9d-6942151306d0/-/resize/1500x/ 1500w,
+              https://ucarecdn.com/b51db038-86df-4a83-bd9d-6942151306d0/-/resize/2000x/ 2000w,
+              https://ucarecdn.com/b51db038-86df-4a83-bd9d-6942151306d0/-/preview/ 2048w">
+    <figcaption>Michael Heuser on <a href="https://unsplash.com/@gum_meee">Unsplash</a></figcaption>
+  </figure>
+  <p>
+    Let us show you why Mallorca should be your next home&mdash;and introduce you to an exquisite villa that could soon be yours.
+  </p>
+  <blockquote>
+    <em>"The Mallorca real estate market has grown by an impressive 8% annually over the past five years,"</em> &mdash; Elena Alvarez, Market Analyst at Mediterranean Realty Insights.
+  </blockquote>
+  <p>
+    According to recent market data, Mallorca&rsquo;s property values have experienced steady growth, with an average increase of 8% annually over the past five years. This consistent appreciation, coupled with a thriving rental market, makes it an ideal destination for investors seeking both luxury and financial returns.&nbsp;
+  </p>
+  <h2>Explore Our Featured Villa: The Epitome of Luxury&nbsp;</h2>
+  <p>
+    Located in one of Mallorca&rsquo;s most exclusive areas, this exquisite villa offers breathtaking views and modern design. Every detail has been meticulously crafted to provide the ultimate in comfort and elegance.
+  </p>
+  <figure class="image">
+    <img style="width: min(2048px, 100%); aspect-ratio: 2048 / 1148;"
+      src="https://ucarecdn.com/ae5a4201-4b82-4238-94e8-78f4cccbffe8/-/preview/"
+      sizes="(min-width: 2048px) 2048px, 100vw"
+      srcset="https://ucarecdn.com/ae5a4201-4b82-4238-94e8-78f4cccbffe8/-/resize/100x/ 100w,
+              https://ucarecdn.com/ae5a4201-4b82-4238-94e8-78f4cccbffe8/-/resize/200x/ 200w,
+              https://ucarecdn.com/ae5a4201-4b82-4238-94e8-78f4cccbffe8/-/resize/300x/ 300w,
+              https://ucarecdn.com/ae5a4201-4b82-4238-94e8-78f4cccbffe8/-/resize/500x/ 500w,
+              https://ucarecdn.com/ae5a4201-4b82-4238-94e8-78f4cccbffe8/-/resize/750x/ 750w,
+              https://ucarecdn.com/ae5a4201-4b82-4238-94e8-78f4cccbffe8/-/resize/1000x/ 1000w,
+              https://ucarecdn.com/ae5a4201-4b82-4238-94e8-78f4cccbffe8/-/resize/1250x/ 1250w,
+              https://ucarecdn.com/ae5a4201-4b82-4238-94e8-78f4cccbffe8/-/resize/1500x/ 1500w,
+              https://ucarecdn.com/ae5a4201-4b82-4238-94e8-78f4cccbffe8/-/resize/2000x/ 2000w,
+              https://ucarecdn.com/ae5a4201-4b82-4238-94e8-78f4cccbffe8/-/preview/ 2048w">
+    <figcaption>Designed by <a href="https://www.freepik.com/">Freepik</a></figcaption>
+  </figure>
+  <ul>
+    <li><strong>5 luxurious bedrooms</strong> with private en-suite bathrooms</li>
+    <li><strong>Infinity pool</strong> with panoramic Mediterranean views</li>
+    <li><strong>Spacious terrace</strong> for outdoor dining and entertainment</li>
+    <li><strong>Private garden</strong> with lush landscaping</li>
+    <li><strong>Cutting-edge smart home system&nbsp;</strong></li>
+  </ul>
+  <figure class="image">
+    <img style="width: min(2000px, 100%); aspect-ratio: 2000 / 1121;"
+      src="https://ucarecdn.com/b384b67a-3c73-4629-be5f-07d6a2f49e01/-/preview/"
+      sizes="(min-width: 2000px) 2000px, 100vw"
+      srcset="https://ucarecdn.com/b384b67a-3c73-4629-be5f-07d6a2f49e01/-/resize/100x/ 100w,
+              https://ucarecdn.com/b384b67a-3c73-4629-be5f-07d6a2f49e01/-/resize/200x/ 200w,
+              https://ucarecdn.com/b384b67a-3c73-4629-be5f-07d6a2f49e01/-/resize/300x/ 300w,
+              https://ucarecdn.com/b384b67a-3c73-4629-be5f-07d6a2f49e01/-/resize/500x/ 500w,
+              https://ucarecdn.com/b384b67a-3c73-4629-be5f-07d6a2f49e01/-/resize/750x/ 750w,
+              https://ucarecdn.com/b384b67a-3c73-4629-be5f-07d6a2f49e01/-/resize/1000x/ 1000w,
+              https://ucarecdn.com/b384b67a-3c73-4629-be5f-07d6a2f49e01/-/resize/1250x/ 1250w,
+              https://ucarecdn.com/b384b67a-3c73-4629-be5f-07d6a2f49e01/-/resize/1500x/ 1500w,
+              https://ucarecdn.com/b384b67a-3c73-4629-be5f-07d6a2f49e01/-/preview/ 2000w">
+    <figcaption>Designed by <a href="https://www.freepik.com/">Freepik</a></figcaption>
+  </figure>
+  <p>
+    Step inside, and you&rsquo;ll find bright, open living spaces that blend seamlessly with the outdoors, creating a harmonious living environment that&rsquo;s both relaxing and inspiring.
+  </p>
+  <p>
+    Owning a villa in Mallorca means more than just having a home&mdash;it means living a life of luxury and adventure. From exploring charming villages to dining at world-class restaurants and sailing the turquoise waters, every day is a new experience.
+  </p>
+  <h2>Make This Dream a Reality</h2>
+  <p>
+    Don&rsquo;t miss the opportunity to own a piece of paradise. <a href="https://www.tiny.cloud/contact/">Contact us today</a> to schedule a private tour of this exceptional villa and explore other exclusive properties on the island.
+  </p>
+</textarea>
+  

modules/ROOT/examples/live-demos/uploadcare/index.js

@@ -0,0 +1,19 @@
+tinymce.init({
+  selector: "textarea",
+  plugins: [ "uploadcare", "code", "link", "preview", "lists" ],
+  uploadcare_public_key: 'cfef242412638bfc4193',	
+  toolbar: "undo redo | styles | bold italic underline | forecolor | bullist numlist| link uploadcare | code preview",
+  height: 700,	
+  content_style: `
+    body { max-width: 920px; margin: 1.5rem auto; padding: 0 2vw; }
+    h1 { font-size: 1.5em; }
+        h2 { font-size: 1.17em; }
+    h1, h2, h3, h4, h5, h6 { font-weight: 500; margin: 0 0 0.75rem; }
+    p + h1, p + h2, p + h3, p + h4, p + h5, p + h6 { margin-top: 2rem; }
+    p { line-height: 1.6; margin: 0; } 
+    p + p { margin-top: 1rem; }
+    a { color: #2b70e3; }
+    blockquote { color: #4e5c73; font-weight: 200; font-size: 1.3rem; margin: 1rem 2rem; padding: 0 0 0 1rem; border-left: 2px solid #2b70e3 !important; }
+    figcaption {font-size: 0.875em;}
+  `
+});