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

Release version 1.1.3 #46

Merged
merged 2 commits into from
Oct 21, 2024
Merged

Release version 1.1.3 #46

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
66932cd
Incorrectly removed `hasDefault` previously (#45)
nlam-atlassian Oct 21, 2024
4370603
Merge branch 'main' into nlam/release-version-1.1.3
nlam-atlassian Oct 21, 2024
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 .github/workflows/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
uses: actions/create-release@v1
id: create_release
with:
release_name: ${{ steps.version.outputs.version }}
release_name: ${{ steps.read-properties.outputs.projectVersion }}
tag_name: ${{ steps.read-properties.outputs.projectVersion }}
body: "Release ${{ steps.read-properties.outputs.projectVersion }}"
env:
Expand Down
205 changes: 0 additions & 205 deletions .github/workflows/publish_ios.yml
View file
Open in desktop

This file was deleted.

122 changes: 61 additions & 61 deletions model/config/ktlint/baseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@
<error line="348" column="49" source="standard:function-signature" />
<error line="348" column="61" source="standard:function-signature" />
<error line="356" column="10" source="standard:enum-wrapping" />
<error line="373" column="51" source="standard:comment-spacing" />
<error line="373" column="46" source="standard:comment-spacing" />
<error line="378" column="1" source="standard:no-blank-line-before-rbrace" />
<error line="443" column="30" source="standard:function-signature" />
<error line="443" column="60" source="standard:function-signature" />
Expand All @@ -475,66 +475,66 @@
<error line="469" column="1" source="standard:no-blank-line-in-list" />
<error line="473" column="1" source="standard:no-blank-line-in-list" />
<error line="477" column="1" source="standard:no-blank-line-in-list" />
<error line="641" column="5" source="standard:spacing-between-declarations-with-comments" />
<error line="697" column="33" source="standard:multiline-expression-wrapping" />
<error line="706" column="28" source="standard:multiline-expression-wrapping" />
<error line="715" column="29" source="standard:multiline-expression-wrapping" />
<error line="740" column="14" source="standard:function-signature" />
<error line="740" column="30" source="standard:function-signature" />
<error line="740" column="52" source="standard:function-signature" />
<error line="740" column="72" source="standard:function-signature" />
<error line="740" column="90" source="standard:function-signature" />
<error line="748" column="14" source="standard:function-signature" />
<error line="748" column="30" source="standard:function-signature" />
<error line="748" column="52" source="standard:function-signature" />
<error line="748" column="68" source="standard:function-signature" />
<error line="748" column="86" source="standard:function-signature" />
<error line="756" column="14" source="standard:function-signature" />
<error line="756" column="30" source="standard:function-signature" />
<error line="756" column="52" source="standard:function-signature" />
<error line="756" column="74" source="standard:function-signature" />
<error line="756" column="92" source="standard:function-signature" />
<error line="764" column="29" source="standard:function-signature" />
<error line="767" column="14" source="standard:function-signature" />
<error line="767" column="28" source="standard:function-signature" />
<error line="767" column="48" source="standard:function-signature" />
<error line="767" column="51" source="standard:function-signature" />
<error line="770" column="14" source="standard:function-signature" />
<error line="770" column="28" source="standard:function-signature" />
<error line="770" column="50" source="standard:function-signature" />
<error line="770" column="70" source="standard:function-signature" />
<error line="770" column="95" source="standard:function-signature" />
<error line="770" column="98" source="standard:function-signature" />
<error line="773" column="14" source="standard:function-signature" />
<error line="773" column="28" source="standard:function-signature" />
<error line="773" column="50" source="standard:function-signature" />
<error line="773" column="66" source="standard:function-signature" />
<error line="773" column="91" source="standard:function-signature" />
<error line="773" column="94" source="standard:function-signature" />
<error line="776" column="14" source="standard:function-signature" />
<error line="776" column="28" source="standard:function-signature" />
<error line="776" column="50" source="standard:function-signature" />
<error line="776" column="72" source="standard:function-signature" />
<error line="776" column="97" source="standard:function-signature" />
<error line="776" column="100" source="standard:function-signature" />
<error line="780" column="14" source="standard:function-signature" />
<error line="780" column="28" source="standard:function-signature" />
<error line="780" column="53" source="standard:function-signature" />
<error line="786" column="14" source="standard:function-signature" />
<error line="786" column="28" source="standard:function-signature" />
<error line="786" column="48" source="standard:function-signature" />
<error line="791" column="14" source="standard:function-signature" />
<error line="791" column="30" source="standard:function-signature" />
<error line="791" column="50" source="standard:function-signature" />
<error line="796" column="22" source="standard:function-signature" />
<error line="796" column="41" source="standard:function-signature" />
<error line="796" column="64" source="standard:function-signature" />
<error line="801" column="22" source="standard:function-signature" />
<error line="801" column="41" source="standard:function-signature" />
<error line="801" column="64" source="standard:function-signature" />
<error line="811" column="17" source="standard:function-signature" />
<error line="811" column="33" source="standard:function-signature" />
<error line="811" column="52" source="standard:function-signature" />
<error line="642" column="5" source="standard:spacing-between-declarations-with-comments" />
<error line="698" column="33" source="standard:multiline-expression-wrapping" />
<error line="707" column="28" source="standard:multiline-expression-wrapping" />
<error line="716" column="29" source="standard:multiline-expression-wrapping" />
<error line="741" column="14" source="standard:function-signature" />
<error line="741" column="30" source="standard:function-signature" />
<error line="741" column="52" source="standard:function-signature" />
<error line="741" column="72" source="standard:function-signature" />
<error line="741" column="90" source="standard:function-signature" />
<error line="749" column="14" source="standard:function-signature" />
<error line="749" column="30" source="standard:function-signature" />
<error line="749" column="52" source="standard:function-signature" />
<error line="749" column="68" source="standard:function-signature" />
<error line="749" column="86" source="standard:function-signature" />
<error line="757" column="14" source="standard:function-signature" />
<error line="757" column="30" source="standard:function-signature" />
<error line="757" column="52" source="standard:function-signature" />
<error line="757" column="74" source="standard:function-signature" />
<error line="757" column="92" source="standard:function-signature" />
<error line="765" column="29" source="standard:function-signature" />
<error line="768" column="14" source="standard:function-signature" />
<error line="768" column="28" source="standard:function-signature" />
<error line="768" column="48" source="standard:function-signature" />
<error line="768" column="51" source="standard:function-signature" />
<error line="771" column="14" source="standard:function-signature" />
<error line="771" column="28" source="standard:function-signature" />
<error line="771" column="50" source="standard:function-signature" />
<error line="771" column="70" source="standard:function-signature" />
<error line="771" column="95" source="standard:function-signature" />
<error line="771" column="98" source="standard:function-signature" />
<error line="774" column="14" source="standard:function-signature" />
<error line="774" column="28" source="standard:function-signature" />
<error line="774" column="50" source="standard:function-signature" />
<error line="774" column="66" source="standard:function-signature" />
<error line="774" column="91" source="standard:function-signature" />
<error line="774" column="94" source="standard:function-signature" />
<error line="777" column="14" source="standard:function-signature" />
<error line="777" column="28" source="standard:function-signature" />
<error line="777" column="50" source="standard:function-signature" />
<error line="777" column="72" source="standard:function-signature" />
<error line="777" column="97" source="standard:function-signature" />
<error line="777" column="100" source="standard:function-signature" />
<error line="781" column="14" source="standard:function-signature" />
<error line="781" column="28" source="standard:function-signature" />
<error line="781" column="53" source="standard:function-signature" />
<error line="787" column="14" source="standard:function-signature" />
<error line="787" column="28" source="standard:function-signature" />
<error line="787" column="48" source="standard:function-signature" />
<error line="792" column="14" source="standard:function-signature" />
<error line="792" column="30" source="standard:function-signature" />
<error line="792" column="50" source="standard:function-signature" />
<error line="797" column="22" source="standard:function-signature" />
<error line="797" column="41" source="standard:function-signature" />
<error line="797" column="64" source="standard:function-signature" />
<error line="802" column="22" source="standard:function-signature" />
<error line="802" column="41" source="standard:function-signature" />
<error line="802" column="64" source="standard:function-signature" />
<error line="812" column="17" source="standard:function-signature" />
<error line="812" column="33" source="standard:function-signature" />
<error line="812" column="52" source="standard:function-signature" />
</file>
<file name="src/commonMain/kotlin/com/atlassian/prosemirror/model/ToDom.kt">
<error line="3" column="1" source="standard:import-ordering" />
Expand Down
3 changes: 2 additions & 1 deletion model/src/commonMain/kotlin/com/atlassian/prosemirror/model/Schema.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ class Attribute(
get() = !this.hasDefault

init {
this.hasDefault = options.default != null //Object.prototype.hasOwnProperty.call(options, "default")
this.hasDefault = options.hasDefault //Object.prototype.hasOwnProperty.call(options, "default")
this.default = options.default

this.validate = options.validateString?.let { validateType(typeName, attrName, it) }
Expand Down Expand Up @@ -638,6 +638,7 @@ interface AttributeSpec {
// that have no default must be provided whenever a node or mark of a type that has them is
// created.
val default: Any?
val hasDefault: Boolean
// A function or type name used to validate values of this
// attribute. This will be used when deserializing the attribute
// from JSON, and when running [`Node.check`](#model.Node.check).
Expand Down
Loading