Merge pull request #38 from SWTI2014/bug/remove-flash-support

Ref #19: Remove Flash support
hpi-swa-teaching · May 8, 2014 · 12109b9 · 12109b9
2 parents e2ab8ca + 717f1a0
commit 12109b9
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 34 deletions.
diff --git a/packages/HTML.package/HtmlEmbedded.class/class/initialize.st b/packages/HTML.package/HtmlEmbedded.class/class/initialize.st
@@ -3,5 +3,6 @@ initialize
 	"HtmlEmbedded initialize"
 	ExtensionList := Dictionary new.
 	#(
-		('swf'	FlashPlayerMorph)
+		"Plugins for embedded HTML elements should be registered here in the form:"
+		"('type'	MorphClassName)"
 	) do:[:spec| ExtensionList at: spec first put: spec last].
diff --git a/packages/HTML.package/HtmlEmbedded.class/methodProperties.json b/packages/HTML.package/HtmlEmbedded.class/methodProperties.json
@@ -1,6 +1,6 @@
 {
 	"class" : {
-		"initialize" : "LaurentLaffont 2/26/2010 23:13" },
+		"initialize" : "SN 5/8/2014 09:43" },
 	"instance" : {
 		"addToFormatter:" : "LaurentLaffont 2/26/2010 23:13",
 		"embeddedMorphClassFor:" : "LaurentLaffont 2/26/2010 23:13",

diff --git a/...ges/HTML.package/monticello.meta/version.d/HTML-SN.7_60975eb9-f7c2-164d-88bd-c804986a3f4f b/...ges/HTML.package/monticello.meta/version.d/HTML-SN.7_60975eb9-f7c2-164d-88bd-c804986a3f4f
@@ -0,0 +1 @@
+(name 'HTML-SN.7'message 'Remove Flash support.'id '60975eb9-f7c2-164d-88bd-c804986a3f4f'date '8 May 2014'time '9:50:40.041 am'author 'SN'ancestors ((id '75479991-c0aa-6148-8dcb-27777e39f39a'))stepChildren ())

diff --git a/packages/Scamper-Core.package/Scamper.class/instance/displayDocument..st b/packages/Scamper-Core.package/Scamper.class/instance/displayDocument..st
@@ -17,9 +17,6 @@ displayDocument: mimeDocument
 	(mimeDocument contentType beginsWith: 'text/html') 
 		ifTrue: [handled := self displayTextHtmlPage: mimeDocument].
 
-	mimeDocument contentType = 'x-application/shockwave-flash'
-		ifTrue:[handled := self displayFlashPage: mimeDocument].
-
 	(#('audio/midi' 'audio/x-midi') includes: mimeDocument contentType) 
 		ifTrue: [handled := self processMidiPage: mimeDocument].
 
@@ -30,8 +27,6 @@ displayDocument: mimeDocument
 			ifTrue:[handled := self displayImagePage: mimeDocument].
 		(handled not and:[urlString endsWithAnyOf: #('.mid' '.midi')])
 			ifTrue:[handled := self processMidiPage: mimeDocument].
-		(handled not and:[urlString endsWith: '.swf'])
-			ifTrue:[handled := self displayFlashPage: mimeDocument].
 	].
 
 	(handled not and: [ mimeDocument mainType = 'text']) ifTrue: [

diff --git a/packages/Scamper-Core.package/Scamper.class/instance/displayFlashPage..st b/packages/Scamper-Core.package/Scamper.class/instance/displayFlashPage..st
diff --git a/packages/Scamper-Core.package/Scamper.class/methodProperties.json b/packages/Scamper-Core.package/Scamper.class/methodProperties.json
@@ -34,8 +34,7 @@
 		"currentUrl" : "ls 7/14/1998 03:18",
 		"defaultBackgroundColor" : "bolot 2/27/2000 20:59",
 		"defaultWorkerCount" : "ckl 8/14/2005 16:37",
-		"displayDocument:" : "LaurentLaffont 2/26/2010 23:08",
-		"displayFlashPage:" : "LaurentLaffont 2/26/2010 23:08",
+		"displayDocument:" : "SN 5/8/2014 09:44",
 		"displayHistory" : "LaurentLaffont 2/26/2010 23:08",
 		"displayImagePage:" : "LaurentLaffont 2/26/2010 23:08",
 		"displayPlainTextPage:" : "LaurentLaffont 2/26/2010 23:08",

diff --git a/packages/Scamper-Core.package/monticello.meta/version b/packages/Scamper-Core.package/monticello.meta/version
@@ -1 +1 @@
-176fbee5-0f10-8142-b93f-23d8a6ee4305
+e9c60c5e-1ec2-5c4a-9adf-1860354d5239
diff --git a/...package/monticello.meta/version.d/Scamper-Core-SN.23_e9c60c5e-1ec2-5c4a-9adf-1860354d5239 b/...package/monticello.meta/version.d/Scamper-Core-SN.23_e9c60c5e-1ec2-5c4a-9adf-1860354d5239
@@ -0,0 +1 @@
+(name 'Scamper-Core-SN.23'message 'Remove Flash support.'id 'e9c60c5e-1ec2-5c4a-9adf-1860354d5239'date '8 May 2014'time '9:47:59.025 am'author 'SN'ancestors ((id '176fbee5-0f10-8142-b93f-23d8a6ee4305'))stepChildren ())
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		(name 'HTML-SN.7'message 'Remove Flash support.'id '60975eb9-f7c2-164d-88bd-c804986a3f4f'date '8 May 2014'time '9:50:40.041 am'author 'SN'ancestors ((id '75479991-c0aa-6148-8dcb-27777e39f39a'))stepChildren ())
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		176fbee5-0f10-8142-b93f-23d8a6ee4305
		e9c60c5e-1ec2-5c4a-9adf-1860354d5239
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		(name 'Scamper-Core-SN.23'message 'Remove Flash support.'id 'e9c60c5e-1ec2-5c4a-9adf-1860354d5239'date '8 May 2014'time '9:47:59.025 am'author 'SN'ancestors ((id '176fbee5-0f10-8142-b93f-23d8a6ee4305'))stepChildren ())
Expand Down