Merge pull request #131 from ba-st/improved-seaside-encoding

Improved seaside encoding
ba-st · Jan 2, 2025 · 5d02f51 · 5d02f51
2 parents f8c2bf4 + 0d57cfb
commit 5d02f51
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 10 deletions.
diff --git a/.project b/.project
@@ -1,3 +1,4 @@
 {
-	'srcDirectory' : 'source'
-}
+	'srcDirectory' : 'source',
+	'tags': [ 'Buenos Aires Smalltalk' ]
+}
diff --git a/source/Willow-Bootstrap-3-Tests/BootstrapPopoverTest.extension.st b/source/Willow-Bootstrap-3-Tests/BootstrapPopoverTest.extension.st
@@ -41,7 +41,7 @@ BootstrapPopoverTest >> testTemplateForBootstrap3 [
 	self
 		assert: html
 		equals:
-		'<div id="id1"></div><script type="text/javascript">$("#id1").popover({"template":"<div class=\"popover\" role=\"tooltip\"><div class=\"arrow\"><\/div><h3 class=\"popover-title\"><\/h3><div class=\"popover-content\"><span class=\"glyphicon glyphicon-menu-up\"><\/span><\/div><\/div>"});</script>'
+		'<div id="id1"></div><script type="text/javascript">$("#id1").popover({"template":"<div class=\"popover\" role=\"tooltip\"><div class=\"arrow\"></div><h3 class=\"popover-title\"></h3><div class=\"popover-content\"><span class=\"glyphicon glyphicon-menu-up\"></span></div></div>"});</script>'
 ]
 
 { #category : '*Willow-Bootstrap-3-Tests' }

diff --git a/source/Willow-Bootstrap-3-Tests/BootstrapTooltipTest.extension.st b/source/Willow-Bootstrap-3-Tests/BootstrapTooltipTest.extension.st
@@ -27,7 +27,7 @@ BootstrapTooltipTest >> testTemplateForBootstrap3 [
 	self
 		assert: html
 		equals:
-		'<div id="id1"></div><script type="text/javascript">$("#id1").tooltip({"template":"<div class=\"tooltip\" role=\"tooltip\"><div class=\"tooltip-arrow\"><\/div><div class=\"tooltip-inner\"><span class=\"glyphicon glyphicon-menu-up\"><\/span><\/div><\/div>"});</script>'
+		'<div id="id1"></div><script type="text/javascript">$("#id1").tooltip({"template":"<div class=\"tooltip\" role=\"tooltip\"><div class=\"tooltip-arrow\"></div><div class=\"tooltip-inner\"><span class=\"glyphicon glyphicon-menu-up\"></span></div></div>"});</script>'
 ]
 
 { #category : '*Willow-Bootstrap-3-Tests' }

diff --git a/source/Willow-Bootstrap-4-Tests/BootstrapPopoverTest.extension.st b/source/Willow-Bootstrap-4-Tests/BootstrapPopoverTest.extension.st
@@ -109,7 +109,7 @@ BootstrapPopoverTest >> testTemplateForBootstrap4 [
 	self
 		assert: html
 		equals:
-		'<div id="id1"></div><script type="text/javascript">$("#id1").popover({"template":"<div class=\"popover\" role=\"tooltip\"><div class=\"arrow\"><\/div><h3 class=\"popover-header\"><\/h3><div class=\"popover-body\">Body<\/div><\/div>"});</script>'
+		'<div id="id1"></div><script type="text/javascript">$("#id1").popover({"template":"<div class=\"popover\" role=\"tooltip\"><div class=\"arrow\"></div><h3 class=\"popover-header\"></h3><div class=\"popover-body\">Body</div></div>"});</script>'
 ]
 
 { #category : '*Willow-Bootstrap-4-Tests' }

diff --git a/source/Willow-Bootstrap-4-Tests/BootstrapTooltipTest.extension.st b/source/Willow-Bootstrap-4-Tests/BootstrapTooltipTest.extension.st
@@ -114,7 +114,7 @@ BootstrapTooltipTest >> testTemplateForBootstrap4 [
 	self
 		assert: html
 		equals:
-		'<div id="id1"></div><script type="text/javascript">$("#id1").tooltip({"template":"<div class=\"tooltip\" role=\"tooltip\"><div class=\"arrow\"><\/div><div class=\"tooltip-inner\">Help!<\/div><\/div>"});</script>'
+		'<div id="id1"></div><script type="text/javascript">$("#id1").tooltip({"template":"<div class=\"tooltip\" role=\"tooltip\"><div class=\"arrow\"></div><div class=\"tooltip-inner\">Help!</div></div>"});</script>'
 ]
 
 { #category : '*Willow-Bootstrap-4-Tests' }

diff --git a/source/Willow-Bootstrap-Tests/BootstrapDatepickerTemplateTest.class.st b/source/Willow-Bootstrap-Tests/BootstrapDatepickerTemplateTest.class.st
@@ -16,5 +16,5 @@ BootstrapDatepickerTemplateTest >> testAsJavascript [
 		assert: ( ( BootstrapDatepickerTemplate context: self renderContext )
 				  leftArrow: [ :canvas | canvas span: '<' ]
 				  rightArrow: '>' )
-		equals: '{"leftArrow":"<span>&lt;<\/span>","rightArrow":"&gt;"}'
+		equals: '{"leftArrow":"<span>&lt;</span>","rightArrow":"&gt;"}'
 ]
diff --git a/source/Willow-Bootstrap-Tests/BootstrapPopoverTest.class.st b/source/Willow-Bootstrap-Tests/BootstrapPopoverTest.class.st
@@ -107,7 +107,7 @@ BootstrapPopoverTest >> testHtmlContent [
 	self
 		assert: html
 		equals:
-		'<div id="id1"></div><script type="text/javascript">$("#id1").popover({"html":true,"content":"<div class=\"container\">A more complex rendering<\/div>"});</script>'
+		'<div id="id1"></div><script type="text/javascript">$("#id1").popover({"html":true,"content":"<div class=\"container\">A more complex rendering</div>"});</script>'
 ]
 
 { #category : 'tests-Options' }
@@ -125,7 +125,7 @@ BootstrapPopoverTest >> testHtmlTitle [
 	self
 		assert: html
 		equals:
-		'<div id="id1"></div><script type="text/javascript">$("#id1").popover({"html":true,"title":"<div class=\"container\">A complex title<\/div>"});</script>'
+		'<div id="id1"></div><script type="text/javascript">$("#id1").popover({"html":true,"title":"<div class=\"container\">A complex title</div>"});</script>'
 ]
 
 { #category : 'tests-Events' }

diff --git a/source/Willow-Bootstrap-Tests/BootstrapTooltipTest.class.st b/source/Willow-Bootstrap-Tests/BootstrapTooltipTest.class.st
@@ -107,7 +107,7 @@ BootstrapTooltipTest >> testHtmlTitle [
 	self
 		assert: html
 		equals:
-		'<div id="id1"></div><script type="text/javascript">$("#id1").tooltip({"html":true,"title":"<div class=\"container\">A complex tooltip<\/div>"});</script>'
+		'<div id="id1"></div><script type="text/javascript">$("#id1").tooltip({"html":true,"title":"<div class=\"container\">A complex tooltip</div>"});</script>'
 ]
 
 { #category : 'tests-Events' }