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.

Sign up for GitHub

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

Jump to bottom

EZP-31321: Replaced zero-width space with oe-upcast-placeholder #88

Merged
merged 2 commits into from
Jan 22, 2020
Merged

EZP-31321: Replaced zero-width space with oe-upcast-placeholder #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab34cdb
Dont use zero width sapce for EZP-29882
SerheyDolgushev Dec 2, 2019
980505c
Renamed ao-upcast-placeholder to oe-upcast-placeholder
alongosz Jan 21, 2020
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
2 changes: 1 addition & 1 deletion src/lib/eZ/RichText/Resources/stylesheets/docbook/xhtml5/edit/core.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,7 @@
<xsl:call-template name="ezattribute"/>
<xsl:apply-templates/>
<xsl:if test="./docbook:ezattribute or not(node())">
<xsl:text> </xsl:text>
<xsl:text>oe-upcast-placeholder</xsl:text>
</xsl:if>
</xsl:element>
</xsl:template>
Expand Down
4 changes: 2 additions & 2 deletions tests/lib/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/edit/023-embedInline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<section xmlns="http://ez.no/namespaces/ezpublish5/xhtml5/edit">
<p>Some <span data-ezelement="ezembedinline" id="id3" data-href="ezcontent://601" data-ezview="embed-inline-custom" class="embedClass" data-ezalign="left"> </span> for the otherwise unremarkable paragraph.</p>
<p>Some <span data-ezelement="ezembedinline" id="id3" data-href="ezcontent://601" data-ezview="embed-inline-custom" class="embedClass" data-ezalign="left">oe-upcast-placeholder</span> for the otherwise unremarkable paragraph.</p>
<p>This paragraph is just showing off its <span data-ezelement="ezembedinline" id="id5" data-href="ezcontent://501" data-ezview="embed-inline" class="embedClass2" data-ezalign="right">
<span data-ezelement="ezconfig">
<span data-ezelement="ezvalue" data-ezvalue-key="size">medium</span>
</span>
</span> content.</p>
<p>Some<span data-ezattribute-name-1="value 1" data-ezattribute-name-2="value 2" data-ezelement="ezembedinline" id="id4" data-href="ezcontent://601"> </span> content.</p>
<p>Some<span data-ezattribute-name-1="value 1" data-ezattribute-name-2="value 2" data-ezelement="ezembedinline" id="id4" data-href="ezcontent://601">oe-upcast-placeholder</span> content.</p>
</section>
2 changes: 1 addition & 1 deletion ...b/eZ/RichText/Converter/Xslt/_fixtures/xhtml5/edit/035-itemizedListWithNestedElements.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<section xmlns="http://ez.no/namespaces/ezpublish5/xhtml5/edit">
<ul>
<li>This is a list item <span data-ezelement="ezembedinline" data-href="ezcontent://52" data-ezview="embed-inline"> </span></li>
<li>This is a list item <span data-ezelement="ezembedinline" data-href="ezcontent://52" data-ezview="embed-inline">oe-upcast-placeholder</span></li>
</ul>
</section>