LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Nachziehen der Änderungen zu CKEditor in core r4769 

git-svn-id: https://svn.libreccm.org/ccm/trunk@4771 8810af33-2d31-482b-a856-94f89814c4df
master
pb 2017-06-12 07:25:26 +00:00
parent aff32a12a9
commit 5edc6dd125
7 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ccm-cms-types-glossaryitem/src/com/arsdigita/cms/contenttypes/GlossaryItemConfig.java
View File

@ -29,7 +29,7 @@ import com.arsdigita.util.parameter.StringParameter;
*/ */
public class GlossaryItemConfig extends AbstractConfig { public class GlossaryItemConfig extends AbstractConfig {
private final EnumerationParameter definitionEditorType; private final EnumerationParameter definitionEditorType;
private final Parameter fckEditorConfig; private final Parameter ckEditorConfig;
/** /**
* Enum of the types of editor that can be used. * Enum of the types of editor that can be used.
@ -49,13 +49,13 @@ public class GlossaryItemConfig extends AbstractConfig {
definitionEditorType.put(EDITOR_TYPE.TEXT.name().toLowerCase(), definitionEditorType.put(EDITOR_TYPE.TEXT.name().toLowerCase(),
EDITOR_TYPE.TEXT); EDITOR_TYPE.TEXT);
fckEditorConfig = new StringParameter( ckEditorConfig = new StringParameter(
"com.arsdigita.cms.contenttypes.glossaryitem.fck_editor_config", "com.arsdigita.cms.contenttypes.glossaryitem.fck_editor_config",
Parameter.REQUIRED, Parameter.REQUIRED,
"/assets/fckeditor/config/fckconfig_glossaryitem.js"); "/assets/ckeditor/config/fckconfig_glossaryitem.js");
register(definitionEditorType); register(definitionEditorType);
register(fckEditorConfig); register(ckEditorConfig);
loadInfo(); loadInfo();
} }
@ -65,6 +65,6 @@ public class GlossaryItemConfig extends AbstractConfig {
} }
public final String getFckEditorConfig() { public final String getFckEditorConfig() {
return (String) get(fckEditorConfig); return (String) get(ckEditorConfig);
} }
} }

8
ccm-cms-types-glossaryitem/src/com/arsdigita/cms/contenttypes/GlossaryItemConfig_parameter.properties
View File

@ -3,7 +3,7 @@ com.arsdigita.cms.contenttypes.glossaryitem.definition.editor.purpose=Choose the
com.arsdigita.cms.contenttypes.glossaryitem.definition.editor.example=text com.arsdigita.cms.contenttypes.glossaryitem.definition.editor.example=text
com.arsdigita.cms.contenttypes.glossaryitem.definition.editor.format=[text|wysiwyg] com.arsdigita.cms.contenttypes.glossaryitem.definition.editor.format=[text|wysiwyg]
com.arsdigita.cms.contenttypes.glossaryitem.fck_editor_config.title=FCK Editor Config com.arsdigita.cms.contenttypes.glossaryitem.ck_editor_config.title=CK Editor Config
com.arsdigita.cms.contenttypes.glossaryitem.fck_editor_config.purpose=Configuration JS for the FCK Editor com.arsdigita.cms.contenttypes.glossaryitem.ck_editor_config.purpose=Configuration JS for the FCK Editor
com.arsdigita.cms.contenttypes.glossaryitem.fck_editor_config.example=/assets/fckeditor/config/fckconfig_glossaryitem.js com.arsdigita.cms.contenttypes.glossaryitem.ck_editor_config.example=/assets/ckeditor/config/ckconfig_glossaryitem.js
com.arsdigita.cms.contenttypes.glossaryitem.fck_editor_config.format=[string] com.arsdigita.cms.contenttypes.glossaryitem.ck_editor_config.format=[string]

2
ccm-cms-types-glossaryitem/src/com/arsdigita/cms/contenttypes/ui/GlossaryItemPropertyForm.java
View File

@ -95,7 +95,7 @@ public class GlossaryItemPropertyForm extends BasicPageForm
definition = new CMSDHTMLEditor(DEFINITION); definition = new CMSDHTMLEditor(DEFINITION);
((CMSDHTMLEditor) definition).setWrap(DHTMLEditor.SOFT); ((CMSDHTMLEditor) definition).setWrap(DHTMLEditor.SOFT);
if (Bebop.getConfig().getDHTMLEditor() if (Bebop.getConfig().getDHTMLEditor()
.equals(BebopConstants.BEBOP_FCKEDITOR)) .equals(BebopConstants.BEBOP_CKEDITOR))
{ {
((CMSDHTMLEditor) definition).setConfig( ((CMSDHTMLEditor) definition).setConfig(
new DHTMLEditor.Config("glossaryitem", new DHTMLEditor.Config("glossaryitem",

2
ccm-cms-types-glossaryitem/src/com/arsdigita/cms/contenttypes/ui/GlossaryItemWidgetBuilder.java
View File

@ -47,7 +47,7 @@ public class GlossaryItemWidgetBuilder {
definition = new CMSDHTMLEditor(DEFINITION); definition = new CMSDHTMLEditor(DEFINITION);
((CMSDHTMLEditor) definition).setWrap(DHTMLEditor.SOFT); ((CMSDHTMLEditor) definition).setWrap(DHTMLEditor.SOFT);
if (Bebop.getConfig().getDHTMLEditor() if (Bebop.getConfig().getDHTMLEditor()
.equals(BebopConstants.BEBOP_FCKEDITOR)) .equals(BebopConstants.BEBOP_CKEDITOR))
{ {
((CMSDHTMLEditor) definition).setConfig( ((CMSDHTMLEditor) definition).setConfig(
new DHTMLEditor.Config("glossaryitem", new DHTMLEditor.Config("glossaryitem",

12
ccm-cms-types-newsitem/src/com/arsdigita/cms/contenttypes/ui/NewsItemPropertyForm.java
View File

@ -43,12 +43,12 @@ import java.util.GregorianCalendar;
* Form to edit the basic properties of a <code>news item</code>. These are * Form to edit the basic properties of a <code>news item</code>. These are
* name, title, item date and reference code. * name, title, item date and reference code.
* Used by <code>NewsItemPropertiesStep</code> authoring kit step. * Used by <code>NewsItemPropertiesStep</code> authoring kit step.
* <br />
* *
* This form can be extended to create forms for NewsItem subclasses. * This form can be extended to create forms for NewsItem subclasses.
**/ **/
public class NewsItemPropertyForm extends BasicPageForm public class NewsItemPropertyForm
implements FormProcessListener, FormInitListener, FormSubmissionListener { extends BasicPageForm
implements FormProcessListener, FormInitListener, FormSubmissionListener {
private NewsItemPropertiesStep m_step; private NewsItemPropertiesStep m_step;
/** lead parameter name */ /** lead parameter name */
@ -86,17 +86,17 @@ public class NewsItemPropertyForm extends BasicPageForm
addSubmissionListener(this); addSubmissionListener(this);
} }
/** /**
* Adds widgets to the form. * Adds widgets to the form.
*/ */
@Override @Override
protected void addWidgets() { protected void addWidgets() {
super.addWidgets(); super.addWidgets();
// summary (lead) // summary (lead)
// add(new Label(NewsItemGlobalizationUtil // add(new Label(NewsItemGlobalizationUtil
// .globalize("cms.contenttypes.ui.newsitem.lead"))); // .globalize("cms.contenttypes.ui.newsitem.lead")));
ParameterModel leadParam = new StringParameter(LEAD); ParameterModel leadParam = new StringParameter(LEAD);
//leadParam //leadParam
// .addParameterListener(new NotNullValidationListener()); // .addParameterListener(new NotNullValidationListener());

2
ccm-cms/src/com/arsdigita/cms/ui/ItemSearchFolderBrowser.java
View File

@ -392,7 +392,7 @@ public class ItemSearchFolderBrowser extends Table {
} }
// set protocol to 'other' in FCKEditor, else relative url prepended by http:// // set protocol to 'other' in FCKEditor, else relative url prepended by http://
if (Bebop.getConfig().getDHTMLEditor().equals( if (Bebop.getConfig().getDHTMLEditor().equals(
BebopConstants.BEBOP_FCKEDITOR)) { BebopConstants.BEBOP_CKEDITOR)) {
buffer.append( buffer.append(
" if(window.opener.document.getElementById('cmbLinkProtocol')) {\n"); " if(window.opener.document.getElementById('cmbLinkProtocol')) {\n");
buffer.append( buffer.append(

2
ccm-forum/src/com/arsdigita/forum/ui/PostTextStep.java
View File

@ -97,7 +97,7 @@ public abstract class PostTextStep extends FormStep implements Constants {
if (Bebop if (Bebop
.getConfig() .getConfig()
.getDHTMLEditor() .getDHTMLEditor()
.equals(BebopConstants.BEBOP_FCKEDITOR)) { .equals(BebopConstants.BEBOP_CKEDITOR)) {
((DHTMLEditor) m_body).setConfig( ((DHTMLEditor) m_body).setConfig(
new DHTMLEditor.Config("forum", FCK_FORUM_CONFIG)); new DHTMLEditor.Config("forum", FCK_FORUM_CONFIG));