Arthur Bogaart pushed to branch master at cms-community /
hippo-addon-channel-manager
Commits:
62678323 by Arthur Bogaart at 2017-06-06T10:19:46+02:00
CHANNELMGR-1308 Fix for moved constant
- - - - -
53379ddc by Arthur Bogaart at 2017-06-08T13:00:09+02:00
CHANNELMGR-1308 Reintegrate bugfix/CHANNELMGR-1308
- - - - -
1 changed file:
-
content-service/src/main/java/org/onehippo/cms/channelmanager/content/documenttype/field/type/RichTextFieldType.java
Changes:
=====================================
content-service/src/main/java/org/onehippo/cms/channelmanager/content/documenttype/field/type/RichTextFieldType.java
=====================================
---
a/content-service/src/main/java/org/onehippo/cms/channelmanager/content/documenttype/field/type/RichTextFieldType.java
+++
b/content-service/src/main/java/org/onehippo/cms/channelmanager/content/documenttype/field/type/RichTextFieldType.java
@@ -25,9 +25,6 @@ import javax.jcr.Node;
import javax.jcr.NodeIterator;
import javax.jcr.RepositoryException;
-import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-
import org.apache.commons.lang.StringUtils;
import org.hippoecm.repository.HippoStdNodeType;
import org.hippoecm.repository.util.JcrUtils;
@@ -43,12 +40,16 @@ import org.onehippo.cms7.services.htmlprocessor.Tag;
import org.onehippo.cms7.services.htmlprocessor.TagVisitor;
import org.onehippo.cms7.services.htmlprocessor.model.HtmlProcessorModel;
import org.onehippo.cms7.services.htmlprocessor.model.Model;
+import
org.onehippo.cms7.services.htmlprocessor.richtext.image.RichTextImageTagProcessor;
import org.onehippo.cms7.services.htmlprocessor.richtext.jcr.JcrNodeFactory;
import
org.onehippo.cms7.services.htmlprocessor.richtext.model.RichTextProcessorModel;
-import org.onehippo.cms7.services.htmlprocessor.richtext.visit.ImageVisitor;
+import org.onehippo.cms7.services.htmlprocessor.visit.FacetTagProcessor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
/**
* A document field of type hippostd:html.
*
@@ -263,11 +264,11 @@ public class RichTextFieldType extends
FormattedTextFieldType implements NodeFie
@Override
public void onRead(final Tag parent, final Tag tag) throws
RepositoryException {
if (tag != null
- && StringUtils.equalsIgnoreCase(ImageVisitor.TAG_IMG,
tag.getName())
- && tag.hasAttribute(ImageVisitor.ATTRIBUTE_SRC)
- && tag.hasAttribute(ImageVisitor.ATTRIBUTE_DATA_UUID)) {
- final String src =
tag.getAttribute(ImageVisitor.ATTRIBUTE_SRC);
- tag.addAttribute(ImageVisitor.ATTRIBUTE_SRC, pathPrefix + src);
+ &&
StringUtils.equalsIgnoreCase(RichTextImageTagProcessor.TAG_IMG, tag.getName())
+ &&
tag.hasAttribute(RichTextImageTagProcessor.ATTRIBUTE_SRC)
+ &&
tag.hasAttribute(FacetTagProcessor.ATTRIBUTE_DATA_UUID)) {
+ final String src =
tag.getAttribute(RichTextImageTagProcessor.ATTRIBUTE_SRC);
+ tag.addAttribute(RichTextImageTagProcessor.ATTRIBUTE_SRC,
pathPrefix + src);
}
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/759deba0502f841a856df0cbaba02529da33bbd5...53379ddc98c58b775603fd634318f3d2e9163275
_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
