Merge pull request #1140 from SeasideSt/develop

Merge develop in master

repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselinesecurity..st

@@ -1,33 +1,21 @@
 baselines
 baselinesecurity: spec
 	spec
-		for: #pharo
-		do: [ spec package: 'Cryptography' with: [ spec repository: 'github://pharo-contributions/Cryptography:0.3.2/source' ].
-			spec
+		for: #squeakCommon
+		do: [ spec
 				package: 'Seaside-Security'
 					with: [ spec
 						requires: #('Seaside-Core' 'Cryptography');
 						includes: #('Seaside-Pharo-Security') ];
 				package: 'Seaside-Pharo-Security';
-				package: 'Seaside-Tests-Security' with: [ spec requires: #('Seaside-Security') ].
-			spec
+				package: 'Seaside-Tests-Security' with: [ spec requires: #('Seaside-Security') ];
 				package: 'Seaside-Tests-Security' with: [ spec includes: #('Seaside-Tests-Pharo-Security') ];
-				package: 'Seaside-Tests-Pharo-Security' ].
-	spec
-		for: #squeak
-		do: [ spec package: 'Cryptography' with: [ spec repository: 'http://www.squeaksource.com/Cryptography' ].
+				package: 'Seaside-Tests-Pharo-Security'.
+
 			spec
-				package: 'Seaside-Security'
-					with: [ spec
-						requires: #('Seaside-Core' 'Cryptography');
-						includes: #('Seaside-Pharo-Security') ];
-				package: 'Seaside-Pharo-Security';
-				package: 'Seaside-Tests-Security' with: [ spec requires: #('Seaside-Security') ].
-			spec
-				package: 'Seaside-Tests-Security' with: [ spec includes: #('Seaside-Tests-Pharo-Security') ];
-				package: 'Seaside-Tests-Pharo-Security' ].
-	spec
-		for: #squeakCommon
-		do: [ spec
 				group: 'Security' with: #('Seaside-Security');
-				group: 'Security Tests' with: #('Seaside-Tests-Security') ]
+				group: 'Security Tests' with: #('Seaside-Tests-Security') ].
+
+	spec for: #pharo do: [ spec package: 'Cryptography' with: [ spec repository: 'github://pharo-contributions/Cryptography:0.3.2/source' ] ].
+
+	spec for: #squeak do: [ spec package: 'Cryptography' with: [ spec repository: 'http://www.squeaksource.com/Cryptography' ] ]

repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/startWelcomeSeasideAdaptorInPharo.st

@@ -1,5 +1,5 @@
 doits
 startWelcomeSeasideAdaptorInPharo
-	WAAdmin defaultServerManager adaptors
+	(Smalltalk globals at: #WAAdmin) defaultServerManager adaptors
 		ifEmpty: [ (Smalltalk globals includesKey: #ZnZincServerAdaptor)
 				ifTrue: [ (Smalltalk globals at: #ZnZincServerAdaptor) startOn: 8080 ] ]

repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/startWelcomeSeasideAdaptorInSqueak.st

@@ -1,6 +1,6 @@
 doits
 startWelcomeSeasideAdaptorInSqueak
-	WAAdmin defaultServerManager adaptors
+	(Smalltalk globals at: #WAAdmin) defaultServerManager adaptors
 		ifEmpty: [ (Smalltalk globals includesKey: #WAWebServerAdaptor)
 				ifTrue: [ ((Smalltalk globals at: #WAWebServerAdaptor) port: 8080)
 						codec: ((Smalltalk globals at: #GRCodec) forEncoding: 'utf-8');

repository/Seaside-Canvas.package/WAAnchorTag.class/instance/targetBlank.st

@@ -0,0 +1,10 @@
+target
+targetBlank
+	"Load the URL into a new browsing context. This is usually a tab, but users can configure browsers to use new windows instead.
+	
+	WARNING:
+	Use with parcimonie. It goes against web development best practices to force the user to open the link in a new tab. Usually your should let the user decide how he wants to open a link.
+	
+	Linking to another page using target=""_blank"" will run the new page on the same process as your page. If the new page is executing expensive JS, your page's performance may suffer. To avoid this use rel=""noopener""."
+
+	self target: '_blank'

repository/Seaside-Canvas.package/WAAnchorTag.class/instance/targetParent.st

@@ -0,0 +1,5 @@
+target
+targetParent
+	"Load the URL into the parent browsing context of the current one. If there is no parent, this behaves the same way as _self."
+
+	self target: '_parent'

repository/Seaside-Canvas.package/WAAnchorTag.class/instance/targetSelf.st

@@ -0,0 +1,5 @@
+target
+targetSelf
+	"Load the URL into the same browsing context as the current one. This is the default behavior."
+
+	self target: '_self'

repository/Seaside-Canvas.package/WAAnchorTag.class/instance/targetTop.st

@@ -0,0 +1,5 @@
+target
+targetTop
+	" Load the URL into the top-level browsing context (that is, the «highest» browsing context that is an ancestor of the current one, and has no parent). If there is no parent, this behaves the same way as _self."
+
+	self target: '_top'

repository/Seaside-Core.package/WABuilder.class/instance/render..st

@@ -1,18 +1,6 @@
 rendering
 render: anObject
-	"Render anObject and return the contents of the resulting Document as a String.
-	anObject must understand #renderOn:. Commonly anObject will be a one-argument
-	block, which will be evaluated with the appropriate renderer."
-
 	^ String streamContents: [ :stream |
-		| context document renderer |
-		document := self documentClass on: stream codec: self codec.
-		document scriptGenerator: self scriptGeneratorClass new.
-		context := WARenderContext new.
-		context document: document.
-		context actionUrl: self actionUrl; resourceUrl: self resourceUrl.
-		renderer := self rendererClass context: context.
-
-		self openDocument: document context: context.
-		renderer render: anObject; flush.
-		self closeDocument: document ]
+		self
+			render: anObject
+			on: stream ]

repository/Seaside-Core.package/WABuilder.class/instance/render.on..st

@@ -0,0 +1,16 @@
+rendering
+render: anObject on: aStream
+	"Render anObject and return the contents of the resulting Document as a String.
+	anObject must understand #renderOn:. Commonly anObject will be a one-argument
+	block, which will be evaluated with the appropriate renderer."
+	| context document renderer |
+	document := self documentClass on: aStream codec: self codec.
+	document scriptGenerator: self scriptGeneratorClass new.
+	context := WARenderContext new.
+	context document: document.
+	context actionUrl: self actionUrl; resourceUrl: self resourceUrl.
+	renderer := self rendererClass context: context.
+
+	self openDocument: document context: context.
+	renderer render: anObject; flush.
+	self closeDocument: document

repository/Seaside-Tests-Canvas.package/WAAnchorTagTest.class/instance/testTargetBlank.st

@@ -0,0 +1,9 @@
+tests
+testTargetBlank
+	self
+		assert: [ :html | 
+			html anchor
+				callback: [  ];
+				targetBlank;
+				with: 'foo' ]
+		gives: '<a target="_blank" href="/?1">foo</a>'

repository/Seaside-Tests-Canvas.package/WAAnchorTagTest.class/instance/testTargetParent.st

@@ -0,0 +1,9 @@
+tests
+testTargetParent
+	self
+		assert: [ :html | 
+			html anchor
+				callback: [  ];
+				targetParent;
+				with: 'foo' ]
+		gives: '<a target="_parent" href="/?1">foo</a>'

repository/Seaside-Tests-Canvas.package/WAAnchorTagTest.class/instance/testTargetSelf.st

@@ -0,0 +1,9 @@
+tests
+testTargetSelf
+	self
+		assert: [ :html | 
+			html anchor
+				callback: [  ];
+				targetSelf;
+				with: 'foo' ]
+		gives: '<a target="_self" href="/?1">foo</a>'

repository/Seaside-Tests-Canvas.package/WAAnchorTagTest.class/instance/testTargetTop.st

@@ -0,0 +1,9 @@
+tests
+testTargetTop
+	self
+		assert: [ :html | 
+			html anchor
+				callback: [  ];
+				targetTop;
+				with: 'foo' ]
+		gives: '<a target="_top" href="/?1">foo</a>'

repository/Seaside-Tests-Canvas.package/WAAnchorTagTest.class/properties.json

@@ -0,0 +1,11 @@
+{
+	"commentStamp" : "",
+	"super" : "WAAbstractCanvasBrushTest",
+	"category" : "Seaside-Tests-Canvas",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [ ],
+	"name" : "WAAnchorTagTest",
+	"type" : "normal"
+}

repository/Seaside-Tests-Canvas.package/WABuilderCanvasTest.class/instance/testRenderOnCustomStream.st

@@ -0,0 +1,10 @@
+tests
+testRenderOnCustomStream
+	| actual |
+	actual := String streamContents: [ :stream |
+		WAHtmlCanvas builder
+			render: [ :html |
+				html unorderedList: [
+					html listItem: 'an item' ] ]
+			on: stream ].
+	self assert: actual = '<ul><li>an item</li></ul>'