From 4e2dd638798a905ad39c90b8e9d3831d8be148d8 Mon Sep 17 00:00:00 2001 From: Johan Brichau Date: Sat, 13 Jul 2024 15:26:28 +0200 Subject: [PATCH 1/3] Use turboShow: instead of turboCall:, which makes this example also work on platforms that do not implement full continuations. --- .../WAComponent.extension/instance/turboShow..st | 5 +++++ .../WATurboTodoItem.class/instance/renderContentOn..st | 2 +- .../WATurboTodoItem.class/instance/renderDescriptionOn..st | 2 +- .../monticello.meta/categories.st | 2 +- .../Seaside-Welcome.package/monticello.meta/categories.st | 4 +--- 5 files changed, 9 insertions(+), 6 deletions(-) create mode 100644 repository/Seaside-HotwireTurbo-Core.package/WAComponent.extension/instance/turboShow..st diff --git a/repository/Seaside-HotwireTurbo-Core.package/WAComponent.extension/instance/turboShow..st b/repository/Seaside-HotwireTurbo-Core.package/WAComponent.extension/instance/turboShow..st new file mode 100644 index 000000000..0b471f62b --- /dev/null +++ b/repository/Seaside-HotwireTurbo-Core.package/WAComponent.extension/instance/turboShow..st @@ -0,0 +1,5 @@ +*Seaside-HotwireTurbo-Core +turboShow: aComponent + + aComponent addDecoration: (WATurboFrame newWithId: self turboframeDecoration id). + ^ self show: aComponent diff --git a/repository/Seaside-HotwireTurbo-Examples.package/WATurboTodoItem.class/instance/renderContentOn..st b/repository/Seaside-HotwireTurbo-Examples.package/WATurboTodoItem.class/instance/renderContentOn..st index 85b67ed4b..960934004 100644 --- a/repository/Seaside-HotwireTurbo-Examples.package/WATurboTodoItem.class/instance/renderContentOn..st +++ b/repository/Seaside-HotwireTurbo-Examples.package/WATurboTodoItem.class/instance/renderContentOn..st @@ -4,7 +4,7 @@ renderContentOn: html | id | html listItem id: (id := html nextId); - onDoubleClick: (html javascript turboCallback: [ self turboCall: (WATurboTodoItemEditor on: self) ]); + onDoubleClick: (html javascript turboCallback: [ self turboShow: (WATurboTodoItemEditor on: self) ]); with: [ html div class: 'view'; diff --git a/repository/Seaside-HotwireTurbo-Examples.package/WATurboTodoItem.class/instance/renderDescriptionOn..st b/repository/Seaside-HotwireTurbo-Examples.package/WATurboTodoItem.class/instance/renderDescriptionOn..st index 16ed768ee..293a3a81b 100644 --- a/repository/Seaside-HotwireTurbo-Examples.package/WATurboTodoItem.class/instance/renderDescriptionOn..st +++ b/repository/Seaside-HotwireTurbo-Examples.package/WATurboTodoItem.class/instance/renderDescriptionOn..st @@ -4,5 +4,5 @@ renderDescriptionOn: html html label: description. html anchor class: 'edit-link'; - callback: [ self turboCall: (WATurboTodoItemEditor on: self) ]; + callback: [ self turboShow: (WATurboTodoItemEditor on: self) ]; with: 'edit' \ No newline at end of file diff --git a/repository/Seaside-HotwireTurbo-Examples.package/monticello.meta/categories.st b/repository/Seaside-HotwireTurbo-Examples.package/monticello.meta/categories.st index 2f4aea817..7aa04195e 100644 --- a/repository/Seaside-HotwireTurbo-Examples.package/monticello.meta/categories.st +++ b/repository/Seaside-HotwireTurbo-Examples.package/monticello.meta/categories.st @@ -1 +1 @@ -SystemOrganization addCategory: #'Seaside-HotwireTurbo-Examples'! +self packageOrganizer ensurePackage: #'Seaside-HotwireTurbo-Examples' withTags: #()! diff --git a/repository/Seaside-Welcome.package/monticello.meta/categories.st b/repository/Seaside-Welcome.package/monticello.meta/categories.st index 22c274c2c..e63a9b314 100644 --- a/repository/Seaside-Welcome.package/monticello.meta/categories.st +++ b/repository/Seaside-Welcome.package/monticello.meta/categories.st @@ -1,3 +1 @@ -SystemOrganization addCategory: #'Seaside-Welcome'! -SystemOrganization addCategory: #'Seaside-Welcome-Base'! -SystemOrganization addCategory: #'Seaside-Welcome-Examples'! +self packageOrganizer ensurePackage: #'Seaside-Welcome' withTags: #(#Base #Examples)! From 1182f6eaf9c49a82a6e9e08f4eb58c7ec46dec8f Mon Sep 17 00:00:00 2001 From: Johan Brichau Date: Sat, 13 Jul 2024 15:26:47 +0200 Subject: [PATCH 2/3] Adapt the Welcome docs a bit --- .../instance/renderDocumentationStepOn..st | 8 +++++++- .../instance/renderExamplesStepOn..st | 11 ++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/repository/Seaside-Welcome.package/WAWelcomeGettingStarted.class/instance/renderDocumentationStepOn..st b/repository/Seaside-Welcome.package/WAWelcomeGettingStarted.class/instance/renderDocumentationStepOn..st index 25b653202..2ffca3769 100644 --- a/repository/Seaside-Welcome.package/WAWelcomeGettingStarted.class/instance/renderDocumentationStepOn..st +++ b/repository/Seaside-Welcome.package/WAWelcomeGettingStarted.class/instance/renderDocumentationStepOn..st @@ -11,9 +11,15 @@ renderDocumentationStepOn: html url: 'http://book.seaside.st/'; with: 'Seaside Book'. html text: ' will teach you all you need to know about Seaside and how to build killer web applications.' ]. + html listItem: [ + html text: 'The '. + html anchor + url: 'https://github.com/SeasideSt/Seaside/wiki'; + with: 'Seaside Github wiki'. + html text: ' is where we keep our most up-to-date reference documentation.' ]. html listItem: [ html text: 'The '. html anchor - url: 'http://www.swa.hpi.uni-potsdam.de/seaside/tutorial'; + url: 'http://www.hpi.uni-potsdam.de/hirschfeld/seaside/tutorial/'; with: 'Seaside Tutorial'. html text: ' has 12 chapters and introduces a sample application to explain the main features of Seaside.' ] ] \ No newline at end of file diff --git a/repository/Seaside-Welcome.package/WAWelcomeGettingStarted.class/instance/renderExamplesStepOn..st b/repository/Seaside-Welcome.package/WAWelcomeGettingStarted.class/instance/renderExamplesStepOn..st index 910daf557..7fc8c3040 100644 --- a/repository/Seaside-Welcome.package/WAWelcomeGettingStarted.class/instance/renderExamplesStepOn..st +++ b/repository/Seaside-Welcome.package/WAWelcomeGettingStarted.class/instance/renderExamplesStepOn..st @@ -20,4 +20,13 @@ renderExamplesStepOn: html html anchor callback: [ self show: WAWelcomeExampleFlow new ]; with: 'Task'. - html text: ', illustrating Seaside''s innovative approach to application control flow.' ] ] \ No newline at end of file + html text: ', illustrating Seaside''s innovative approach to application control flow.' ]. + html listItem: [ + html anchor + callback: [ self show: WATodo new ]; + with: 'Todo'. + html text: ', the Seaside implementation of the example on '. + html anchor + url: 'https://todomvc.com/'; + target: '_blank'; + with: 'https://todomvc.com/' ] ] \ No newline at end of file From 3242efd2c5bf6ec7614f06e3a9865c9467dc393c Mon Sep 17 00:00:00 2001 From: Johan Brichau Date: Sat, 13 Jul 2024 15:27:02 +0200 Subject: [PATCH 3/3] update Seaside version --- .../GRPlatform.extension/instance/seasideVersion.st | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repository/Seaside-Core.package/GRPlatform.extension/instance/seasideVersion.st b/repository/Seaside-Core.package/GRPlatform.extension/instance/seasideVersion.st index aa94b9f4b..2206ac400 100644 --- a/repository/Seaside-Core.package/GRPlatform.extension/instance/seasideVersion.st +++ b/repository/Seaside-Core.package/GRPlatform.extension/instance/seasideVersion.st @@ -2,5 +2,5 @@ seasideVersion "Answer the Seaside version" - ^ (GRVersion major: 3 minor: 5 revision: 8) + ^ (GRVersion major: 3 minor: 5 revision: 9) yourself \ No newline at end of file