Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: Allow double clicks to propagate. #676

Merged
merged 10 commits into from
Sep 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ jobs:
requirements-file: [
dj22_cms37.txt,
dj22_cms38.txt,
dj22_cms40.txt,
dj31_cms38.txt,
dj32_cms39.txt,
dj32_cms310.txt,
Expand All @@ -23,8 +22,9 @@ jobs:
dj41_cms311.txt,
dj41_cms41.txt,
dj42_cms311.txt,
dj42_cms40.txt,
dj42_cms41.txt,
dj50_cms41.txt
dj50_cms41.txt,
]
os: [
ubuntu-20.04,
Expand All @@ -42,26 +42,30 @@ jobs:
requirements-file: dj41_cms41.txt
- python-version: 3.7
requirements-file: dj42_cms311.txt
- python-version: 3.7
requirements-file: dj42_cms40.txt
- python-version: 3.7
requirements-file: dj42_cms41.txt
- python-version: 3.7
requirements-file: dj50_cms41.txt
- python-version: 3.8
requirements-file: dj50_cms41.txt
- python-version: 3.8
requirements-file: dj41_cms41.txt
requirements-file: dj32_cms41.txt
- python-version: 3.8
requirements-file: dj40_cms41.txt
- python-version: 3.8
requirements-file: dj32_cms41.txt
requirements-file: dj41_cms41.txt
- python-version: 3.8
requirements-file: dj42_cms41.txt
- python-version: 3.8
requirements-file: dj42_cms41.txt
- python-version: 3.9
requirements-file: dj50_cms41.txt
- python-version: "3.10"
requirements-file: dj22_cms40.txt
- python-version: "3.11"
requirements-file: dj22_cms40.txt
- python-version: 3.11
requirements-file: dj42_cms40.txt
- python-version: 3.12
requirements-file: dj40_cms40.txt
steps:
- uses: actions/checkout@v1
- name: Set up Python ${{ matrix.python-version }}
Expand Down
9 changes: 8 additions & 1 deletion CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,18 @@
Changelog
=========

5.1.6 (2024-07-18)
==================

* 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
* fix: Let CKEditor decide on size of its panels by @fsbraun in https://github.com/django-cms/djangocms-text-ckeditor/pull/674


5.1.5 (2023-11-30)
==================

* 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>`_
* 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>`_
* 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>`_
* Remove Flash plugin in the default settings by @MacLake in `#656 <https://github.com/django-cms/djangocms-text-ckeditor/pull/656>`_
* fix: Allow for request-free context objects for testing purposes by @fsbraun in `#659 <https://github.com/django-cms/djangocms-text-ckeditor/pull/659>`_
* Update test matrix to include Django 5 by @protoroto in `#662 <https://github.com/django-cms/djangocms-text-ckeditor/pull/662>`_
Expand Down
2 changes: 1 addition & 1 deletion djangocms_text_ckeditor/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@
10. Publish the release when ready
11. Github actions will publish the new package to pypi
"""
__version__ = '5.1.5'
__version__ = '5.1.6'

default_app_config = 'djangocms_text_ckeditor.apps.TextCkeditorConfig'
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,6 @@
// if event is a jQuery event (touchend), than we mutate
// event a bit so we make the payload similar to what ckeditor.event produces
var handleEdit = function (event) {
event.stop();

if (event.type === 'touchend' || event.type === 'click') {
var cmsPluginNode = $(event.currentTarget).closest('cms-plugin')[0];
Expand Down

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion djangocms_text_ckeditor/widgets.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@


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


class TextEditorWidget(forms.Textarea):
Expand Down
Loading
Loading