").parent();n(r.find('div[data-cke-real-element-type="div"]'),"cms-plugin"),l=r.html()}i.data.dataValue=l},null,null,4),i.on("toHtml",function(){i.widgets&&i.widgets.registered&&i.widgets.registered.cmswidget&&(i.widgets.registered.cmswidget.inline=!0)},null,null,1)}})}(CMS.$);
+!function(e){function t(e){var t=(e.match(/<\s*([^>\s]+)[\s\S]*?>/)||[0,!1]).splice(1),n=t.some(function(e){return e&&CKEDITOR.dtd.$block[e]}),i="span";return n&&(i="div"),i}function n(t,n){t.each(function(t,i){var l,a=e(i);l=e("<"+n+">"),e.each(i.attributes,function(e,t){l.attr(t.nodeName,t.nodeValue)}),l.html(a.html()),a.replaceWith(l)})}CKEDITOR&&CKEDITOR.plugins&&CKEDITOR.plugins.registered&&CKEDITOR.plugins.registered.cmsplugins||CKEDITOR.plugins.add("cmsplugins",{icons:"cmsplugins",init:function(t){var n=this;CKEDITOR.on("instanceReady",function(){var e=[];for(var i in t.widgets.instances)t.widgets.instances.hasOwnProperty(i)&&e.push(t.widgets.instances[i]);n.numberOfChildren=CKEDITOR.tools.array.filter(e,function(e){return"cms-widget"===e.name}).length}),this.unsaved_child_plugins=[];var i=CMS.CKEditor.editors[t.id].settings;if(this.setupCancelCleanupCallback(i),void 0===i||void 0===i.plugins)return!1;this.setupDialog(t),t.ui.add("cmsplugins",CKEDITOR.UI_PANELBUTTON,{toolbar:"cms,0",label:i.lang.toolbar,title:i.lang.toolbar,className:"cke_panelbutton__cmsplugins",modes:{wysiwyg:1},editorFocus:0,panel:{css:[CKEDITOR.skin.getPath("editor")].concat(t.config.contentsCss),attributes:{role:"cmsplugins","aria-label":i.lang.aria}},onBlock:function(i,l){l.element.setHtml(t.plugins.cmsplugins.setupDropdown(t)),e(l.element.$).find(".cke_panel_listItem a").bind("click",function(l){l.preventDefault(),n.addPlugin(e(this),i,t)})}}),t.contextMenu&&this.setupContextMenu(t),t.addCommand("cmspluginsEdit",{exec:function(){var e=n.getElementFromSelection(t),i=n.getPluginWidget(e);i&&n.editPlugin(i,t)}});var l=function(n){if(n.stop(),"touchend"===n.type||"click"===n.type){var i,l=e(n.currentTarget).closest("cms-plugin")[0];i=new CKEDITOR.dom.element(l).getParent(),n.data=n.data||{},t.getSelection().fake(i)}t.execCommand("cmspluginsEdit")};t.on("doubleclick",l),t.on("instanceReady",function(){}),this.setupDataProcessor(t)},getElementFromSelection:function(e){var t=e.getSelection();return t.getSelectedElement()||t.getCommonAncestor().getAscendant("cms-plugin",!0)},getPluginWidget:function(e){return e?e.getAscendant("cms-plugin",!0)||e.findOne("cms-plugin"):null},setupDialog:function(t){var n=this,i=function(){return{title:"",minWidth:200,minHeight:200,contents:[{elements:[{type:"html",html:'
'}]}],onOk:function(i){var l=e(CKEDITOR.dialog.getCurrent().parts.contents.$).find("iframe").contents(),a=l[0].URL;l.find("form").submit();var s=CMS.API.Helpers.onPluginSave;return CMS.API.Helpers.onPluginSave=function(){CKEDITOR.dialog.getCurrent().hide();var e=CMS.API.Helpers.dataBridge,l=!1;return a.match(/add-plugin/)&&(l=!0),!t.config.settings.delete_on_cancel&&l&&n.unsaved_child_plugins.push(e.plugin_id),n.insertPlugin(e,i.sender._.editor),n.numberOfChildren+=1,CMS.API.Helpers.onPluginSave=s,!1},!1}}};CKEDITOR.dialog.add("cmspluginsDialog",i)},setupDropdown:function(t){var n='
';return e.each(t.config.settings.plugins,function(t,i){n+='
'+i.group+"
",n+='
"}),n+="
"},setupContextMenu:function(e){var t=this;e.addMenuGroup("cmspluginsGroup"),e.addMenuItem("cmspluginsItem",{label:e.config.settings.lang.edit,icon:e.config.settings.static_url+"/ckeditor_plugins/cmsplugins/icons/cmsplugins.svg",command:"cmspluginsEdit",group:"cmspluginsGroup"}),e.removeMenuItem("image"),e.contextMenu.addListener(function(e){if(t.getPluginWidget(e))return{cmspluginsItem:CKEDITOR.TRISTATE_OFF}})},editPlugin:function(t,n){var i=t.getAttribute("id"),l=CMS.CKEditor.editors[n.id].settings;n.openDialog("cmspluginsDialog");var a=CMS.$(window),s=CKEDITOR.dialog.getCurrent();s.resize(.8*a.width(),.6*a.height()),e(s.getElement().$).addClass("cms-ckeditor-dialog"),e(s.parts.title.$).text(l.lang.edit);var r=l.url||window.location.href,d=encodeURIComponent(window.parent.location.pathname+window.parent.location.search),o=r.replace(/(add-plugin|edit-plugin).*$/,"edit-plugin/"+i+"/?_popup=1&no_preview&cms_history=0&cms_path="+d);e(s.parts.contents.$).find("iframe").attr("src",o).bind("load",function(){var t=e(this).contents();t.find("body").addClass("ckeditor-popup"),t.find(".submit-row").hide(),t.find("#container").css({"min-width":0,padding:0})})},addPlugin:function(e,t,n){var i=CMS.CKEditor.editors[n.id].settings;t.hide(),n.focus(),n.fire("saveSnapshot");var l={placeholder_id:i.placeholder_id,plugin_type:e.attr("rel"),plugin_parent:i.plugin_id,plugin_language:i.plugin_language,plugin_position:i.plugin_position+1+this.numberOfChildren,cms_path:window.parent.location.pathname,cms_history:0};this.addPluginDialog(e,l,n)},addPluginDialog:function(t,n,i){var l=e(window),a=CMS.CKEditor.editors[i.id].settings,s=i.getSelection().getSelectedText();i.openDialog("cmspluginsDialog");var r=CKEDITOR.dialog.getCurrent();r.resize(.8*l.width(),.6*l.height()),e(r.getElement().$).addClass("cms-ckeditor-dialog"),e(r.parts.title.$).text(a.lang.add),e(r.parts.contents.$).find("iframe").attr("src",a.add_plugin_url+"?"+e.param(n)).on("load.addplugin",function(){var t=e(this),n=t.contents();n.find(".submit-row").hide().end().find("#container").css("min-width",0).css("padding",0);var i=n.find(".js-ckeditor-use-selected-text");i.length||(i=n.find("#id_name")),i.val()&&i.val().trim()||i.val(s),t.off("load.addplugin")})},insertPlugin:function(t,n){var i=CMS.CKEditor.editors[n.id].settings;e.ajax({method:"GET",url:i.render_plugin_url,data:{token:i.action_token,plugin:t.plugin_id}}).done(function(e,t,i){CMS.CKEditor.editors[n.id].changed=!0,CMS.CKEditor.editors[n.id].child_changed=!0,200===i.status?n.insertHtml(e,"unfiltered_html"):204===i.status&&n.insertHtml(n.getSelectedHtml().$.textContent),n.fire("updateSnapshot")})},setupCancelCleanupCallback:function(t){if(window.parent&&window.parent.CMS&&window.parent.CMS.API&&window.parent.CMS.API.Helpers){var n=this,i=window.parent.CMS,l=function(l,a){if((t.delete_on_cancel||n.unsaved_child_plugins.length)&&n.unsaved_child_plugins.length){l.preventDefault(),i.API.Toolbar.showLoader();var s={token:t.action_token};t.delete_on_cancel||(s.child_plugins=n.unsaved_child_plugins),e.ajax({method:"POST",url:t.cancel_plugin_url,data:s,traditional:!0}).done(function(){i.API.Helpers.removeEventListener("modal-close.text-plugin.text-plugin-"+t.plugin_id),a.instance.close()}).fail(function(e){i.API.Messages.open({message:e.responseText+" | "+e.status+" "+e.statusText,delay:0,error:!0})})}};i.API.Helpers.addEventListener("modal-close.text-plugin.text-plugin-"+t.plugin_id,l)}},setupDataProcessor:function(i){function l(e){return e.attributes&&"div"===e.attributes["data-cke-real-element-type"]}CKEDITOR.htmlParser.element=CKEDITOR.tools.override(CKEDITOR.htmlParser.element,function(e){return function(t,n){e.call(this,t,n),"cms-plugin"===t&&"span"===n["data-cke-real-element-type"]&&(this._.isBlockLike=!1)}}),i.dataProcessor.dataFilter.addRules({elements:{span:function(t){if(CKEDITOR.plugins.widget.isParserWidgetWrapper(t)){var n=t.getFirst();if(l(n)){var a=new CKEDITOR.htmlParser.element("div",e.extend({},t.attributes));return i.widgets.registered.cmswidget.inline=!1,a.children=t.children,a.removeClass("cke_widget_inline"),a.removeClass("cke_widget_force_block"),a.addClass("cke_widget_block"),n.attributes["data-cke-real-element-type"]="div",a}i.widgets.registered.cmswidget.inline=!0,n.attributes["data-cke-real-element-type"]="span"}return t}}},{priority:1,applyToAll:!0}),i.on("toHtml",function(i){var l=i.data.dataValue.replace(/
([\s\S]*?)<\/cms-plugin>/gi,function(e,n,i){var l=t(i);return n.match(/render-plugin=["']?false/gi)?'<"+l+' class="cms-ckeditor-plugin-label">'+n.replace(/[\s\S]*alt=["']([\s\S]*?)['"][\s\S]*/,"$1")+"":'"+i+""});if(l.match(/]*(?=data-cke-real-element-type=\"div)/)){var a=/]*(?=data-cke-real-element-type=\"div)[\s\S]*?>[\s\S]*?<\/)cms-plugin>/g,s=l.replace(a,""),r=e(s).wrapAll("").parent();n(r.find('div[data-cke-real-element-type="div"]'),"cms-plugin"),l=r.html()}i.data.dataValue=l},null,null,4),i.on("toHtml",function(){i.widgets&&i.widgets.registered&&i.widgets.registered.cmswidget&&(i.widgets.registered.cmswidget.inline=!0)},null,null,1)}})}(CMS.$);
});
})(CMS.$);
diff --git a/djangocms_text_ckeditor/widgets.py b/djangocms_text_ckeditor/widgets.py
index 1614510b7..0092b2802 100644
--- a/djangocms_text_ckeditor/widgets.py
+++ b/djangocms_text_ckeditor/widgets.py
@@ -17,7 +17,7 @@
# this path is changed automatically whenever you run `gulp bundle`
-PATH_TO_JS = 'djangocms_text_ckeditor/js/dist/bundle-13948e6025.cms.ckeditor.min.js'
+PATH_TO_JS = 'djangocms_text_ckeditor/js/dist/bundle-9f0bbac8ec.cms.ckeditor.min.js'
class TextEditorWidget(forms.Textarea):
diff --git a/tests/test_plugin.py b/tests/test_plugin.py
index 75723d54d..cc89d3583 100644
--- a/tests/test_plugin.py
+++ b/tests/test_plugin.py
@@ -747,8 +747,8 @@ def test_render_child_plugin_token_validation(self):
endpoint += f'?token={action_token}&plugin={child_plugin.pk}'
response = self.client.get(endpoint)
- self.assertEqual(response.status_code, 400)
- self.assertEqual(force_str(response.content), 'Unable to process your request.')
+ self.assertEqual(response.status_code, 204)
+ self.assertEqual(force_str(response.content), '')
def test_custom_ckeditor_body_css_classes(self):
simple_page = self.create_page('test page', template='page.html', language='en')