Fixes #217

ba-st · Sep 10, 2023 · 925fecc · 925fecc
1 parent df238f4
commit 925fecc
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 1 deletion.
diff --git a/source/Willow-Core-Tests/CombinedWebInteractionInterpreterTest.class.st b/source/Willow-Core-Tests/CombinedWebInteractionInterpreterTest.class.st
@@ -684,6 +684,27 @@ CombinedWebInteractionInterpreterTest >> testSetValueToWithoutTriggeringChangeOf
 			'<input id="15" type="text"/><button id="button-id2" type="button">Ok</button><button id="button-id4" type="button">Cancel</button><script type="text/javascript">$("#button-id2").click(function(event){Willow.callServer({"url":"/","data":"1"})});$("#button-id4").click(function(event){Willow.callServer({"url":"/","data":"3"})});</script>'
 ]
 
+{ #category : #'tests - Configuring' }
+CombinedWebInteractionInterpreterTest >> testShowLoadingNotificationDisplayingApplying [
+
+	| interpreter html |
+
+	interpreter := self combinedInterpreter.
+
+	interpreter
+		showLoadingNotificationDisplaying: 'Loading...'
+		applying: [ :view | view addClass willow ].
+	html := self renderUsing: [ :canvas |
+		        canvas
+			        render: okButton;
+			        render: cancelButton
+		        ].
+	self
+		assert: html
+		equals:
+		'<button id="button-id2" type="button">Ok</button><button id="button-id4" type="button">Cancel</button><script type="text/javascript">$("#button-id2").click(function(event){$("#willow-notification-section").html("<div class=\"willow\">Loading...</div>");Willow.callServer({"complete":function(){$("#willow-notification-section").html("")},"url":"/","data":"1"})});$("#button-id4").click(function(event){$("#willow-notification-section").html("<div class=\"willow\">Loading...</div>");Willow.callServer({"complete":function(){$("#willow-notification-section").html("")},"url":"/","data":"3"})});</script>'
+]
+
 { #category : #'tests - Configuring - DOM' }
 CombinedWebInteractionInterpreterTest >> testShowLoadingNotificationStyledAsAll [
 

diff --git a/source/Willow-Core/CombinedWebInteractionInterpreter.class.st b/source/Willow-Core/CombinedWebInteractionInterpreter.class.st
@@ -165,6 +165,13 @@ CombinedWebInteractionInterpreter >> setValueTo: aValueProvider withoutTriggerin
 		interpretersDo: [ :interpreter | interpreter setValueTo: aValueProvider withoutTriggeringChangeOf: aView ]
 ]
 
+{ #category : #Configuring }
+CombinedWebInteractionInterpreter >> showLoadingNotificationDisplaying: aWebView applying: aComponentCommand [
+
+	self interpretersDo: [ :interpreter |
+		interpreter showLoadingNotificationDisplaying: aWebView applying: aComponentCommand ]
+]
+
 { #category : #Configuring }
 CombinedWebInteractionInterpreter >> showLoadingNotificationStyledAsAll: classes [
 

diff --git a/source/Willow-Core/WebInteractionInterpreter.class.st b/source/Willow-Core/WebInteractionInterpreter.class.st
@@ -207,7 +207,7 @@ WebInteractionInterpreter >> setValueTo: aValueProvider withoutTriggeringChangeO
 WebInteractionInterpreter >> showLoadingNotificationDisplaying: aWebView applying: aComponentCommand [
 
 	interaction onTriggerExecute:
-		(LoadingNotificationCommand displaying: aWebView applying: aComponentCommand)
+		( LoadingNotificationCommand displaying: aWebView applying: aComponentCommand )
 ]
 
 { #category : #Configuring }

diff --git a/source/Willow-Core/WebInteractionInterpreterBehavior.class.st b/source/Willow-Core/WebInteractionInterpreterBehavior.class.st
@@ -153,6 +153,12 @@ WebInteractionInterpreterBehavior >> show: aRenderable whileCallingServerToRende
 		render: anIdentifiedWebView
 ]
 
+{ #category : #Configuring }
+WebInteractionInterpreterBehavior >> showLoadingNotificationDisplaying: aWebView applying: aComponentCommand [
+
+	self subclassResponsibility
+]
+
 { #category : #Configuring }
 WebInteractionInterpreterBehavior >> showLoadingNotificationStyledAsAll: classes [