From 73875628ea768d0c747a0c2ee411559fec8ef29e Mon Sep 17 00:00:00 2001 From: Johan Brichau Date: Sat, 13 Jul 2024 16:30:26 +0200 Subject: [PATCH 1/9] The use of the charSet attribute is not deprecated on tags. --- .../WAMetaElement.class/instance/charset..st | 3 --- 1 file changed, 3 deletions(-) diff --git a/repository/Seaside-Core.package/WAMetaElement.class/instance/charset..st b/repository/Seaside-Core.package/WAMetaElement.class/instance/charset..st index 5e2606fda..382dc1862 100644 --- a/repository/Seaside-Core.package/WAMetaElement.class/instance/charset..st +++ b/repository/Seaside-Core.package/WAMetaElement.class/instance/charset..st @@ -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 \ No newline at end of file From 28f50f555e74a249d7d3f6f595375244379f46f4 Mon Sep 17 00:00:00 2001 From: Johan Brichau Date: Sat, 13 Jul 2024 16:42:18 +0200 Subject: [PATCH 2/9] Allow scope attribute on table heading tags, not on table data tags; adapt tests --- .../WATableHeadingTag.class/instance/scope..st | 10 ++++++++++ .../WACanvasBrushTest.class/instance/testTableData.st | 5 +---- .../monticello.meta/categories.st | 2 +- .../instance/renderEntityTableBodyOn..st | 2 +- 4 files changed, 13 insertions(+), 6 deletions(-) create mode 100644 repository/Seaside-Canvas.package/WATableHeadingTag.class/instance/scope..st diff --git a/repository/Seaside-Canvas.package/WATableHeadingTag.class/instance/scope..st b/repository/Seaside-Canvas.package/WATableHeadingTag.class/instance/scope..st new file mode 100644 index 000000000..32982529f --- /dev/null +++ b/repository/Seaside-Canvas.package/WATableHeadingTag.class/instance/scope..st @@ -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 \ No newline at end of file diff --git a/repository/Seaside-Tests-Canvas.package/WACanvasBrushTest.class/instance/testTableData.st b/repository/Seaside-Tests-Canvas.package/WACanvasBrushTest.class/instance/testTableData.st index 0c4e6080f..a6cec24c9 100644 --- a/repository/Seaside-Tests-Canvas.package/WACanvasBrushTest.class/instance/testTableData.st +++ b/repository/Seaside-Tests-Canvas.package/WACanvasBrushTest.class/instance/testTableData.st @@ -20,7 +20,4 @@ testTableData gives: ''. self assert: [ :html | html tableData headers: 'zork' ] - gives: ''. - self - assert: [ :html | html tableData scope: 'colgroup' ] - gives: '' \ No newline at end of file + gives: '' \ No newline at end of file diff --git a/repository/Seaside-Tests-Canvas.package/monticello.meta/categories.st b/repository/Seaside-Tests-Canvas.package/monticello.meta/categories.st index 55ed744ab..f138ff8e9 100644 --- a/repository/Seaside-Tests-Canvas.package/monticello.meta/categories.st +++ b/repository/Seaside-Tests-Canvas.package/monticello.meta/categories.st @@ -1 +1 @@ -SystemOrganization addCategory: #'Seaside-Tests-Canvas'! +self packageOrganizer ensurePackage: #'Seaside-Tests-Canvas' withTags: #()! diff --git a/repository/Seaside-Tests-Functional.package/WACanvasTableFunctionalTest.class/instance/renderEntityTableBodyOn..st b/repository/Seaside-Tests-Functional.package/WACanvasTableFunctionalTest.class/instance/renderEntityTableBodyOn..st index fb99acc70..f1b1f1dcc 100644 --- a/repository/Seaside-Tests-Functional.package/WACanvasTableFunctionalTest.class/instance/renderEntityTableBodyOn..st +++ b/repository/Seaside-Tests-Functional.package/WACanvasTableFunctionalTest.class/instance/renderEntityTableBodyOn..st @@ -3,7 +3,7 @@ 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 ]. From 4cab783ea6a08c4e6723a4d697a0c1dd80a3ce68 Mon Sep 17 00:00:00 2001 From: Johan Brichau Date: Sat, 13 Jul 2024 17:00:26 +0200 Subject: [PATCH 3/9] remove deprecated align and char attributes from table functional test --- .../instance/renderCurrencyTableBodyOn..st | 8 ++------ .../instance/renderCurrencyTableOn..st | 2 +- .../instance/renderEntityTableBodyOn..st | 3 ++- .../instance/renderEntityTableColumnGroupsOn..st | 2 +- .../instance/renderEntityTableFootOn..st | 3 ++- .../WACanvasTableFunctionalTest.class/instance/style.st | 3 +++ 6 files changed, 11 insertions(+), 10 deletions(-) diff --git a/repository/Seaside-Tests-Functional.package/WACanvasTableFunctionalTest.class/instance/renderCurrencyTableBodyOn..st b/repository/Seaside-Tests-Functional.package/WACanvasTableFunctionalTest.class/instance/renderCurrencyTableBodyOn..st index b955bd91a..b72a839d3 100644 --- a/repository/Seaside-Tests-Functional.package/WACanvasTableFunctionalTest.class/instance/renderCurrencyTableBodyOn..st +++ b/repository/Seaside-Tests-Functional.package/WACanvasTableFunctionalTest.class/instance/renderCurrencyTableBodyOn..st @@ -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) ] ] ] \ No newline at end of file + html tableHeading: each first. + html tableData: (numberPrinter print: each second) ] ] ] \ No newline at end of file diff --git a/repository/Seaside-Tests-Functional.package/WACanvasTableFunctionalTest.class/instance/renderCurrencyTableOn..st b/repository/Seaside-Tests-Functional.package/WACanvasTableFunctionalTest.class/instance/renderCurrencyTableOn..st index d65eb4621..371413163 100644 --- a/repository/Seaside-Tests-Functional.package/WACanvasTableFunctionalTest.class/instance/renderCurrencyTableOn..st +++ b/repository/Seaside-Tests-Functional.package/WACanvasTableFunctionalTest.class/instance/renderCurrencyTableOn..st @@ -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 ] \ No newline at end of file diff --git a/repository/Seaside-Tests-Functional.package/WACanvasTableFunctionalTest.class/instance/renderEntityTableBodyOn..st b/repository/Seaside-Tests-Functional.package/WACanvasTableFunctionalTest.class/instance/renderEntityTableBodyOn..st index f1b1f1dcc..f8dea1a6d 100644 --- a/repository/Seaside-Tests-Functional.package/WACanvasTableFunctionalTest.class/instance/renderEntityTableBodyOn..st +++ b/repository/Seaside-Tests-Functional.package/WACanvasTableFunctionalTest.class/instance/renderEntityTableBodyOn..st @@ -8,5 +8,6 @@ renderEntityTableBodyOn: html eachEntity second do: [ :each | html tableData: each ]. eachEntity second do: [ :each | - html tableData align: 'center'; + html tableData + class: 'wacanvastabletest-aligncenter'; with: [ html html: each ] ] ] ] ] \ No newline at end of file diff --git a/repository/Seaside-Tests-Functional.package/WACanvasTableFunctionalTest.class/instance/renderEntityTableColumnGroupsOn..st b/repository/Seaside-Tests-Functional.package/WACanvasTableFunctionalTest.class/instance/renderEntityTableColumnGroupsOn..st index d3ca88f96..2d6437b62 100644 --- a/repository/Seaside-Tests-Functional.package/WACanvasTableFunctionalTest.class/instance/renderEntityTableColumnGroupsOn..st +++ b/repository/Seaside-Tests-Functional.package/WACanvasTableFunctionalTest.class/instance/renderEntityTableColumnGroupsOn..st @@ -2,4 +2,4 @@ rendering renderEntityTableColumnGroupsOn: html html tableColumnGroup. html tableColumnGroup span: 3. - html tableColumnGroup span: 3; align: 'center' \ No newline at end of file + html tableColumnGroup span: 3; class: 'wacanvastabletest-aligncenter' \ No newline at end of file diff --git a/repository/Seaside-Tests-Functional.package/WACanvasTableFunctionalTest.class/instance/renderEntityTableFootOn..st b/repository/Seaside-Tests-Functional.package/WACanvasTableFunctionalTest.class/instance/renderEntityTableFootOn..st index 61d5f1c91..090665317 100644 --- a/repository/Seaside-Tests-Functional.package/WACanvasTableFunctionalTest.class/instance/renderEntityTableFootOn..st +++ b/repository/Seaside-Tests-Functional.package/WACanvasTableFunctionalTest.class/instance/renderEntityTableFootOn..st @@ -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' ] ] \ No newline at end of file diff --git a/repository/Seaside-Tests-Functional.package/WACanvasTableFunctionalTest.class/instance/style.st b/repository/Seaside-Tests-Functional.package/WACanvasTableFunctionalTest.class/instance/style.st index 88a737aa1..5cea97d83 100644 --- a/repository/Seaside-Tests-Functional.package/WACanvasTableFunctionalTest.class/instance/style.st +++ b/repository/Seaside-Tests-Functional.package/WACanvasTableFunctionalTest.class/instance/style.st @@ -18,4 +18,7 @@ style padding: 3px; border:1px solid black; } +.wacanvastabletest-aligncenter { + text-align: center; +} ' \ No newline at end of file From 067ee0173e2585a7668d7dd56f9dda65c27e1184 Mon Sep 17 00:00:00 2001 From: Johan Brichau Date: Sat, 13 Jul 2024 17:06:20 +0200 Subject: [PATCH 4/9] Remove use of menu tag from html5 elements test --- .../instance/renderContentOn..st | 1 - .../WAHtml5ElementsTest.class/instance/renderMenuOn..st | 8 -------- 2 files changed, 9 deletions(-) delete mode 100644 repository/Seaside-Tests-Functional.package/WAHtml5ElementsTest.class/instance/renderMenuOn..st diff --git a/repository/Seaside-Tests-Functional.package/WAHtml5ElementsTest.class/instance/renderContentOn..st b/repository/Seaside-Tests-Functional.package/WAHtml5ElementsTest.class/instance/renderContentOn..st index de22af6a5..2bf123631 100644 --- a/repository/Seaside-Tests-Functional.package/WAHtml5ElementsTest.class/instance/renderContentOn..st +++ b/repository/Seaside-Tests-Functional.package/WAHtml5ElementsTest.class/instance/renderContentOn..st @@ -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. diff --git a/repository/Seaside-Tests-Functional.package/WAHtml5ElementsTest.class/instance/renderMenuOn..st b/repository/Seaside-Tests-Functional.package/WAHtml5ElementsTest.class/instance/renderMenuOn..st deleted file mode 100644 index 3feba09ab..000000000 --- a/repository/Seaside-Tests-Functional.package/WAHtml5ElementsTest.class/instance/renderMenuOn..st +++ /dev/null @@ -1,8 +0,0 @@ -rendering -renderMenuOn: html - html heading level2; with: ''. - - html menu: [ - html command beRadio; label: 'Do 1st Command'. - html command beRadio; label: 'Do 2nd Command'. - html command beRadio; label: 'Do 3rd Command' ] \ No newline at end of file From bcbbac3be5f5799f43f824cb552fabc811de64b8 Mon Sep 17 00:00:00 2001 From: Johan Brichau Date: Sat, 13 Jul 2024 17:11:06 +0200 Subject: [PATCH 5/9] remove use of name attribute on anchor tag in testcase --- .../instance/renderContentOn..st | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/repository/Seaside-Tests-Functional.package/WALotsaLinksFunctionalTest.class/instance/renderContentOn..st b/repository/Seaside-Tests-Functional.package/WALotsaLinksFunctionalTest.class/instance/renderContentOn..st index f6d23a329..046dca269 100644 --- a/repository/Seaside-Tests-Functional.package/WALotsaLinksFunctionalTest.class/instance/renderContentOn..st +++ b/repository/Seaside-Tests-Functional.package/WALotsaLinksFunctionalTest.class/instance/renderContentOn..st @@ -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 From 32f0ca0e2c4205d33788027d25d3f551787623df Mon Sep 17 00:00:00 2001 From: Johan Brichau Date: Sat, 13 Jul 2024 17:15:29 +0200 Subject: [PATCH 6/9] remove use of 'big' tag in test case --- .../instance/renderAnchorsOn..st | 2 +- .../instance/renderInline.factor.key.on..st | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/repository/Seaside-Tests-Functional.package/WAPerformanceFunctionalTest.class/instance/renderAnchorsOn..st b/repository/Seaside-Tests-Functional.package/WAPerformanceFunctionalTest.class/instance/renderAnchorsOn..st index a279ecb98..a2e15ebc4 100644 --- a/repository/Seaside-Tests-Functional.package/WAPerformanceFunctionalTest.class/instance/renderAnchorsOn..st +++ b/repository/Seaside-Tests-Functional.package/WAPerformanceFunctionalTest.class/instance/renderAnchorsOn..st @@ -4,7 +4,7 @@ renderAnchorsOn: canvas html unorderedList: [ html listItem: [ html anchor - name: 'name'; + id: 'name'; callback: [ ]; with: 'Anchor' ] ] ] factor: 1 diff --git a/repository/Seaside-Tests-Functional.package/WAPerformanceFunctionalTest.class/instance/renderInline.factor.key.on..st b/repository/Seaside-Tests-Functional.package/WAPerformanceFunctionalTest.class/instance/renderInline.factor.key.on..st index f92f35198..61c61aab6 100644 --- a/repository/Seaside-Tests-Functional.package/WAPerformanceFunctionalTest.class/instance/renderInline.factor.key.on..st +++ b/repository/Seaside-Tests-Functional.package/WAPerformanceFunctionalTest.class/instance/renderInline.factor.key.on..st @@ -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)'. From 1829b249ae60f67ef37937e34570d1d4691ddc8c Mon Sep 17 00:00:00 2001 From: Johan Brichau Date: Sat, 13 Jul 2024 17:18:06 +0200 Subject: [PATCH 7/9] Remove use of acronym tag in tests --- .../instance/renderAcronymOn..st | 9 --------- .../instance/renderContentOn..st | 1 - 2 files changed, 10 deletions(-) delete mode 100644 repository/Seaside-Tests-Functional.package/WAPhraseElementsFunctionalTest.class/instance/renderAcronymOn..st diff --git a/repository/Seaside-Tests-Functional.package/WAPhraseElementsFunctionalTest.class/instance/renderAcronymOn..st b/repository/Seaside-Tests-Functional.package/WAPhraseElementsFunctionalTest.class/instance/renderAcronymOn..st deleted file mode 100644 index d7fb7e26a..000000000 --- a/repository/Seaside-Tests-Functional.package/WAPhraseElementsFunctionalTest.class/instance/renderAcronymOn..st +++ /dev/null @@ -1,9 +0,0 @@ -rendering -renderAcronymOn: html - - html heading level2; with: ''. - - html paragraph: [ - html acronym - title: 'Federal Bureau of Investigation'; - with: 'F.B.I.' ] \ No newline at end of file diff --git a/repository/Seaside-Tests-Functional.package/WAPhraseElementsFunctionalTest.class/instance/renderContentOn..st b/repository/Seaside-Tests-Functional.package/WAPhraseElementsFunctionalTest.class/instance/renderContentOn..st index a86c6736a..0d21d3d6d 100644 --- a/repository/Seaside-Tests-Functional.package/WAPhraseElementsFunctionalTest.class/instance/renderContentOn..st +++ b/repository/Seaside-Tests-Functional.package/WAPhraseElementsFunctionalTest.class/instance/renderContentOn..st @@ -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. From acf3fe51173097bf6c35dc89c1183a71d90b61de Mon Sep 17 00:00:00 2001 From: Johan Brichau Date: Sat, 13 Jul 2024 17:20:31 +0200 Subject: [PATCH 8/9] Remove use of align attribute on tabledata in widget --- .../instance/renderCellForDate.row.index.on..st | 3 +-- .../Seaside-Widgets.package/monticello.meta/categories.st | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/repository/Seaside-Widgets.package/WASelectionDateTable.class/instance/renderCellForDate.row.index.on..st b/repository/Seaside-Widgets.package/WASelectionDateTable.class/instance/renderCellForDate.row.index.on..st index 571c55f07..3e95de16f 100644 --- a/repository/Seaside-Widgets.package/WASelectionDateTable.class/instance/renderCellForDate.row.index.on..st +++ b/repository/Seaside-Widgets.package/WASelectionDateTable.class/instance/renderCellForDate.row.index.on..st @@ -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 ]; diff --git a/repository/Seaside-Widgets.package/monticello.meta/categories.st b/repository/Seaside-Widgets.package/monticello.meta/categories.st index a4562ad2e..8d6e8fb6a 100644 --- a/repository/Seaside-Widgets.package/monticello.meta/categories.st +++ b/repository/Seaside-Widgets.package/monticello.meta/categories.st @@ -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)! From ad52bec2105df7d4e00d8c7f711bcc092afc9449 Mon Sep 17 00:00:00 2001 From: Johan Brichau Date: Sat, 13 Jul 2024 18:26:32 +0200 Subject: [PATCH 9/9] fix broken functional test --- .../instance/testCanvasTableFunctionalTest.st | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repository/Seaside-Tests-Parasol.package/WAWebDriverFunctionalTestCase.class/instance/testCanvasTableFunctionalTest.st b/repository/Seaside-Tests-Parasol.package/WAWebDriverFunctionalTestCase.class/instance/testCanvasTableFunctionalTest.st index 4b0238d31..bc9e468b9 100644 --- a/repository/Seaside-Tests-Parasol.package/WAWebDriverFunctionalTestCase.class/instance/testCanvasTableFunctionalTest.st +++ b/repository/Seaside-Tests-Parasol.package/WAWebDriverFunctionalTestCase.class/instance/testCanvasTableFunctionalTest.st @@ -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')