-
Notifications
You must be signed in to change notification settings - Fork 559
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Columns are optional in ColumnSet, we had made then required.
Addresses issue #1998
- Loading branch information
Gilles Khouzam
committed
Oct 8, 2018
1 parent
6e6ea1a
commit b83788d
Showing
18 changed files
with
39 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
{ | ||
"$schema": "http://adaptivecards.io/schemas/adaptive-card.json", | ||
"type": "AdaptiveCard", | ||
"version": "1.0", | ||
"body": [ | ||
{ | ||
"type": "TextBlock", | ||
"text": "This empty columnset should not prevent the card from rendering" | ||
}, | ||
{ | ||
"type": "ColumnSet", | ||
"columns": [] | ||
} | ||
] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 changes: 15 additions & 0 deletions
15
source/uwp/AdaptiveCardTestApp/Expected/SourceCards/Tests.ColumnSet.Empty.461f2d5.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
{ | ||
"$schema": "http://adaptivecards.io/schemas/adaptive-card.json", | ||
"type": "AdaptiveCard", | ||
"version": "1.0", | ||
"body": [ | ||
{ | ||
"type": "TextBlock", | ||
"text": "This empty columnset should not prevent the card from rendering" | ||
}, | ||
{ | ||
"type": "ColumnSet", | ||
"columns": [] | ||
} | ||
] | ||
} |
1 change: 1 addition & 0 deletions
1
source/uwp/AdaptiveCardTestApp/Expected/Tests.ColumnSet.EmptyToJson.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
{"actions":[],"body":[{"text":"This empty columnset should not prevent the card from rendering","type":"TextBlock"},{"columns":[],"type":"ColumnSet"}],"type":"AdaptiveCard","version":"1.0"} |
1 change: 1 addition & 0 deletions
1
source/uwp/AdaptiveCardTestApp/Expected/v1.0.microsoft-teams.Tests.ColumnSet.Empty.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
{"HostConfigHash":"febd141","CardHash":"461f2d5","Error":null} |
Binary file added
BIN
+2.19 KB
...uwp/AdaptiveCardTestApp/Expected/v1.0.microsoft-teams.Tests.ColumnSet.Empty.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions
1
source/uwp/AdaptiveCardTestApp/Expected/v1.0.outlook-desktop.Tests.ColumnSet.Empty.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
{"HostConfigHash":"04138f4","CardHash":"461f2d5","Error":null} |
Binary file added
BIN
+2.19 KB
...uwp/AdaptiveCardTestApp/Expected/v1.0.outlook-desktop.Tests.ColumnSet.Empty.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions
1
source/uwp/AdaptiveCardTestApp/Expected/v1.0.sample.Tests.ColumnSet.Empty.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
{"HostConfigHash":"45c4c50","CardHash":"461f2d5","Error":null} |
Binary file added
BIN
+2.17 KB
source/uwp/AdaptiveCardTestApp/Expected/v1.0.sample.Tests.ColumnSet.Empty.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions
1
source/uwp/AdaptiveCardTestApp/Expected/v1.0.sampleDifferentFont.Tests.ColumnSet.Empty.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
{"HostConfigHash":"3e47fb4","CardHash":"461f2d5","Error":null} |
Binary file added
BIN
+2.54 KB
...AdaptiveCardTestApp/Expected/v1.0.sampleDifferentFont.Tests.ColumnSet.Empty.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions
1
source/uwp/AdaptiveCardTestApp/Expected/v1.0.skype.Tests.ColumnSet.Empty.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
{"HostConfigHash":"2ac7c52","CardHash":"461f2d5","Error":null} |
Binary file added
BIN
+2.12 KB
source/uwp/AdaptiveCardTestApp/Expected/v1.0.skype.Tests.ColumnSet.Empty.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions
1
source/uwp/AdaptiveCardTestApp/Expected/v1.0.windows-notification.Tests.ColumnSet.Empty.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
{"HostConfigHash":"e188ab9","CardHash":"461f2d5","Error":null} |
Binary file added
BIN
+3.02 KB
...daptiveCardTestApp/Expected/v1.0.windows-notification.Tests.ColumnSet.Empty.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions
1
source/uwp/AdaptiveCardTestApp/Expected/v1.0.windows-timeline.Tests.ColumnSet.Empty.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
{"HostConfigHash":"e3927b5","CardHash":"461f2d5","Error":null} |
Binary file added
BIN
+2.47 KB
...wp/AdaptiveCardTestApp/Expected/v1.0.windows-timeline.Tests.ColumnSet.Empty.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.