From d9ed36e3f3077fa8a47637b5ed08374686b9c3de Mon Sep 17 00:00:00 2001 From: daria <95225431+dariiing@users.noreply.github.com> Date: Wed, 24 Sep 2025 15:11:40 +0300 Subject: [PATCH] remove FA dependency --- customize.dist/template.js | 2 -- www/admin/inner.js | 1 - www/calendar/inner.js | 1 - www/checkup/main.js | 1 - www/checkup/sandbox/main.js | 1 - www/common/common-icons.js | 3 ++- www/common/sframe-app-framework.js | 1 - www/contacts/inner.js | 1 - www/convert/inner.js | 1 - www/debug/inner.js | 1 - www/drive/inner.js | 1 - www/file/inner.js | 1 - www/form/inner.js | 1 - www/install/main.js | 1 - www/install/onboardscreen.js | 2 -- www/login/main.js | 1 - www/moderation/inner.js | 1 - www/notifications/inner.js | 1 - www/oldadmin/inner.js | 1 - www/pad/inner.js | 1 - www/poll/inner.js | 1 - www/profile/inner.js | 1 - www/recovery/main.js | 1 - www/register/main.js | 2 -- www/report/main.js | 1 - www/secureiframe/inner.js | 1 - www/settings/inner.js | 1 - www/slide/inner.js | 1 - www/support/inner.js | 1 - www/teams/inner.js | 1 - www/todo/inner.js | 1 - www/worker/inner.js | 1 - 32 files changed, 2 insertions(+), 35 deletions(-) diff --git a/customize.dist/template.js b/customize.dist/template.js index 95c6b7578..fdf6088cf 100644 --- a/customize.dist/template.js +++ b/customize.dist/template.js @@ -8,8 +8,6 @@ define([ '/customize/pages.js', '/components/nthen/index.js', '/customize/fonts/lucide.js', - - 'css!/components/components-font-awesome/css/font-awesome.min.css', ], function ($, h, Pages, nThen, Lucide) { // we consider that there is no valid reason to load any of the info pages // in an iframe. abort everything if you detect that you are embedded. diff --git a/www/admin/inner.js b/www/admin/inner.js index 2d9128092..39ee5f145 100644 --- a/www/admin/inner.js +++ b/www/admin/inner.js @@ -27,7 +27,6 @@ define([ 'css!/lib/datepicker/flatpickr.min.css', 'css!/components/bootstrap/dist/css/bootstrap.min.css', - 'css!/components/components-font-awesome/css/font-awesome.min.css', 'less!/admin/app-admin.less', ], function( $, diff --git a/www/calendar/inner.js b/www/calendar/inner.js index 8d6161e41..646353dd6 100644 --- a/www/calendar/inner.js +++ b/www/calendar/inner.js @@ -44,7 +44,6 @@ define([ 'css!/lib/calendar/tui-calendar.min.css', 'css!/components/codemirror/lib/codemirror.css', 'css!/components/codemirror/addon/dialog/dialog.css', - 'css!/components/components-font-awesome/css/font-awesome.min.css', 'css!/components/bootstrap/dist/css/bootstrap.min.css', 'less!/calendar/app-calendar.less', ], function ( diff --git a/www/checkup/main.js b/www/checkup/main.js index e3e8544da..104964c60 100644 --- a/www/checkup/main.js +++ b/www/checkup/main.js @@ -25,7 +25,6 @@ define([ '/common/common-icons.js', '/components/tweetnacl/nacl-fast.min.js', - 'css!/components/components-font-awesome/css/font-awesome.min.css', 'less!/checkup/app-checkup.less', ], function ($, ApiConfig, Assertions, h, Messages, DomReady, nThen, SFCommonO, Login, Hash, Util, Pinpad, diff --git a/www/checkup/sandbox/main.js b/www/checkup/sandbox/main.js index dd2af4dbd..089914c61 100644 --- a/www/checkup/sandbox/main.js +++ b/www/checkup/sandbox/main.js @@ -8,7 +8,6 @@ define([ '/checkup/checkup-tools.js', '/components/tweetnacl/nacl-fast.min.js', - 'css!/components/components-font-awesome/css/font-awesome.min.css', 'less!/checkup/app-checkup.less', ], function ($, Util, Tools) { var postMessage = function (content) { diff --git a/www/common/common-icons.js b/www/common/common-icons.js index d16881cb8..900b38997 100644 --- a/www/common/common-icons.js +++ b/www/common/common-icons.js @@ -246,7 +246,8 @@ define([ Icons.get = (name, attrs = {}) => { if (!map[name]) { - throw new Error(`Invalid icon: ${name}`); + alert(`Invalid icon: ${name}`); + // throw new Error(`Invalid icon: ${name}`); } attrs['data-lucide'] = map[name]; attrs['aria-hidden'] = "true"; diff --git a/www/common/sframe-app-framework.js b/www/common/sframe-app-framework.js index 3dbfe6cfa..5e900c951 100644 --- a/www/common/sframe-app-framework.js +++ b/www/common/sframe-app-framework.js @@ -24,7 +24,6 @@ define([ '/components/file-saver/FileSaver.min.js', 'css!/components/bootstrap/dist/css/bootstrap.min.css', - 'css!/components/components-font-awesome/css/font-awesome.min.css', ], function ( $, Hyperjson, diff --git a/www/contacts/inner.js b/www/contacts/inner.js index 9a892a885..7271ad85a 100644 --- a/www/contacts/inner.js +++ b/www/contacts/inner.js @@ -15,7 +15,6 @@ define([ '/customize/fonts/lucide.js', 'css!/components/bootstrap/dist/css/bootstrap.min.css', - 'css!/components/components-font-awesome/css/font-awesome.min.css', 'less!/contacts/app-contacts.less', ], function ( $, diff --git a/www/convert/inner.js b/www/convert/inner.js index 7f55d51af..0ec34aebc 100644 --- a/www/convert/inner.js +++ b/www/convert/inner.js @@ -17,7 +17,6 @@ define([ '/common/outer/x2t.js', '/components/file-saver/FileSaver.min.js', 'css!/components/bootstrap/dist/css/bootstrap.min.css', - 'css!/components/components-font-awesome/css/font-awesome.min.css', 'less!/convert/app-convert.less', ], function ( $, diff --git a/www/debug/inner.js b/www/debug/inner.js index 561a7bdc1..9512662ff 100644 --- a/www/debug/inner.js +++ b/www/debug/inner.js @@ -25,7 +25,6 @@ define([ '/common/common-icons.js', 'css!/components/bootstrap/dist/css/bootstrap.min.css', - 'css!/components/components-font-awesome/css/font-awesome.min.css', 'less!/debug/app-debug.less', ], function ( $, diff --git a/www/drive/inner.js b/www/drive/inner.js index 0d92cdc4d..cec88cc26 100644 --- a/www/drive/inner.js +++ b/www/drive/inner.js @@ -18,7 +18,6 @@ define([ '/customize/messages.js', 'css!/components/bootstrap/dist/css/bootstrap.min.css', - 'css!/components/components-font-awesome/css/font-awesome.min.css', 'less!/drive/app-drive.less', ], function ( $, diff --git a/www/file/inner.js b/www/file/inner.js index 5f7bc20ba..3eaf80d90 100644 --- a/www/file/inner.js +++ b/www/file/inner.js @@ -18,7 +18,6 @@ define([ '/components/file-saver/FileSaver.min.js', 'css!/components/bootstrap/dist/css/bootstrap.min.css', - 'css!/components/components-font-awesome/css/font-awesome.min.css', 'less!/file/app-file.less', ], function ( diff --git a/www/form/inner.js b/www/form/inner.js index dbfabf343..da85324af 100644 --- a/www/form/inner.js +++ b/www/form/inner.js @@ -50,7 +50,6 @@ define([ 'css!/components/codemirror/addon/dialog/dialog.css', 'css!/components/codemirror/addon/fold/foldgutter.css', 'css!/lib/datepicker/flatpickr.min.css', - 'css!/components/components-font-awesome/css/font-awesome.min.css', 'less!/form/app-form.less', ], function ( $, diff --git a/www/install/main.js b/www/install/main.js index 47325f899..9488b3fab 100644 --- a/www/install/main.js +++ b/www/install/main.js @@ -21,7 +21,6 @@ define([ '/common/common-icons.js', 'less!/install/onboarding.less', - 'css!/components/components-font-awesome/css/font-awesome.min.css', ], function ($, Login, Cryptpad, /*Test,*/ Cred, UI, Util, Realtime, Constants, Feedback, LocalStore, h, Pages, Rpc, OnboardScreen, Lucide, Icons) { if (window.top !== window) { return; } var Messages = Cryptpad.Messages; diff --git a/www/install/onboardscreen.js b/www/install/onboardscreen.js index c686a00bc..78b26e02f 100644 --- a/www/install/onboardscreen.js +++ b/www/install/onboardscreen.js @@ -17,8 +17,6 @@ define([ '/common/common-icons.js', 'css!/components/bootstrap/dist/css/bootstrap.min.css', - 'css!/components/components-font-awesome/css/font-awesome.min.css', - ], function( $, Sidebar, diff --git a/www/login/main.js b/www/login/main.js index 7e04ca4ba..6722777ff 100644 --- a/www/login/main.js +++ b/www/login/main.js @@ -14,7 +14,6 @@ define([ '/common/outer/local-store.js', //'/common/test.js', - 'css!/components/components-font-awesome/css/font-awesome.min.css', ], function (Config, $, h, Cryptpad, Login, UI, Realtime, Feedback, LocalStore /*, Test */) { if (window.top !== window) { return; } $(function () { diff --git a/www/moderation/inner.js b/www/moderation/inner.js index 831e59366..a0bc04923 100644 --- a/www/moderation/inner.js +++ b/www/moderation/inner.js @@ -22,7 +22,6 @@ define([ '/components/file-saver/FileSaver.min.js', - 'css!/components/components-font-awesome/css/font-awesome.min.css', 'less!/moderation/app-moderation.less', ], function ( $, diff --git a/www/notifications/inner.js b/www/notifications/inner.js index fab5a98ba..9eca45ab9 100644 --- a/www/notifications/inner.js +++ b/www/notifications/inner.js @@ -19,7 +19,6 @@ define([ '/common/common-icons.js', 'css!/components/bootstrap/dist/css/bootstrap.min.css', - 'css!/components/components-font-awesome/css/font-awesome.min.css', 'less!/notifications/app-notifications.less', ], function ( $, diff --git a/www/oldadmin/inner.js b/www/oldadmin/inner.js index a95813ac8..f198faf43 100644 --- a/www/oldadmin/inner.js +++ b/www/oldadmin/inner.js @@ -28,7 +28,6 @@ define([ 'css!/lib/datepicker/flatpickr.min.css', 'css!/components/bootstrap/dist/css/bootstrap.min.css', - 'css!/components/components-font-awesome/css/font-awesome.min.css', 'less!/admin/app-admin.less', ], function ( $, diff --git a/www/pad/inner.js b/www/pad/inner.js index 5c135b5c0..9d293c735 100644 --- a/www/pad/inner.js +++ b/www/pad/inner.js @@ -56,7 +56,6 @@ define([ 'css!/customize/src/print.css', 'css!/components/bootstrap/dist/css/bootstrap.min.css', - 'css!/components/components-font-awesome/css/font-awesome.min.css', 'less!/pad/app-pad.less' ], function( $, diff --git a/www/poll/inner.js b/www/poll/inner.js index c6476e7f5..dec79fdd1 100644 --- a/www/poll/inner.js +++ b/www/poll/inner.js @@ -34,7 +34,6 @@ define([ '/components/file-saver/FileSaver.min.js', 'css!/components/bootstrap/dist/css/bootstrap.min.css', - 'css!/components/components-font-awesome/css/font-awesome.min.css', 'less!/poll/app-poll.less', ], function ( $, diff --git a/www/profile/inner.js b/www/profile/inner.js index 1a6b3d040..6ea6413fb 100644 --- a/www/profile/inner.js +++ b/www/profile/inner.js @@ -26,7 +26,6 @@ define([ '/common/common-icons.js', 'css!/components/bootstrap/dist/css/bootstrap.min.css', - 'css!/components/components-font-awesome/css/font-awesome.min.css', 'less!/profile/app-profile.less', ], function ( ApiConfig, diff --git a/www/recovery/main.js b/www/recovery/main.js index 4e1c50bab..b89b5df6c 100644 --- a/www/recovery/main.js +++ b/www/recovery/main.js @@ -21,7 +21,6 @@ define([ '/components/tweetnacl/nacl-fast.min.js', - 'css!/components/components-font-awesome/css/font-awesome.min.css', ], function ($, Sortify, Login, Cryptpad, /*Test,*/ Cred, UI, Util, Realtime, Constants, Feedback, Clipboard, LocalStore, Block, ServerCommand) { if (window.top !== window) { return; } diff --git a/www/register/main.js b/www/register/main.js index d79b7ec86..d17229e91 100644 --- a/www/register/main.js +++ b/www/register/main.js @@ -19,8 +19,6 @@ define([ '/customize/pages.js', '/customize/fonts/lucide.js', '/common/common-icons.js', - - 'css!/components/components-font-awesome/css/font-awesome.min.css', ], function (Config, $, Login, Cryptpad, Cred, UI, Util, Realtime, Constants, Feedback, LocalStore, h, Extensions, Pages, Lucide, Icons) { if (window.top !== window) { return; } var Messages = Cryptpad.Messages; diff --git a/www/report/main.js b/www/report/main.js index 2a0205f5a..8134100b6 100644 --- a/www/report/main.js +++ b/www/report/main.js @@ -27,7 +27,6 @@ define([ '/components/tweetnacl/nacl-fast.min.js', - 'css!/components/components-font-awesome/css/font-awesome.min.css', 'less!/customize/src/less2/pages/page-report.less', ], function ($, ApiConfig, h, Messages, nThen, Hash, Util, Constants, Crypt, Cryptpad, Cache, UI, CPNetflux, diff --git a/www/secureiframe/inner.js b/www/secureiframe/inner.js index 001eaa660..29a3effcf 100644 --- a/www/secureiframe/inner.js +++ b/www/secureiframe/inner.js @@ -18,7 +18,6 @@ define([ '/common/common-icons.js', 'css!/components/bootstrap/dist/css/bootstrap.min.css', - 'css!/components/components-font-awesome/css/font-awesome.min.css', 'less!/secureiframe/app-secure.less', ], function ( $, diff --git a/www/settings/inner.js b/www/settings/inner.js index 7131c0a4e..4f3e672c3 100644 --- a/www/settings/inner.js +++ b/www/settings/inner.js @@ -37,7 +37,6 @@ define([ 'css!/components/codemirror/addon/dialog/dialog.css', 'css!/components/codemirror/addon/fold/foldgutter.css', 'css!/components/bootstrap/dist/css/bootstrap.min.css', - 'css!/components/components-font-awesome/css/font-awesome.min.css', 'less!/settings/app-settings.less', ], function( $, diff --git a/www/slide/inner.js b/www/slide/inner.js index 5f3ae94ae..2b271774e 100644 --- a/www/slide/inner.js +++ b/www/slide/inner.js @@ -21,7 +21,6 @@ define([ '/common/common-icons.js', 'css!/components/bootstrap/dist/css/bootstrap.min.css', - 'css!/components/components-font-awesome/css/font-awesome.min.css', 'css!/customize/src/print-landscape.css', 'less!/slide/app-slide.less', diff --git a/www/support/inner.js b/www/support/inner.js index 53dcc3263..8e5709573 100644 --- a/www/support/inner.js +++ b/www/support/inner.js @@ -21,7 +21,6 @@ define([ '/common/common-icons.js', 'css!/components/bootstrap/dist/css/bootstrap.min.css', - 'css!/components/components-font-awesome/css/font-awesome.min.css', 'less!/support/app-support.less', ], function ( $, diff --git a/www/teams/inner.js b/www/teams/inner.js index 93135494a..e3a261042 100644 --- a/www/teams/inner.js +++ b/www/teams/inner.js @@ -29,7 +29,6 @@ define([ '/components/file-saver/FileSaver.min.js', 'css!/components/bootstrap/dist/css/bootstrap.min.css', - 'css!/components/components-font-awesome/css/font-awesome.min.css', 'less!/teams/app-team.less', ], function ( $, diff --git a/www/todo/inner.js b/www/todo/inner.js index 3b2303faa..cc156589e 100644 --- a/www/todo/inner.js +++ b/www/todo/inner.js @@ -18,7 +18,6 @@ define([ '/common/common-icons.js', 'css!/components/bootstrap/dist/css/bootstrap.min.css', - 'css!/components/components-font-awesome/css/font-awesome.min.css', 'less!/todo/app-todo.less', ], function ( $, diff --git a/www/worker/inner.js b/www/worker/inner.js index 253986511..0eecb58e2 100644 --- a/www/worker/inner.js +++ b/www/worker/inner.js @@ -12,7 +12,6 @@ define([ '/customize/messages.js', 'css!/components/bootstrap/dist/css/bootstrap.min.css', - 'css!/components/components-font-awesome/css/font-awesome.min.css', 'less!/worker/app-worker.less', ], function ( $,