Support for fused asynchronic and synchronic link views.

ba-st · Feb 19, 2018 · 35b1827 · 35b1827
1 parent a8cc3ae
commit 35b1827
Show file tree

Hide file tree

Showing 9 changed files with 55 additions and 26 deletions.
diff --git a/...age/BootstrapComponentSupplierTest.class/instance/testAsynchronicButtonLabeledApplying.st b/...age/BootstrapComponentSupplierTest.class/instance/testAsynchronicButtonLabeledApplying.st
@@ -2,5 +2,8 @@ tests-Supplying
 testAsynchronicButtonLabeledApplying
 
 	self
-		assertRenderingOf: [ :supplier | supplier asynchronicButtonLabeled: 'Buy' applying: [ :anchor | anchor addClass bootstrap buttonPrimary ] ]
+		assertRenderingOf: [ :supplier | 
+			supplier
+				asynchronicButtonLabeled: 'Buy'
+				applying: [ :anchor | anchor addClass bootstrap buttonPrimary ] ]
 		equals: '<button class="btn btn-primary" type="button">Buy</button>'
diff --git a/...kage/BootstrapComponentSupplierTest.class/instance/testSynchronicButtonLabeledApplying.st b/...kage/BootstrapComponentSupplierTest.class/instance/testSynchronicButtonLabeledApplying.st
@@ -0,0 +1,9 @@
+tests-Supplying
+testSynchronicButtonLabeledApplying
+
+	self
+		assertRenderingOf: [ :supplier | 
+			supplier
+				synchronicButtonLabeled: 'Buy'
+				applying: [ :link | link addClass bootstrap buttonPrimary ] ]
+		equals: '<button class="btn btn-primary" type="submit">Buy</button>'
diff --git a/...tstrap-Tests.package/BootstrapInputGroupWebViewTest.class/instance/testRenderContentOn.st b/...tstrap-Tests.package/BootstrapInputGroupWebViewTest.class/instance/testRenderContentOn.st
@@ -6,12 +6,17 @@ testRenderContentOn
 	inputGroup := BootstrapInputGroupWebView
 		wrapping: (supplier singleLineTextFieldApplying: [ :field |  ])
 		between: (supplier inputGroupAddOnWrapping: 'http://')
-		and: (supplier inputGroupButtonWrapping: (supplier synchronicButtonLabeled: 'Go!' applying: [ :button | button addClass bootstrap buttonDefault ] evaluating: [  ]))
+		and:
+			(supplier
+				inputGroupButtonWrapping:
+					(supplier
+						synchronicButtonLabeled: 'Go!'
+						applying: [ :button | button addClass bootstrap buttonDefault ]))
 		applying: [ :group |  ].
 
 	html := self render: inputGroup.
 
 	self
 		assert: html
 		equals:
-			'<div class="input-group"><span class="input-group-addon">http://</span><input value="" name="1" class="form-control" type="text"/><span class="input-group-btn"><button name="2" class="btn btn-default" type="submit">Go!</button></span></div>'
+			'<div class="input-group"><span class="input-group-addon">http://</span><input value="" name="1" class="form-control" type="text"/><span class="input-group-btn"><button class="btn btn-default" type="submit">Go!</button></span></div>'
diff --git a/....package/BootstrapInputGroupWebViewTest.class/instance/testRenderContentOnWithCommands.st b/....package/BootstrapInputGroupWebViewTest.class/instance/testRenderContentOnWithCommands.st
@@ -4,7 +4,12 @@ testRenderContentOnWithCommands
 	| inputGroup html |
 
 	inputGroup := BootstrapInputGroupWebView
-		appending: (supplier inputGroupButtonWrapping: (supplier synchronicButtonLabeled: 'Go!' applying: [ :button | button addClass bootstrap buttonDefault ] evaluating: [  ]))
+		appending:
+			(supplier
+				inputGroupButtonWrapping:
+					(supplier
+						synchronicButtonLabeled: 'Go!'
+						applying: [ :button | button addClass bootstrap buttonDefault ]))
 		to: (supplier singleLineTextFieldApplying: [ :field |  ])
 		applying: [ :group | group addClass bootstrap inputGroupSmall ].
 
@@ -13,4 +18,4 @@ testRenderContentOnWithCommands
 	self
 		assert: html
 		equals:
-			'<div class="input-group input-group-sm"><input value="" name="1" class="form-control" type="text"/><span class="input-group-btn"><button name="2" class="btn btn-default" type="submit">Go!</button></span></div>'
+			'<div class="input-group input-group-sm"><input value="" name="1" class="form-control" type="text"/><span class="input-group-btn"><button class="btn btn-default" type="submit">Go!</button></span></div>'
diff --git a/source/Willow-Bootstrap-Tests.package/monticello.meta/categories.st b/source/Willow-Bootstrap-Tests.package/monticello.meta/categories.st
@@ -1,10 +1,10 @@
 SystemOrganization addCategory: #'Willow-Bootstrap-Tests'!
