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

EZP-29301: Added support for custom attributes on elements #35

Merged
merged 11 commits into from
Apr 19, 2019
Merged

EZP-29301: Added support for custom attributes on elements #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
60ef8e0
Custom attributes
SerheyDolgushev Apr 9, 2019
8c54d93
Custom attributes: set table custom attributes before any child eleme…
SerheyDolgushev Apr 10, 2019
be2beb1
Custom attributes: fixing typo attirbute => attribute
SerheyDolgushev Apr 12, 2019
589e537
Custom attributes: enable for table, but not just infotable
SerheyDolgushev Apr 12, 2019
10c38f5
Custom attributes: tests
SerheyDolgushev Apr 12, 2019
140147e
Custom attributes: pre, quote, sub, sup
SerheyDolgushev Apr 17, 2019
d4dbd5d
Custom attributes: tests for pre, quote, sub, sup
SerheyDolgushev Apr 17, 2019
ae4a6e5
Chaning custom attributes definition name to ez.xhtml.data.attribute
SerheyDolgushev Apr 17, 2019
0cfe962
Custom attributes: use ezattribute element instead of ez-custom-attri…
SerheyDolgushev Apr 17, 2019
efd121c
Custom attributes: use data-ezattribute-<attr> instead of data-ez-cus…
SerheyDolgushev Apr 17, 2019
aff5bf9
Custom attributes: use new naming convensions in tests
SerheyDolgushev Apr 17, 2019
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
44 changes: 44 additions & 0 deletions src/lib/eZ/RichText/Resources/schemas/docbook/ezpublish.rng
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -824,4 +824,48 @@
<notAllowed/>
</define>

<define name="ez.xhtml.data.attribute">
<optional>
<element name="ezattribute">
<ref name="ez.config.hash"/>
</element>
</optional>
</define>

<div>
<a:documentation>
Adding child ezattribute element to the selected elements.
</a:documentation>
<define name="db.extension.inlines" combine="choice">
<ref name="ez.xhtml.data.attribute" />
</define>
<define name="db.all.blocks" combine="choice">
<ref name="ez.xhtml.data.attribute" />
</define>
<define name="db.para.info" combine="interleave">
<ref name="ez.xhtml.data.attribute" />
</define>
<define name="db.orderedlist.info" combine="interleave">
<ref name="ez.xhtml.data.attribute" />
</define>
<define name="db.itemizedlist.info" combine="interleave">
<ref name="ez.xhtml.data.attribute" />
</define>
<define name="db.html.informaltable.info" combine="interleave">
<ref name="ez.xhtml.data.attribute" />
</define>
<define name="db.html.table.model" combine="interleave">
<ref name="ez.xhtml.data.attribute" />
</define>
<define name="db.html.tr.attlist" combine="interleave">
<ref name="ez.xhtml.data.attribute" />
</define>
<define name="db.subscript.attlist" combine="interleave">
<ref name="ez.xhtml.data.attribute" />
</define>
<define name="db.superscript.attlist" combine="interleave">
<ref name="ez.xhtml.data.attribute" />
</define>
</div>

</grammar>
30 changes: 30 additions & 0 deletions 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 @@ -10,6 +10,17 @@
<xsl:output indent="yes" encoding="UTF-8"/>
<xsl:variable name="outputNamespace" select="''"/>

<xsl:template name="ezattribute">
<xsl:if test="./docbook:ezattribute">
<xsl:for-each select="./docbook:ezattribute/docbook:ezvalue">
<xsl:attribute name="{concat('data-ezattribute-', @key)}">
<xsl:value-of select="text()"/>
</xsl:attribute>
</xsl:for-each>
</xsl:if>
</xsl:template>
<xsl:template match="docbook:ezattribute" />

