Skip to content
This repository was archived by the owner on Mar 26, 2025. It is now read-only.

Commit 35915cd

Browse files
authored
Fix: Allow double clicks to propagate. (#676)
* Fix: Allow double clicks to propagate. * Update tests * More extensive test suite * Remove django 2.2 test for django CMS 4.0 * Update test-matrix * Update test.yaml * test with released version of django CMS 4.1 * fix: Add missing typo for test actions * Remove PYthon 3.12 from tests, correct django CMS 4.0 dependency
1 parent e4af647 commit 35915cd

File tree

15 files changed

+102
-328
lines changed

15 files changed

+102
-328
lines changed

.github/workflows/test.yml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ jobs:
1212
requirements-file: [
1313
dj22_cms37.txt,
1414
dj22_cms38.txt,
15-
dj22_cms40.txt,
1615
dj31_cms38.txt,
1716
dj32_cms39.txt,
1817
dj32_cms310.txt,
@@ -23,8 +22,9 @@ jobs:
2322
dj41_cms311.txt,
2423
dj41_cms41.txt,
2524
dj42_cms311.txt,
25+
dj42_cms40.txt,
2626
dj42_cms41.txt,
27-
dj50_cms41.txt
27+
dj50_cms41.txt,
2828
]
2929
os: [
3030
ubuntu-20.04,
@@ -42,26 +42,30 @@ jobs:
4242
requirements-file: dj41_cms41.txt
4343
- python-version: 3.7
4444
requirements-file: dj42_cms311.txt
45+
- python-version: 3.7
46+
requirements-file: dj42_cms40.txt
4547
- python-version: 3.7
4648
requirements-file: dj42_cms41.txt
4749
- python-version: 3.7
4850
requirements-file: dj50_cms41.txt
4951
- python-version: 3.8
5052
requirements-file: dj50_cms41.txt
5153
- python-version: 3.8
52-
requirements-file: dj41_cms41.txt
54+
requirements-file: dj32_cms41.txt
5355
- python-version: 3.8
5456
requirements-file: dj40_cms41.txt
5557
- python-version: 3.8
56-
requirements-file: dj32_cms41.txt
58+
requirements-file: dj41_cms41.txt
59+
- python-version: 3.8
60+
requirements-file: dj42_cms41.txt
5761
- python-version: 3.8
5862
requirements-file: dj42_cms41.txt
5963
- python-version: 3.9
6064
requirements-file: dj50_cms41.txt
61-
- python-version: "3.10"
62-
requirements-file: dj22_cms40.txt
63-
- python-version: "3.11"
64-
requirements-file: dj22_cms40.txt
65+
- python-version: 3.11
66+
requirements-file: dj42_cms40.txt
67+
- python-version: 3.12
68+
requirements-file: dj40_cms40.txt
6569
steps:
6670
- uses: actions/checkout@v1
6771
- name: Set up Python ${{ matrix.python-version }}

CHANGELOG.rst

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,18 @@
22
Changelog
33
=========
44

5+
5.1.6 (2024-07-18)
6+
==================
7+
8+
* fix: Allow double-clicks to propagate to CKEditor, e.g., to open the link dialog by @fsbraun in https://github.com/django-cms/djangocms-text-ckeditor/pull/676
9+
* fix: Let CKEditor decide on size of its panels by @fsbraun in https://github.com/django-cms/djangocms-text-ckeditor/pull/674
10+
11+
512
5.1.5 (2023-11-30)
613
==================
714

815
* fix(settings): Extend ALLOW_TOKEN_PARSERS if custom one is provided by @DmytroLitvinov in `#654 <https://github.com/django-cms/djangocms-text-ckeditor/pull/654>`_
9-
* fix: Support djangocms-picture 2.0.0 and higher in create_picture_plugin by @leture in `#660 <https://github.com/django-cms/djangocms-text-ckeditor/pull/660>`_
16+
* fix: Support djangocms-picture 2.0.0 and higher in create_picture_plugin by @leture in `#660 <https://github.com/django-cms/djangocms-text-ckeditor/pull/660>`_
1017
* Remove Flash plugin in the default settings by @MacLake in `#656 <https://github.com/django-cms/djangocms-text-ckeditor/pull/656>`_
1118
* fix: Allow for request-free context objects for testing purposes by @fsbraun in `#659 <https://github.com/django-cms/djangocms-text-ckeditor/pull/659>`_
1219
* Update test matrix to include Django 5 by @protoroto in `#662 <https://github.com/django-cms/djangocms-text-ckeditor/pull/662>`_

djangocms_text_ckeditor/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
1616
10. Publish the release when ready
1717
11. Github actions will publish the new package to pypi
1818
"""
19-
__version__ = '5.1.5'
19+
__version__ = '5.1.6'
2020

2121
default_app_config = 'djangocms_text_ckeditor.apps.TextCkeditorConfig'

djangocms_text_ckeditor/static/djangocms_text_ckeditor/ckeditor_plugins/cmsplugins/plugin.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,6 @@
137137
// if event is a jQuery event (touchend), than we mutate
138138
// event a bit so we make the payload similar to what ckeditor.event produces
139139
var handleEdit = function (event) {
140-
event.stop();
141140

142141
if (event.type === 'touchend' || event.type === 'click') {
143142
var cmsPluginNode = $(event.currentTarget).closest('cms-plugin')[0];
Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

djangocms_text_ckeditor/widgets.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818

1919
# this path is changed automatically whenever you run `gulp bundle`
20-
PATH_TO_JS = 'djangocms_text_ckeditor/js/dist/bundle-9f0bbac8ec.cms.ckeditor.min.js'
20+
PATH_TO_JS = 'djangocms_text_ckeditor/js/dist/bundle-a9032984d4.cms.ckeditor.min.js'
2121

2222

2323
class TextEditorWidget(forms.Textarea):

0 commit comments

Comments
 (0)