Merge branch 'jb47892' into 'master'

Cleanup custom scheme handlers See merge request mer-core/embedlite-components!45
sailfishos · Feb 5, 2020 · ef60d4d · ef60d4d
2 parents fb6497d + 1aff614
commit ef60d4d
Show file tree

Hide file tree

Showing 12 changed files with 3 additions and 416 deletions.
diff --git a/embedlite-components.pro b/embedlite-components.pro
@@ -16,8 +16,10 @@ SUBDIRS += search-engines
 
 OTHER_FILES += \
     jsscripts/*.js \
+    jsscripts/*.jsm \
     jsscripts/*.xml \
     jsscripts/sync/*.js \
     jscomps/*.js \
+    jscomps/*.jsm \
     overrides/* \
     configure.ac
diff --git a/jscomps/EmbedLiteJSComponents.manifest b/jscomps/EmbedLiteJSComponents.manifest
@@ -87,26 +87,6 @@ component {6a7dd2ef-b7c8-4ab5-8c35-c0e5d7557ccf} PrivateDataManager.js
 contract @mozilla.org/embedlite/private-data-manager;1 {6a7dd2ef-b7c8-4ab5-8c35-c0e5d7557ccf}
 category app-startup PrivateDataManager service,@mozilla.org/embedlite/private-data-manager;1
 
-# TelProtocolHandler.js
-component {7157f5ac-7436-48be-8939-2425579b6d40} TelProtocolHandler.js
-contract @mozilla.org/network/protocol;1?name=tel {7157f5ac-7436-48be-8939-2425579b6d40}
-
-# SmsProtocolHandler.js
-component {06827058-5807-4a23-a9fe-b21b9775702e} SmsProtocolHandler.js
-contract @mozilla.org/network/protocol;1?name=sms {06827058-5807-4a23-a9fe-b21b9775702e}
-
-# MailtoProtocolHandler.js
-component {25cbc673-c16b-4bec-affd-8d57398af512} MailtoProtocolHandler.js
-contract @mozilla.org/network/protocol;1?name=mailto {25cbc673-c16b-4bec-affd-8d57398af512}
-
-# GeoProtocolHandler.js
-component {0b452f2d-c6b3-4aee-9a73-dec5a812d2e3} GeoProtocolHandler.js
-contract @mozilla.org/network/protocol;1?name=geo {0b452f2d-c6b3-4aee-9a73-dec5a812d2e3}
-
-# RtspProtocolHandler.js
-component {d43dab24-fab1-11e3-b977-3c970e7aaa3d} RtspProtocolHandler.js
-contract @mozilla.org/network/protocol;1?name=rtsp {d43dab24-fab1-11e3-b977-3c970e7aaa3d}
-
 # EmbedliteDownloadManager.js
 component {71b0a6e8-83ac-4006-af97-d66009db97c8} EmbedliteDownloadManager.js
 contract @mozilla.org/embedlite/download-manager;1 {71b0a6e8-83ac-4006-af97-d66009db97c8}

diff --git a/jscomps/GeoProtocolHandler.js b/jscomps/GeoProtocolHandler.js
diff --git a/jscomps/MailtoProtocolHandler.js b/jscomps/MailtoProtocolHandler.js
diff --git a/jscomps/Makefile.am b/jscomps/Makefile.am
@@ -19,11 +19,6 @@ jscomps_manifest_DATA = \
 	PromptService.js \
 	PrivateDataManager.js \
 	EmbedliteDownloadManager.js \
-	TelProtocolHandler.js \
-	SmsProtocolHandler.js \
-	MailtoProtocolHandler.js \
-	GeoProtocolHandler.js \
-	RtspProtocolHandler.js \
 	$(NULL)
 
 AM_CPPFLAGS = $(DEPS_CFLAGS)
diff --git a/jscomps/RtspProtocolHandler.js b/jscomps/RtspProtocolHandler.js
diff --git a/jscomps/SmsProtocolHandler.js b/jscomps/SmsProtocolHandler.js
diff --git a/jscomps/TelProtocolHandler.js b/jscomps/TelProtocolHandler.js
diff --git a/jsscripts/Makefile.am b/jsscripts/Makefile.am
@@ -1,6 +1,5 @@
 jsscripts_manifestdir=$(libdir)/mozembedlite/chrome/embedlite/content
 jsscripts_manifest_DATA = \
-	TelURIParser.jsm \
 	embedhelper.js \
 	OrientationChangeHandler.jsm \
 	SelectHelper.js \