<xsl:template match="docbook:section">
<xsl:if test="not(parent::*)">
<xsl:element name="section" namespace="{$outputNamespace}">
Expand Down Expand Up @@ -41,6 +52,7 @@
<xsl:value-of select="concat( 'text-align:', @ezxhtml:textalign, ';' )"/>
</xsl:attribute>
</xsl:if>
<xsl:call-template name="ezattribute"/>
<xsl:apply-templates/>
</xsl:element>
</xsl:template>
Expand All @@ -63,12 +75,14 @@
<xsl:value-of select="@language"/>
</xsl:attribute>
</xsl:if>
<xsl:call-template name="ezattribute"/>
<xsl:value-of select="./text()"/>
</xsl:element>
</xsl:template>

<xsl:template match="docbook:blockquote">
<xsl:element name="blockquote" namespace="{$outputNamespace}">
<xsl:call-template name="ezattribute"/>
<xsl:apply-templates/>
</xsl:element>
</xsl:template>
Expand Down Expand Up @@ -141,23 +155,27 @@
<xsl:value-of select="@ezxhtml:class"/>
</xsl:attribute>
</xsl:if>
<xsl:call-template name="ezattribute"/>
<xsl:apply-templates/>
</xsl:element>
</xsl:when>
<xsl:when test="@role='underlined'">
<xsl:element name="u" namespace="{$outputNamespace}">
<xsl:call-template name="ezattribute"/>
<xsl:apply-templates/>
</xsl:element>
</xsl:when>
<xsl:when test="@role='strikedthrough'">
<xsl:choose>
<xsl:when test="@revisionflag='deleted'">
<xsl:element name="del" namespace="{$outputNamespace}">
<xsl:call-template name="ezattribute"/>
<xsl:apply-templates/>
</xsl:element>
</xsl:when>
<xsl:otherwise>
<xsl:element name="s" namespace="{$outputNamespace}">
<xsl:call-template name="ezattribute"/>
<xsl:apply-templates/>
</xsl:element>
</xsl:otherwise>
Expand All @@ -170,6 +188,7 @@
<xsl:value-of select="@ezxhtml:class"/>
</xsl:attribute>
</xsl:if>
<xsl:call-template name="ezattribute"/>
<xsl:apply-templates/>
</xsl:element>
</xsl:otherwise>
Expand All @@ -178,12 +197,14 @@

<xsl:template match="docbook:subscript">
<xsl:element name="sub" namespace="{$outputNamespace}">
<xsl:call-template name="ezattribute"/>
<xsl:apply-templates/>
</xsl:element>
</xsl:template>

