[fc] Repository: plone.protect

Branch: refs/heads/master Date: 2024-09-25T09:35:08+02:00 Author: Peter Mathis (petschki) <[email protected]> Commit: plone/plone.protect@aca1e8b Check for removed tinymce.util.XHR Files changed: M plone/protect/protect.js Repository: plone.protect Branch: refs/heads/master Date: 2024-09-25T09:35:08+02:00 Author: Peter Mathis (petschki) <[email protected]> Commit: plone/plone.protect@7aac622 changenote Files changed: A news/106.bugfix Repository: plone.protect Branch: refs/heads/master Date: 2024-10-23T16:15:56+02:00 Author: Peter Mathis (petschki) <[email protected]> Commit: plone/plone.protect@9f3cf43 Update plone/protect/protect.js Co-authored-by: Johannes Raggam <[email protected]> Files changed: M plone/protect/protect.js Repository: plone.protect Branch: refs/heads/master Date: 2024-10-28T10:43:03+01:00 Author: Jens W. Klein (jensens) <[email protected]> Commit: plone/plone.protect@80a9b99 Merge branch 'master' into tinymce-fix Files changed: M .pre-commit-config.yaml Repository: plone.protect Branch: refs/heads/master Date: 2024-10-28T10:44:32+01:00 Author: Jens W. Klein (jensens) <[email protected]> Commit: plone/plone.protect@dab69f6 Merge pull request #118 from plone/tinymce-fix TinyMCE 6+ support Files changed: A news/106.bugfix M plone/protect/protect.js
plone · Oct 28, 2024 · 422ac04 · 422ac04
1 parent e34f457
commit 422ac04
Showing 1 changed file with 58 additions and 13 deletions.
diff --git a/last_commit.txt b/last_commit.txt
@@ -2,34 +2,79 @@ Repository: plone.protect
 
 
 Branch: refs/heads/master
-Date: 2024-10-07T21:24:31Z
-Author: pre-commit-ci[bot] (pre-commit-ci[bot]) <66853113+pre-commit-ci[bot]@users.noreply.github.com>
-Commit: https://github.com/plone/plone.protect/commit/76d97f3fe7712ebc4604d667ac869db17ee830ce
+Date: 2024-09-25T09:35:08+02:00
+Author: Peter Mathis (petschki) <[email protected]>
+Commit: https://github.com/plone/plone.protect/commit/aca1e8b621c89480dde0c8c337dc771ec49723f9
 
-[pre-commit.ci] pre-commit autoupdate
+Check for removed tinymce.util.XHR
 
