Skip to content

Commit 6eaece7

Browse files
committed
support better resolveuid
so that outputfilters can produce beautiful html
1 parent 24300c6 commit 6eaece7

File tree

3 files changed

+3
-15
lines changed

3 files changed

+3
-15
lines changed

src/collective/ckeditor/browser/ckeditor5/main.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ const editorConfig = {
181181
licenseKey: LICENSE_KEY,
182182
link: {
183183
// addTargetToExternalLinks: true,
184-
defaultProtocol: 'https://',
184+
defaultProtocol: '',
185185
decorators: {
186186
toggleDownloadable: {
187187
mode: 'manual',

src/collective/ckeditor/browser/ckeditor5/plonelink/plonelinkui.js

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,12 @@ export default class PloneLinkUI extends LinkUI {
77
return 'PloneLinkUI';
88
}
99

10-
init() {
11-
console.log( 'plonelinkui#init() got called' );
12-
super.init();
13-
const editor = this.editor;
14-
editor.config.define( 'filebrowserBrowserUrl', 'none');
15-
}
16-
1710
_createFormView() {
1811
var view = super._createFormView();
1912
view.urlInputView.label = 'Plone Link';
2013
view.children.first.label = 'Plone Link';
2114
view.children.last.children.add(this._createBrowseButton(view), 1);
2215
view.on('plone_set_url', (evt, data) => {
23-
console.log('view plone_set_url URL: ' + data.url);
2416
view.urlInputView.fieldView.value = data.url;
2517
view.fire('submit');
2618
this._showUI();

src/collective/ckeditor/browser/ckeditorfinder.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
from Acquisition import aq_inner
22
from collective.plonefinder.browser.finder import Finder
33
from collective.ckeditor.browser.ckeditorview import get_registry_value
4-
from zope.component import getMultiAdapter
54

65

76
class CKFinder(Finder):
@@ -15,9 +14,6 @@ def __init__(self, context, request):
1514
self.multiselect = False
1615
self.allowupload = True
1716
self.allowaddfolder = True
18-
pstate = getMultiAdapter((self.context, self.request),
19-
name="plone_portal_state")
20-
self.portal_url = pstate.portal_url()
2117

2218
def __call__(self):
2319

@@ -128,10 +124,10 @@ def get_jsaddons(self):
128124
selectCKEditorItem = function (selector, title, image_preview) {
129125
image_preview = (typeof image_preview != "undefined") ? image_preview : false;
130126
if (image_preview) selector = selector + '/@@images/image/preview' ;
131-
window.opener.plone_ckeditors['%s'].fire('plone_set_url', {url: '%s/resolveuid/' + selector} );
127+
window.opener.plone_ckeditors['%s'].fire('plone_set_url', {url: 'resolveuid/' + selector} );
132128
window.close();
133129
};
134130
Browser.selectItem = selectCKEditorItem;
135-
""" % (CKEditorFuncNum, self.portal_url)
131+
""" % CKEditorFuncNum
136132

137133
return jsstring

0 commit comments

Comments
 (0)