<xsl:template match="docbook:superscript">
<xsl:element name="sup" namespace="{$outputNamespace}">
<xsl:call-template name="ezattribute"/>
<xsl:apply-templates/>
</xsl:element>
</xsl:template>
Expand Down Expand Up @@ -219,6 +240,7 @@
<xsl:value-of select="@ezxhtml:class"/>
</xsl:attribute>
</xsl:if>
<xsl:call-template name="ezattribute"/>
<xsl:apply-templates/>
</xsl:element>
</xsl:template>
Expand Down Expand Up @@ -260,6 +282,7 @@
<xsl:value-of select="concat( 'text-align:', @ezxhtml:textalign, ';' )"/>
</xsl:attribute>
</xsl:if>
<xsl:call-template name="ezattribute"/>
<xsl:apply-templates/>
</xsl:element>
</xsl:template>
Expand All @@ -276,6 +299,7 @@
<xsl:value-of select="@ezxhtml:class"/>
</xsl:attribute>
</xsl:if>
<xsl:call-template name="ezattribute"/>
<xsl:apply-templates/>
</xsl:element>
</xsl:template>
Expand All @@ -292,6 +316,7 @@
<xsl:value-of select="@ezxhtml:class"/>
</xsl:attribute>
</xsl:if>
<xsl:call-template name="ezattribute"/>
<xsl:apply-templates/>
</xsl:element>
</xsl:template>
Expand All @@ -303,6 +328,7 @@
<xsl:value-of select="../@ezxhtml:class"/>
</xsl:attribute>
</xsl:if>
<xsl:call-template name="ezattribute"/>
<xsl:apply-templates/>
</xsl:element>
</xsl:template>
Expand Down Expand Up @@ -367,6 +393,7 @@
<xsl:value-of select="concat( $inlineStyleWidth, $inlineStyleBorder )"/>
</xsl:attribute>
</xsl:if>
<xsl:call-template name="ezattribute"/>
<xsl:if test="local-name(.) = 'table' and ./docbook:caption != ''">
<xsl:element name="caption" namespace="{$outputNamespace}">
<xsl:value-of select="./docbook:caption"/>
Expand Down Expand Up @@ -401,6 +428,7 @@
<xsl:value-of select="@class"/>
</xsl:attribute>
</xsl:if>
<xsl:call-template name="ezattribute"/>
<xsl:apply-templates/>
</xsl:element>
</xsl:template>
Expand Down Expand Up @@ -470,6 +498,7 @@
<xsl:value-of select="concat( $inlineStyleWidth, $inlineStyleValign )"/>
</xsl:attribute>
</xsl:if>
<xsl:call-template name="ezattribute"/>
<xsl:apply-templates/>
</xsl:element>
</xsl:template>
Expand Down Expand Up @@ -529,6 +558,7 @@
<xsl:value-of select="concat( $inlineStyleWidth, $inlineStyleValign )"/>
</xsl:attribute>
</xsl:if>
<xsl:call-template name="ezattribute"/>
<xsl:apply-templates/>
</xsl:element>
</xsl:template>
Expand Down
31 changes: 31 additions & 0 deletions src/lib/eZ/RichText/Resources/stylesheets/docbook/xhtml5/output/core.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,17 @@
<xsl:output indent="yes" encoding="UTF-8"/>
<xsl:variable name="outputNamespace" select="''"/>

<xsl:template name="ezattribute">
<xsl:if test="./docbook:ezattribute">
<xsl:for-each select="./docbook:ezattribute/docbook:ezvalue">
<xsl:attribute name="{concat('data-ezattribute-', @key)}">
<xsl:value-of select="text()"/>
</xsl:attribute>
</xsl:for-each>
</xsl:if>
</xsl:template>
<xsl:template match="docbook:ezattribute" />

<xsl:template match="docbook:section">
<xsl:if test="not(parent::*)">
<xsl:element name="section" namespace="{$outputNamespace}">
Expand All @@ -36,6 +47,7 @@
<xsl:value-of select="@language"/>
</xsl:attribute>
</xsl:if>
<xsl:call-template name="ezattribute"/>
<xsl:value-of select="./text()"/>
</xsl:element>
</xsl:template>
Expand Down Expand Up @@ -63,12 +75,14 @@
<xsl:value-of select="concat( 'text-align:', @ezxhtml:textalign, ';' )"/>
</xsl:attribute>
</xsl:if>
<xsl:call-template name="ezattribute"/>
<xsl:apply-templates/>
</xsl:element>
</xsl:template>

<xsl:template match="docbook:blockquote">
<xsl:element name="blockquote" namespace="{$outputNamespace}">
<xsl:call-template name="ezattribute"/>
<xsl:apply-templates/>
</xsl:element>
</xsl:template>
Expand Down Expand Up @@ -141,23 +155,27 @@
<xsl:value-of select="@ezxhtml:class"/>
</xsl:attribute>
</xsl:if>
<xsl:call-template name="ezattribute"/>
<xsl:apply-templates/>
</xsl:element>
</xsl:when>
<xsl:when test="@role='underlined'">
<xsl:element name="u" namespace="{$outputNamespace}">
<xsl:call-template name="ezattribute"/>
<xsl:apply-templates/>
</xsl:element>
</xsl:when>
<xsl:when test="@role='strikedthrough'">
<xsl:choose>
<xsl:when test="@revisionflag='deleted'">
<xsl:element name="del" namespace="{$outputNamespace}">
<xsl:call-template name="ezattribute"/>
<xsl:apply-templates/>
</xsl:element>
</xsl:when>
<xsl:otherwise>
<xsl:element name="s" namespace="{$outputNamespace}">
<xsl:call-template name="ezattribute"/>
<xsl:apply-templates/>
</xsl:element>
</xsl:otherwise>
Expand All @@ -170,6 +188,7 @@
<xsl:value-of select="@ezxhtml:class"/>
</xsl:attribute>
</xsl:if>
<xsl:call-template name="ezattribute"/>
<xsl:apply-templates/>
</xsl:element>
</xsl:otherwise>
Expand All @@ -178,12 +197,14 @@

