Merge 558b40b into a13c6da

hpi-swa-teaching · Jun 28, 2020 · cd36996 · cd36996
2 parents a13c6da + 558b40b
commit cd36996
Show file tree

Hide file tree

Showing 11 changed files with 64 additions and 3 deletions.
diff --git a/packages/MarkdownEditor-Core.package/MarkdownEditor.class/instance/convertToHTML.st b/packages/MarkdownEditor-Core.package/MarkdownEditor.class/instance/convertToHTML.st
@@ -2,10 +2,9 @@ export
 convertToHTML
 
 	| blocks htmlConverter html |
-	Transcript open.
 	self textMorph accept.
 	htmlConverter := MarkdownHtmlConverter new.
 	blocks := self blockTextStyler parse: self textMorph getText asString.
 	html := htmlConverter convert: blocks with: self blockTextStyler styleSettings.
 
-	Transcript show: html
+	MarkdownHtmlExportView openWith: html.
diff --git a/packages/MarkdownEditor-Core.package/MarkdownEditor.class/methodProperties.json b/packages/MarkdownEditor-Core.package/MarkdownEditor.class/methodProperties.json
@@ -9,7 +9,7 @@
 		"buildEditorMenuBarWith:" : "MK 6/21/2020 18:01",
 		"buildEditorTextMorphWith:" : "azi 6/1/2020 15:57",
 		"buildWith:" : "azi 6/12/2020 01:28",
-		"convertToHTML" : "hsl 6/27/2020 14:48",
+		"convertToHTML" : "mas 6/28/2020 13:08",
 		"createNewInstance" : "MK 6/21/2020 17:51",
 		"markdownText" : "lpf 6/13/2019 15:26",
 		"markdownText:" : "azi 6/1/2020 17:33",

diff --git a/packages/MarkdownEditor-Core.package/MarkdownHtmlExportView.class/README.md b/packages/MarkdownEditor-Core.package/MarkdownHtmlExportView.class/README.md
diff --git a/packages/MarkdownEditor-Core.package/MarkdownHtmlExportView.class/class/openWith..st b/packages/MarkdownEditor-Core.package/MarkdownHtmlExportView.class/class/openWith..st
@@ -0,0 +1,8 @@
+as yet unclassified
+openWith: aHtmlString
+
+	^ self new 
+		initializeWithLabel: 'Markdown Editor - HTML Export';
+		initializeContentWith: aHtmlString; 
+		openInWorld;
+		yourself
diff --git a/...rkdownEditor-Core.package/MarkdownHtmlExportView.class/instance/initializeContentWith..st b/...rkdownEditor-Core.package/MarkdownHtmlExportView.class/instance/initializeContentWith..st
@@ -0,0 +1,4 @@
+as yet unclassified
+initializeContentWith: aHtmlString
+
+	self addMorph: (PluggableTextMorph new setText: aHtmlString) frame: (0@0 corner: 1@1).
diff --git a/packages/MarkdownEditor-Core.package/MarkdownHtmlExportView.class/methodProperties.json b/packages/MarkdownEditor-Core.package/MarkdownHtmlExportView.class/methodProperties.json
@@ -0,0 +1,5 @@
+{
+	"class" : {
+		"openWith:" : "mas 6/28/2020 13:30" },
+	"instance" : {
+		"initializeContentWith:" : "mas 6/28/2020 13:10" } }
diff --git a/packages/MarkdownEditor-Core.package/MarkdownHtmlExportView.class/properties.json b/packages/MarkdownEditor-Core.package/MarkdownHtmlExportView.class/properties.json
@@ -0,0 +1,14 @@
+{
+	"category" : "MarkdownEditor-Core",
+	"classinstvars" : [
+		 ],
+	"classvars" : [
+		 ],
+	"commentStamp" : "",
+	"instvars" : [
+		 ],
+	"name" : "MarkdownHtmlExportView",
+	"pools" : [
+		 ],
+	"super" : "SystemWindow",
+	"type" : "normal" }
diff --git a/packages/MarkdownEditor-Tests.package/MarkdownHtmlExportViewTest.class/README.md b/packages/MarkdownEditor-Tests.package/MarkdownHtmlExportViewTest.class/README.md
diff --git a/...sts.package/MarkdownHtmlExportViewTest.class/instance/testCreateMarkdownHtmlExportView.st b/...sts.package/MarkdownHtmlExportViewTest.class/instance/testCreateMarkdownHtmlExportView.st
@@ -0,0 +1,12 @@
+as yet unclassified
+testCreateMarkdownHtmlExportView
+
+	| exportView pluggableTextMorphs |
+
+	exportView := MarkdownHtmlExportView openWith: '<!DOCTYPE html><html>Some HTML</html>'.
+	pluggableTextMorphs := exportView submorphs select: [:morph | morph isKindOf: PluggableTextMorph].
+	exportView abandon.
+
+	self assert: pluggableTextMorphs size = 1.
+	self assert: pluggableTextMorphs first text = '<!DOCTYPE html><html>Some HTML</html>'.
+
diff --git a/packages/MarkdownEditor-Tests.package/MarkdownHtmlExportViewTest.class/methodProperties.json b/packages/MarkdownEditor-Tests.package/MarkdownHtmlExportViewTest.class/methodProperties.json
@@ -0,0 +1,5 @@
+{
+	"class" : {
+		 },
+	"instance" : {
+		"testCreateMarkdownHtmlExportView" : "mas 6/28/2020 13:34" } }
diff --git a/packages/MarkdownEditor-Tests.package/MarkdownHtmlExportViewTest.class/properties.json b/packages/MarkdownEditor-Tests.package/MarkdownHtmlExportViewTest.class/properties.json
@@ -0,0 +1,14 @@
+{
+	"category" : "MarkdownEditor-Tests",
+	"classinstvars" : [
+		 ],
+	"classvars" : [
+		 ],
+	"commentStamp" : "",
+	"instvars" : [
+		 ],
+	"name" : "MarkdownHtmlExportViewTest",
+	"pools" : [
+		 ],
+	"super" : "TestCase",
+	"type" : "normal" }