Skip to content

Commit

Permalink
Merge pull request #1434 from SeasideSt/fix-html-deprecations
Browse files Browse the repository at this point in the history
Fix html deprecations
  • Loading branch information
jbrichau committed Jul 13, 2024
2 parents d90609c + ad52bec commit 9ae0073
Show file tree
Hide file tree
Showing 20 changed files with 33 additions and 48 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
attributes
scope: aString
"This attribute specifies the set of data cells for which the current header cell provides header information. This attribute may be used in place of the headers attribute, particularly for simple tables. When specified, this attribute must have one of the following values:
- row: The current cell provides header information for the rest of the row that contains it (see also the section on table directionality).
- col: The current cell provides header information for the rest of the column that contains it.
- rowgroup: The header cell provides header information for the rest of the row group that contains it.
- colgroup: The header cell provides header information for the rest of the column group that contains it."

self attributes at: 'scope' put: aString
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,4 @@ charset: aString
The charset attribute on the meta element has no effect in XML documents, and is only allowed in order to facilitate migration to and from XHTML.
There must not be more than one meta element with a charset attribute per document."
self
greaseDeprecatedApi: 'WAMetaElement>>charset:'
details: 'Use an HTTP Content-Type header on the linked resource instead. https://www.geeksforgeeks.org/what-are-the-html-tags-that-deprecated-in-html5/'.
self attributes at: 'charset' put: aString
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,4 @@ testTableData
gives: '<td colspan="2" rowspan="3"></td>'.
self
assert: [ :html | html tableData headers: 'zork' ]
gives: '<td headers="zork"></td>'.
self
assert: [ :html | html tableData scope: 'colgroup' ]
gives: '<td scope="colgroup"></td>'
gives: '<td headers="zork"></td>'
Original file line number Diff line number Diff line change
@@ -1 +1 @@
SystemOrganization addCategory: #'Seaside-Tests-Canvas'!
self packageOrganizer ensurePackage: #'Seaside-Tests-Canvas' withTags: #()!
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,5 @@ renderCurrencyTableBodyOn: html
do: [ :each |
html
tableRow: [
html tableHeading: each first. "https://bugzilla.mozilla.org/show_bug.cgi?id=2212
https://bugzilla.mozilla.org/show_bug.cgi?id=915"
html tableData
align: 'char';
character: $.;
with: (numberPrinter print: each second) ] ] ]
html tableHeading: each first.
html tableData: (numberPrinter print: each second) ] ] ]
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ renderCurrencyTableOn: html
with: [
html tableCaption: 'Currencies against Swiss Franc (CHF)'.
html tableColumnGroup.
html tableColumnGroup width: '100px'; align: 'char'; character: $..
html tableColumnGroup.
self renderCurrencyTableHeadOn: html.
self renderCurrencyTableBodyOn: html ]
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ renderEntityTableBodyOn: html
html tableBody: [
self entities do: [ :eachEntity |
html tableRow: [
html tableData scope: 'row';
html tableHeading scope: 'row';
with: eachEntity first.
eachEntity second do: [ :each |
html tableData: each ].
eachEntity second do: [ :each |
html tableData align: 'center';
html tableData
class: 'wacanvastabletest-aligncenter';
with: [ html html: each ] ] ] ] ]
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ rendering
renderEntityTableColumnGroupsOn: html
html tableColumnGroup.
html tableColumnGroup span: 3.
html tableColumnGroup span: 3; align: 'center'
html tableColumnGroup span: 3; class: 'wacanvastabletest-aligncenter'
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@ rendering
renderEntityTableFootOn: html
html tableFoot: [
html tableRow: [
html tableData align: 'center'; colSpan: 7;
html tableData colSpan: 7;
class: 'wacanvastabletest-aligncenter';
with: '5 entities shown' ] ]
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,7 @@ style
padding: 3px;
border:1px solid black;
}
.wacanvastabletest-aligncenter {
text-align: center;
}
'
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ renderContentOn: html
self renderProgressOn: html.
self renderTimeOn: html.
self renderDetailsOn: html.
self renderMenuOn: html.
self renderHeadingGroupOn: html.
self renderBidirectionalOn: html.
self renderBidirectionalOverrideOn: html.
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ renderContentOn: html

self renderExplanationOn: html.
html unorderedList: [
(1 to: 5000) do: [ :each |
1 to: 5000 do: [ :each |
html listItem: [
html anchor
name: each;
id: 'linkid-', each greaseString;
callback: [
self
inform: each
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ renderAnchorsOn: canvas
html unorderedList: [
html listItem: [
html anchor
name: 'name';
id: 'name';
callback: [ ];
with: 'Anchor' ] ] ]
factor: 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@ renderInline: aBlock factor: factor key: key on: html
html div
class: 'spi';
with: [
html big: spi greaseString , ' SPI'.
html span
style: 'font-size: 30px;';
with: spi greaseString , ' SPI'.
html span
class: 'iteration';
with: '(' , count greaseString , ' iterations)'.
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ rendering
renderContentOn: html
self renderHarryOn: html.
self renderAbbreviatedOn: html.
self renderAcronymOn: html.
self renderKeyboardInputOn: html.
self renderVariableOn: html.
self renderCodeOn: html.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ testCanvasTableFunctionalTest
with: entities
do: [ :row :entityDef |
self
assert: ((row findElementsByTagName: 'td') collect: #'getText')
assert: ((row findElementsByCSSSelector: 'th,td') collect: #'getText')
equals: entityDef ].
exchangeRates := #(#('EUR' '1.70') #('USD' '1.30') #('DKK' '23.36') #('SEK' '19.32')).
currencyTable := (driver findElementsByTagName: 'table')
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
rendering
renderCellForDate: aDate row: anObject index: aNumber on: html
html tableData
style: 'background-color: ', (self colorForDate: aDate rowIndex: aNumber);
align: 'center';
style: 'text-align: center; background-color: ', (self colorForDate: aDate rowIndex: aNumber);
with: [
html anchor
callback: [ self selectDate: aDate rowIndex: aNumber ];
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
SystemOrganization addCategory: #'Seaside-Widgets'!
SystemOrganization addCategory: #'Seaside-Widgets-Components'!
SystemOrganization addCategory: #'Seaside-Widgets-Decorations'!
self packageOrganizer ensurePackage: #'Seaside-Widgets' withTags: #(#Components #Decorations)!

0 comments on commit 9ae0073

Please sign in to comment.