<xsl:template match="docbook:subscript">
<xsl:element name="sub" namespace="{$outputNamespace}">
<xsl:call-template name="ezattribute"/>
<xsl:apply-templates/>
</xsl:element>
</xsl:template>

<xsl:template match="docbook:superscript">
<xsl:element name="sup" namespace="{$outputNamespace}">
<xsl:call-template name="ezattribute"/>
<xsl:apply-templates/>
</xsl:element>
</xsl:template>
Expand Down Expand Up @@ -221,10 +242,12 @@
<xsl:value-of select="@ezxhtml:class"/>
</xsl:attribute>
</xsl:if>
<xsl:call-template name="ezattribute"/>
<xsl:apply-templates/>
</xsl:element>
</xsl:when>
<xsl:otherwise>
<xsl:call-template name="ezattribute"/>
<xsl:apply-templates/>
</xsl:otherwise>
</xsl:choose>
Expand Down Expand Up @@ -267,6 +290,7 @@
<xsl:value-of select="concat( 'text-align:', @ezxhtml:textalign, ';' )"/>
</xsl:attribute>
</xsl:if>
<xsl:call-template name="ezattribute"/>
<xsl:apply-templates/>
</xsl:element>
</xsl:template>
Expand All @@ -283,6 +307,7 @@
<xsl:value-of select="@ezxhtml:class"/>
</xsl:attribute>
</xsl:if>
<xsl:call-template name="ezattribute"/>
<xsl:apply-templates/>
</xsl:element>
</xsl:template>
Expand All @@ -299,6 +324,7 @@
<xsl:value-of select="@ezxhtml:class"/>
</xsl:attribute>
</xsl:if>
<xsl:call-template name="ezattribute"/>
<xsl:apply-templates/>
</xsl:element>
</xsl:template>
Expand All @@ -310,6 +336,7 @@
<xsl:value-of select="../@ezxhtml:class"/>
</xsl:attribute>
</xsl:if>
<xsl:call-template name="ezattribute" select="parent"/>
<xsl:apply-templates/>
</xsl:element>
</xsl:template>
Expand Down Expand Up @@ -374,6 +401,7 @@
<xsl:value-of select="concat( $inlineStyleWidth, $inlineStyleBorder )"/>
</xsl:attribute>
</xsl:if>
<xsl:call-template name="ezattribute"/>
<xsl:if test="local-name(.) = 'table' and ./docbook:caption != ''">
<xsl:element name="caption" namespace="{$outputNamespace}">
<xsl:value-of select="./docbook:caption"/>
Expand Down Expand Up @@ -408,6 +436,7 @@
<xsl:value-of select="@class"/>
</xsl:attribute>
</xsl:if>
<xsl:call-template name="ezattribute"/>
<xsl:apply-templates/>
</xsl:element>
</xsl:template>
Expand Down Expand Up @@ -477,6 +506,7 @@
<xsl:value-of select="concat( $inlineStyleWidth, $inlineStyleValign )"/>
</xsl:attribute>
</xsl:if>
<xsl:call-template name="ezattribute"/>
<xsl:apply-templates/>
</xsl:element>
</xsl:template>
Expand Down Expand Up @@ -536,6 +566,7 @@
<xsl:value-of select="concat( $inlineStyleWidth, $inlineStyleValign )"/>
</xsl:attribute>
</xsl:if>
<xsl:call-template name="ezattribute"/>
<xsl:apply-templates/>
</xsl:element>
</xsl:template>
Expand Down
Loading