-SystemOrganization addCategory: 'Willow-Bootstrap-Tests-Applications'!
-SystemOrganization addCategory: 'Willow-Bootstrap-Tests-Datepicker'!
-SystemOrganization addCategory: 'Willow-Bootstrap-Tests-Frontend'!
-SystemOrganization addCategory: 'Willow-Bootstrap-Tests-Libraries'!
-SystemOrganization addCategory: 'Willow-Bootstrap-Tests-Plugins'!
-SystemOrganization addCategory: 'Willow-Bootstrap-Tests-Select'!
-SystemOrganization addCategory: 'Willow-Bootstrap-Tests-Typeahead'!
-SystemOrganization addCategory: 'Willow-Bootstrap-Tests-WebInteraction'!
-SystemOrganization addCategory: 'Willow-Bootstrap-Tests-WebViews'!
+SystemOrganization addCategory: #'Willow-Bootstrap-Tests-Applications'!
+SystemOrganization addCategory: #'Willow-Bootstrap-Tests-Datepicker'!
+SystemOrganization addCategory: #'Willow-Bootstrap-Tests-Frontend'!
+SystemOrganization addCategory: #'Willow-Bootstrap-Tests-Libraries'!
+SystemOrganization addCategory: #'Willow-Bootstrap-Tests-Plugins'!
+SystemOrganization addCategory: #'Willow-Bootstrap-Tests-Select'!
+SystemOrganization addCategory: #'Willow-Bootstrap-Tests-Typeahead'!
+SystemOrganization addCategory: #'Willow-Bootstrap-Tests-WebInteraction'!
+SystemOrganization addCategory: #'Willow-Bootstrap-Tests-WebViews'!
diff --git a/...rap.package/BootstrapComponentSupplier.class/instance/asynchronicLinkLabeled.applying..st b/...rap.package/BootstrapComponentSupplier.class/instance/asynchronicLinkLabeled.applying..st
@@ -1,4 +1,9 @@
 Supplying
 asynchronicLinkLabeled: aRenderable applying: aComponentCommand
 
-	^ AsynchronicLinkWebView labeled: aRenderable applying: aComponentCommand
+	| linkView |
+
+	linkView := LinkWebView labeled: aRenderable applying: aComponentCommand.
+	linkView onTrigger
+		executeOnClient: [ :script :canvas | script << canvas jQuery event preventDefault ].
+	^ linkView
diff --git a/...ap.package/BootstrapComponentSupplier.class/instance/synchronicButtonLabeled.applying..st b/...ap.package/BootstrapComponentSupplier.class/instance/synchronicButtonLabeled.applying..st
@@ -0,0 +1,6 @@
+Supplying
+synchronicButtonLabeled: aRenderable applying: aComponentCommand
+
+	^ SynchronicSubmitButtonWebView
+		labeled: aRenderable
+		applying: [ :field | field addClass bootstrap button + aComponentCommand ]
diff --git a/...BootstrapComponentSupplier.class/instance/synchronicButtonLabeled.applying.evaluating..st b/...BootstrapComponentSupplier.class/instance/synchronicButtonLabeled.applying.evaluating..st
diff --git a/source/Willow-Bootstrap.package/monticello.meta/categories.st b/source/Willow-Bootstrap.package/monticello.meta/categories.st
@@ -1,8 +1,8 @@
 SystemOrganization addCategory: #'Willow-Bootstrap'!
-SystemOrganization addCategory: 'Willow-Bootstrap-Datepicker'!
-SystemOrganization addCategory: 'Willow-Bootstrap-Frontend'!
-SystemOrganization addCategory: 'Willow-Bootstrap-Libraries'!
-SystemOrganization addCategory: 'Willow-Bootstrap-Plugins'!
-SystemOrganization addCategory: 'Willow-Bootstrap-Select'!
-SystemOrganization addCategory: 'Willow-Bootstrap-Typeahead'!
-SystemOrganization addCategory: 'Willow-Bootstrap-WebViews'!
+SystemOrganization addCategory: #'Willow-Bootstrap-Datepicker'!
+SystemOrganization addCategory: #'Willow-Bootstrap-Frontend'!
+SystemOrganization addCategory: #'Willow-Bootstrap-Libraries'!
+SystemOrganization addCategory: #'Willow-Bootstrap-Plugins'!
+SystemOrganization addCategory: #'Willow-Bootstrap-Select'!
+SystemOrganization addCategory: #'Willow-Bootstrap-Typeahead'!
+SystemOrganization addCategory: #'Willow-Bootstrap-WebViews'!