[embedlite-components] Cleanup custom tel and sms uri scheme handlers…

…. JB#47892
sailfishos · Feb 4, 2020 · f1e467d · f1e467d
1 parent 7c07430
commit f1e467d
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 253 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,14 +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}

diff --git a/jscomps/Makefile.am b/jscomps/Makefile.am
@@ -19,8 +19,6 @@ jscomps_manifest_DATA = \
 	PromptService.js \
 	PrivateDataManager.js \
 	EmbedliteDownloadManager.js \
-	TelProtocolHandler.js \
-	SmsProtocolHandler.js \
 	MailtoProtocolHandler.js \
 	GeoProtocolHandler.js \
 	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 \

diff --git a/jsscripts/TelURIParser.jsm b/jsscripts/TelURIParser.jsm
diff --git a/link_to_system.sh b/link_to_system.sh
@@ -44,8 +44,6 @@ jscomps/EmbedLiteWebAppInstall.js
 jscomps/PromptService.js
 jscomps/PrivateDataManager.js
 jscomps/EmbedliteDownloadManager.js
-jscomps/TelProtocolHandler.js
-jscomps/SmsProtocolHandler.js
 jscomps/MailtoProtocolHandler.js
 jscomps/GeoProtocolHandler.js
 jscomps/RtspProtocolHandler.js
@@ -64,7 +62,6 @@ rm -rf $TARGET_DIR/chrome/embedlite;
 mkdir -p $TARGET_DIR/chrome/embedlite/content/sync;
 ln -s $(pwd)/jsscripts/embedhelper.js $TARGET_DIR/chrome/embedlite/content/embedhelper.js;
 ln -s $(pwd)/jsscripts/OrientationChangeHandler.jsm $TARGET_DIR/chrome/embedlite/content/OrientationChangeHandler.jsm;
-ln -s $(pwd)/jsscripts/TelURIParser.jsm $TARGET_DIR/chrome/embedlite/content/TelURIParser.jsm;
 ln -s $(pwd)/jsscripts/SelectHelper.js $TARGET_DIR/chrome/embedlite/content/SelectHelper.js;
 ln -s $(pwd)/jsscripts/SelectAsyncHelper.js $TARGET_DIR/chrome/embedlite/content/SelectAsyncHelper.js;
 ln -s $(pwd)/jsscripts/SelectionHandler.js $TARGET_DIR/chrome/embedlite/content/SelectionHandler.js;