-updates:
-- [github.com/psf/black: 24.8.0 → 24.10.0](https://github.com/psf/black/compare/24.8.0...24.10.0)
+Files changed:
+M plone/protect/protect.js
+
+b'diff --git a/plone/protect/protect.js b/plone/protect/protect.js\nindex acd3aed..817b246 100644\n--- a/plone/protect/protect.js\n+++ b/plone/protect/protect.js\n@@ -29,7 +29,7 @@ if(script){\n       }\n     });\n   }\n-  if(window.tinymce && window.tinymce.util.XHR._send === undefined){\n+  if(window.tinymce && window.tinymce.util.XHR && window.tinymce.util.XHR._send === undefined){\n     window.tinymce.util.XHR._send = window.tinymce.util.XHR.send;\n     var xhr = window.tinymce.util.XHR;\n     var _send = xhr.send;\n'
+
+Repository: plone.protect
+
+
+Branch: refs/heads/master
+Date: 2024-09-25T09:35:08+02:00
+Author: Peter Mathis (petschki) <[email protected]>
+Commit: https://github.com/plone/plone.protect/commit/7aac622b021556f6cdc5f98cf626ef9b730e2448
+
+changenote
 
 Files changed:
-M .pre-commit-config.yaml
+A news/106.bugfix
 
-b'diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml\nindex 1460326..f70417d 100644\n--- a/.pre-commit-config.yaml\n+++ b/.pre-commit-config.yaml\n@@ -16,7 +16,7 @@ repos:\n     hooks:\n     -   id: isort\n -   repo: https://github.com/psf/black\n-    rev: 24.8.0\n+    rev: 24.10.0\n     hooks:\n     -   id: black\n -   repo: https://github.com/collective/zpretty\n'
+b'diff --git a/news/106.bugfix b/news/106.bugfix\nnew file mode 100644\nindex 0000000..d7fa367\n--- /dev/null\n+++ b/news/106.bugfix\n@@ -0,0 +1,2 @@\n+Remove tinymce patch. `tinymce.utils.XHR` has been removed in TinyMCE 6.\n+[petschki]\n'
 
 Repository: plone.protect
 
 
 Branch: refs/heads/master
-Date: 2024-10-24T10:11:42+02:00
-Author: Alessandro Pisa (ale-rt) <alessandro.pisa@gmail.com>
-Commit: https://github.com/plone/plone.protect/commit/5d00f909335a6710469e510271fa37dba24a4b92
+Date: 2024-10-23T16:15:56+02:00
+Author: Peter Mathis (petschki) <[email protected].com>
+Commit: https://github.com/plone/plone.protect/commit/9f3cf436f6ced883b03c73a7416bd63441cc3e21
 
-Merge pull request #119 from plone/pre-commit-ci-update-config
+Update plone/protect/protect.js
 
-[pre-commit.ci] pre-commit autoupdate
+Co-authored-by: Johannes Raggam &lt;[email protected]&gt;
+
+Files changed:
+M plone/protect/protect.js
+
+b'diff --git a/plone/protect/protect.js b/plone/protect/protect.js\nindex 817b246..d141cc5 100644\n--- a/plone/protect/protect.js\n+++ b/plone/protect/protect.js\n@@ -30,6 +30,8 @@ if(script){\n     });\n   }\n   if(window.tinymce && window.tinymce.util.XHR && window.tinymce.util.XHR._send === undefined){\n+    // Fix for TinyMCE < 6 in Plone < 6.1\n+    // TODO: Can be removed in Plone 6.1\n     window.tinymce.util.XHR._send = window.tinymce.util.XHR.send;\n     var xhr = window.tinymce.util.XHR;\n     var _send = xhr.send;\n'
+
+Repository: plone.protect
+
+
+Branch: refs/heads/master
+Date: 2024-10-28T10:43:03+01:00
+Author: Jens W. Klein (jensens) <[email protected]>
+Commit: https://github.com/plone/plone.protect/commit/80a9b99932a428c459e8db9cad129b01f1e982a5
+
+Merge branch 'master' into tinymce-fix
 
 Files changed:
 M .pre-commit-config.yaml
 
 b'diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml\nindex 1460326..f70417d 100644\n--- a/.pre-commit-config.yaml\n+++ b/.pre-commit-config.yaml\n@@ -16,7 +16,7 @@ repos:\n     hooks:\n     -   id: isort\n -   repo: https://github.com/psf/black\n-    rev: 24.8.0\n+    rev: 24.10.0\n     hooks:\n     -   id: black\n -   repo: https://github.com/collective/zpretty\n'
 
+Repository: plone.protect
+
+
+Branch: refs/heads/master
+Date: 2024-10-28T10:44:32+01:00
+Author: Jens W. Klein (jensens) <[email protected]>
+Commit: https://github.com/plone/plone.protect/commit/dab69f6cca215051cba84e3c6e638bcb36820fb3
+
+Merge pull request #118 from plone/tinymce-fix
+
+TinyMCE 6+ support
+
+Files changed:
+A news/106.bugfix
+M plone/protect/protect.js
+
+b'diff --git a/news/106.bugfix b/news/106.bugfix\nnew file mode 100644\nindex 0000000..d7fa367\n--- /dev/null\n+++ b/news/106.bugfix\n@@ -0,0 +1,2 @@\n+Remove tinymce patch. `tinymce.utils.XHR` has been removed in TinyMCE 6.\n+[petschki]\ndiff --git a/plone/protect/protect.js b/plone/protect/protect.js\nindex acd3aed..d141cc5 100644\n--- a/plone/protect/protect.js\n+++ b/plone/protect/protect.js\n@@ -29,7 +29,9 @@ if(script){\n       }\n     });\n   }\n-  if(window.tinymce && window.tinymce.util.XHR._send === undefined){\n+  if(window.tinymce && window.tinymce.util.XHR && window.tinymce.util.XHR._send === undefined){\n+    // Fix for TinyMCE < 6 in Plone < 6.1\n+    // TODO: Can be removed in Plone 6.1\n     window.tinymce.util.XHR._send = window.tinymce.util.XHR.send;\n     var xhr = window.tinymce.util.XHR;\n     var _send = xhr.send;\n'
+