Skip to content

Commit

Permalink
renamed 'null-display-text' to 'null-text'
Browse files Browse the repository at this point in the history
  • Loading branch information
maxtoroq committed May 24, 2022
1 parent 2eee632 commit df54dad
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion schemas/xcst.rng
Original file line number Diff line number Diff line change
Expand Up @@ -600,7 +600,7 @@
<ann:documentation>Specifies if this member should not be escaped when displaying in a UI (e.g. HTML content).</ann:documentation>
<ref name="boolean"/>
</attribute>
<attribute name="null-display-text">
<attribute name="null-text">
<ann:documentation>A text that is displayed for this member when the value is null.</ann:documentation>
<ref name="string"/>
</attribute>
Expand Down
2 changes: 1 addition & 1 deletion schemas/xcst.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -557,7 +557,7 @@
<xs:documentation>Specifies if this member should not be escaped when displaying in a UI (e.g. HTML content).</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="null-display-text" type="c:string">
<xs:attribute name="null-text" type="c:string">
<xs:annotation>
<xs:documentation>A text that is displayed for this member when the value is null.</xs:documentation>
</xs:annotation>
Expand Down
6 changes: 3 additions & 3 deletions src/Xcst.Compiler/CodeGeneration/_types.xcst
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@
<with-param name='required' value='new[] { "name" }'/>
<with-param name='optional' value='new[] { "as", "value", "expression", "auto-initialize", "display", "display-name",
"description", "short-name", "edit-hint", "order", "group", "format", "apply-format-in-edit-mode",
"disable-output-escaping", "null-display-text", "template", "data-type", "required", "max-length",
"disable-output-escaping", "null-text", "template", "data-type", "required", "max-length",
"min-length", "pattern", "min", "max", "equal-to" }
.Concat(xcst_type_or_member_attributes)
.Concat(xcst_validation_or_member_attributes)
Expand Down Expand Up @@ -516,7 +516,7 @@
&amp;&amp; p.Name.LocalName is "apply-format-in-edit-mode"
or "disable-output-escaping"
or "format"
or "null-display-text")' mode='src:display-format-argument'/>
or "null-text")' mode='src:display-format-argument'/>
<if test='el.AncestorsAndSelf()
.Where(p => (p.Name == c + "member" || p.Name == c + "type")
&amp;&amp; p.Attribute("allow-empty-string") != null)
Expand Down Expand Up @@ -564,7 +564,7 @@
</code:member-initializer>
</template>

<template match='XAttribute attr &amp;&amp; attr.Name == "null-display-text"' mode='src:display-format-argument'>
<template match='XAttribute attr &amp;&amp; attr.Name == "null-text"' mode='src:display-format-argument'>
<code:member-initializer name='NullDisplayText'>
<code:string verbatim='true'>
<value-of value='attr.Value'/>
Expand Down

0 comments on commit df54dad

Please sign in to comment.