Offray/Brea
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Making bodyTag optinal in HTML templates, in preparation for JSON support.

Browse Source
This commit is contained in:
Offray Vladimir Luna Cárdenas 2020-11-07 11:47:41 -05:00
parent cd938cf480
commit 45f1ac84b1
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
repository/Brea/BreaPage.class.st
View File

@ -73,15 +73,12 @@ BreaPage >> contentsFile [
{ #category : #'as yet unclassified' } { #category : #'as yet unclassified' }
BreaPage >> exportAsHTML [ BreaPage >> exportAsHTML [
| htmlContents allActions semaphore result | | htmlContents allActions actionsArray semaphore result |
self shortName ifNil: [ ^ self ]. self shortName ifNil: [ ^ self ].
self template ifNil: [ ^ self ]. self template ifNil: [ ^ self ].
self bodyTag ifNil: [ ^ self ]. actionsArray := { [ self populateMetadata ] future. [ self split ] future. }.
allActions := TKTFuture all: { self bodyTag ifNotNil: [ actionsArray := actionsArray copyWith: [ self populateBodyAs: self bodyTag ] future ].
[ self populateMetadata ] future. allActions := TKTFuture all: actionsArray.
[ self split ] future.
[ self populateBodyAs: self bodyTag ] future.
}.
semaphore := Semaphore new. semaphore := Semaphore new.
allActions onSuccessDo: [ :values | allActions onSuccessDo: [ :values |
result := values last. result := values last.
@ -94,7 +91,8 @@ BreaPage >> exportAsHTML [
{ #category : #accessing } { #category : #accessing }
BreaPage >> file [ BreaPage >> file [
^ file (self shortName isNil or: [ self folder isNil ]) ifTrue: [ ^ nil ].
^ file ifNil: [ ^ BreaFile fromShortName: self shortName andFolder: self folder ]
] ]
{ #category : #accessing } { #category : #accessing }
@ -134,6 +132,7 @@ BreaPage >> metadata: aDictionary [
{ #category : #'as yet unclassified' } { #category : #'as yet unclassified' }
BreaPage >> populateBodyAs: key [ BreaPage >> populateBodyAs: key [
| allActions result semaphore | | allActions result semaphore |
"(self file isMarkdown and: [ self bodyTag isNil ]) ifTrue: [ ^ self ]".
allActions := TKTFuture all: { allActions := TKTFuture all: {
[ self bodyContentsAsHTML ] future. [ self bodyContentsAsHTML ] future.
}. }.