From 9019d92291eb20cdbbbe97063e3218d4cc1d9037 Mon Sep 17 00:00:00 2001 From: Pamplemousse Date: Sat, 7 Jan 2023 12:49:46 +0100 Subject: [PATCH] removing `bower`: migrate `nthen` Signed-off-by: Pamplemousse --- bower.json | 1 - customize.dist/login.js | 2 +- customize.dist/template.js | 2 +- scripts/copy-components.js | 1 + www/admin/inner.js | 2 +- www/admin/main.js | 2 +- www/calendar/inner.js | 2 +- www/calendar/main.js | 2 +- www/checkup/main.js | 2 +- www/code/inner.js | 2 +- www/common/LessLoader.js | 2 +- www/common/common-ui-elements.js | 2 +- www/common/cryptget.js | 2 +- www/common/cryptpad-common.js | 2 +- www/common/drive-ui.js | 2 +- www/common/inner/access.js | 2 +- www/common/inner/common-modal.js | 2 +- www/common/inner/properties.js | 2 +- www/common/inner/share.js | 2 +- www/common/inner/snapshots.js | 2 +- www/common/make-backup.js | 2 +- www/common/migrate-user-object.js | 2 +- www/common/onlyoffice/inner.js | 2 +- www/common/onlyoffice/main.js | 2 +- www/common/onlyoffice/ooiframe.js | 2 +- www/common/outer/async-store.js | 2 +- www/common/outer/calendar.js | 2 +- www/common/outer/history.js | 2 +- www/common/outer/messenger.js | 2 +- www/common/outer/roster.js | 2 +- www/common/outer/sharedfolder.js | 2 +- www/common/outer/team.js | 2 +- www/common/outer/upload.js | 2 +- www/common/outer/x2t.js | 2 +- www/common/proxy-manager.js | 2 +- www/common/sframe-app-framework.js | 2 +- www/common/sframe-app-outer.js | 2 +- www/common/sframe-common-file.js | 2 +- www/common/sframe-common-history.js | 2 +- www/common/sframe-common-outer.js | 2 +- www/common/sframe-common.js | 2 +- www/contacts/inner.js | 2 +- www/contacts/main.js | 2 +- www/convert/inner.js | 2 +- www/convert/main.js | 2 +- www/debug/inner.js | 2 +- www/debug/main.js | 2 +- www/drive/inner.js | 2 +- www/drive/main.js | 2 +- www/file/inner.js | 2 +- www/file/main.js | 2 +- www/form/inner.js | 2 +- www/form/main.js | 2 +- www/kanban/inner.js | 2 +- www/logout/main.js | 2 +- www/notifications/inner.js | 2 +- www/notifications/main.js | 2 +- www/pad/export.js | 2 +- www/pad/inner.js | 2 +- www/poll/inner.js | 2 +- www/poll/main.js | 2 +- www/profile/inner.js | 2 +- www/profile/main.js | 2 +- www/report/main.js | 2 +- www/secureiframe/inner.js | 2 +- www/secureiframe/main.js | 2 +- www/settings/inner.js | 2 +- www/settings/main.js | 2 +- www/slide/inner.js | 2 +- www/support/inner.js | 2 +- www/support/main.js | 2 +- www/teams/inner.js | 2 +- www/teams/main.js | 2 +- www/todo/inner.js | 2 +- www/unsafeiframe/inner.js | 2 +- www/unsafeiframe/main.js | 2 +- www/whiteboard/inner.js | 2 +- www/worker/inner.js | 2 +- www/worker/main.js | 2 +- 79 files changed, 78 insertions(+), 78 deletions(-) diff --git a/bower.json b/bower.json index a0c2cb6b2..fb203dfbc 100644 --- a/bower.json +++ b/bower.json @@ -18,7 +18,6 @@ "tests" ], "dependencies": { - "nthen": "0.1.7", "open-sans-fontface": "^1.4.2", "bootstrap-tokenfield": "0.12.1", "localforage": "^1.5.2", diff --git a/customize.dist/login.js b/customize.dist/login.js index dba7c9d57..38c6a09b8 100644 --- a/customize.dist/login.js +++ b/customize.dist/login.js @@ -12,7 +12,7 @@ define([ '/common/common-feedback.js', '/common/outer/local-store.js', '/customize/messages.js', - '/bower_components/nthen/index.js', + '/components/nthen/index.js', '/common/outer/login-block.js', '/common/common-hash.js', diff --git a/customize.dist/template.js b/customize.dist/template.js index cb6adf667..969c280f0 100644 --- a/customize.dist/template.js +++ b/customize.dist/template.js @@ -2,7 +2,7 @@ define([ 'jquery', '/common/hyperscript.js', '/customize/pages.js', - '/bower_components/nthen/index.js', + '/components/nthen/index.js', 'css!/components/components-font-awesome/css/font-awesome.min.css', ], function ($, h, Pages, nThen) { diff --git a/scripts/copy-components.js b/scripts/copy-components.js index dd9456554..6a2df9574 100644 --- a/scripts/copy-components.js +++ b/scripts/copy-components.js @@ -26,6 +26,7 @@ Fse.mkdirpSync(componentsPath); "scrypt-async", "require-css", "bootstrap", + "nthen", ].forEach(l => { const source = Path.join("node_modules", l); const destination = Path.join(componentsPath, l); diff --git a/www/admin/inner.js b/www/admin/inner.js index 6bf0093d7..31e8c7bc6 100644 --- a/www/admin/inner.js +++ b/www/admin/inner.js @@ -4,7 +4,7 @@ define([ '/customize/application_config.js', '/components/chainpad-crypto/crypto.js', '/common/toolbar.js', - '/bower_components/nthen/index.js', + '/components/nthen/index.js', '/common/sframe-common.js', '/common/hyperscript.js', '/customize/messages.js', diff --git a/www/admin/main.js b/www/admin/main.js index 8a6ec7a70..06a25957f 100644 --- a/www/admin/main.js +++ b/www/admin/main.js @@ -1,6 +1,6 @@ // Load #1, load as little as possible because we are in a race to get the loading screen up. define([ - '/bower_components/nthen/index.js', + '/components/nthen/index.js', '/api/config', '/common/dom-ready.js', '/common/sframe-common-outer.js', diff --git a/www/calendar/inner.js b/www/calendar/inner.js index ea301c0ea..dee4965b7 100644 --- a/www/calendar/inner.js +++ b/www/calendar/inner.js @@ -3,7 +3,7 @@ define([ 'json.sortify', '/components/chainpad-crypto/crypto.js', '/common/toolbar.js', - '/bower_components/nthen/index.js', + '/components/nthen/index.js', '/common/sframe-common.js', '/common/common-util.js', '/common/common-hash.js', diff --git a/www/calendar/main.js b/www/calendar/main.js index 5858729ee..72eb336c8 100644 --- a/www/calendar/main.js +++ b/www/calendar/main.js @@ -1,6 +1,6 @@ // Load #1, load as little as possible because we are in a race to get the loading screen up. define([ - '/bower_components/nthen/index.js', + '/components/nthen/index.js', '/api/config', '/common/dom-ready.js', '/common/sframe-common-outer.js', diff --git a/www/checkup/main.js b/www/checkup/main.js index 0ad45813d..4ee6389d6 100644 --- a/www/checkup/main.js +++ b/www/checkup/main.js @@ -5,7 +5,7 @@ define([ '/common/hyperscript.js', '/customize/messages.js', '/common/dom-ready.js', - '/bower_components/nthen/index.js', + '/components/nthen/index.js', '/common/sframe-common-outer.js', '/customize/login.js', '/common/common-hash.js', diff --git a/www/code/inner.js b/www/code/inner.js index 562e08556..cf2e20d85 100644 --- a/www/code/inner.js +++ b/www/code/inner.js @@ -1,7 +1,7 @@ define([ 'jquery', '/common/diffMarked.js', - '/bower_components/nthen/index.js', + '/components/nthen/index.js', '/common/sframe-common.js', '/common/hyperscript.js', '/common/sframe-app-framework.js', diff --git a/www/common/LessLoader.js b/www/common/LessLoader.js index b4ca8fd73..61e0c97e6 100644 --- a/www/common/LessLoader.js +++ b/www/common/LessLoader.js @@ -5,7 +5,7 @@ const require = define; */ define([ '/api/config', - '/bower_components/nthen/index.js' + '/components/nthen/index.js' ], function (Config, nThen) { /*::});module.exports = (function() { const Config = (undefined:any); const nThen = (undefined:any); diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js index 9a26505d6..ca6d5882b 100644 --- a/www/common/common-ui-elements.js +++ b/www/common/common-ui-elements.js @@ -13,7 +13,7 @@ define([ '/customize/messages.js', '/customize/application_config.js', '/customize/pages.js', - '/bower_components/nthen/index.js', + '/components/nthen/index.js', '/common/inner/invitation.js', '/common/visible.js', diff --git a/www/common/cryptget.js b/www/common/cryptget.js index 13c56e940..afc93b53d 100644 --- a/www/common/cryptget.js +++ b/www/common/cryptget.js @@ -8,7 +8,7 @@ define([ '/common/outer/network-config.js', '/common/outer/cache-store.js', '/common/pinpad.js', - '/bower_components/nthen/index.js', + '/components/nthen/index.js', '/components/chainpad/chainpad.dist.js', ], function (Crypto, CPNetflux, Netflux, Util, Hash, Realtime, NetConfig, Cache, Pinpad, nThen) { var finish = function (S, err, doc) { diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js index 81e2ab03c..accc9ccce 100644 --- a/www/common/cryptpad-common.js +++ b/www/common/cryptpad-common.js @@ -14,7 +14,7 @@ define([ '/common/outer/login-block.js', '/customize/application_config.js', - '/bower_components/nthen/index.js', + '/components/nthen/index.js', ], function (Config, Messages, Util, Hash, Cache, Messaging, Constants, Feedback, Visible, UserObject, LocalStore, Channel, Block, AppConfig, Nthen) { diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js index a3eb76857..11908cf38 100644 --- a/www/common/drive-ui.js +++ b/www/common/drive-ui.js @@ -14,7 +14,7 @@ define([ '/common/inner/access.js', '/common/inner/properties.js', - '/bower_components/nthen/index.js', + '/components/nthen/index.js', '/common/hyperscript.js', '/common/proxy-manager.js', '/customize/application_config.js', diff --git a/www/common/inner/access.js b/www/common/inner/access.js index 58d388271..d3ec5acc4 100644 --- a/www/common/inner/access.js +++ b/www/common/inner/access.js @@ -7,7 +7,7 @@ define([ '/common/inner/common-modal.js', '/common/hyperscript.js', '/customize/messages.js', - '/bower_components/nthen/index.js', + '/components/nthen/index.js', ], function ($, Util, Hash, UI, UIElements, Modal, h, Messages, nThen) { var Access = {}; diff --git a/www/common/inner/common-modal.js b/www/common/inner/common-modal.js index 2b6b874cf..bfb26ddde 100644 --- a/www/common/inner/common-modal.js +++ b/www/common/inner/common-modal.js @@ -5,7 +5,7 @@ define([ '/common/common-interface.js', '/common/common-ui-elements.js', '/customize/messages.js', - '/bower_components/nthen/index.js', + '/components/nthen/index.js', ], function ($, Util, Hash, UI, UIElements, Messages, nThen) { var Modal = {}; diff --git a/www/common/inner/properties.js b/www/common/inner/properties.js index 1fdf3e69f..696ce038a 100644 --- a/www/common/inner/properties.js +++ b/www/common/inner/properties.js @@ -7,7 +7,7 @@ define([ '/common/inner/common-modal.js', '/common/hyperscript.js', '/customize/messages.js', - '/bower_components/nthen/index.js', + '/components/nthen/index.js', ], function ($, Util, Hash, UI, UIElements, Modal, h, Messages, nThen) { var Properties = {}; diff --git a/www/common/inner/share.js b/www/common/inner/share.js index 745fe34eb..3999180b3 100644 --- a/www/common/inner/share.js +++ b/www/common/inner/share.js @@ -10,7 +10,7 @@ define([ '/common/hyperscript.js', '/common/clipboard.js', '/customize/messages.js', - '/bower_components/nthen/index.js', + '/components/nthen/index.js', '/customize/pages.js', ], function ($, ApiConfig, Util, Hash, UI, UIElements, Feedback, Modal, h, Clipboard, Messages, nThen, Pages) { diff --git a/www/common/inner/snapshots.js b/www/common/inner/snapshots.js index 7b812aa3a..bfa5c5c7a 100644 --- a/www/common/inner/snapshots.js +++ b/www/common/inner/snapshots.js @@ -3,7 +3,7 @@ define([ '/common/common-interface.js', '/common/hyperscript.js', '/customize/messages.js', - '/bower_components/nthen/index.js', + '/components/nthen/index.js', '/components/chainpad/chainpad.dist.js', ], function ($, UI, h, Messages, nThen, ChainPad /* JsonOT */) { var Snapshots = {}; diff --git a/www/common/make-backup.js b/www/common/make-backup.js index a80663677..8ad90ed2c 100644 --- a/www/common/make-backup.js +++ b/www/common/make-backup.js @@ -8,7 +8,7 @@ define([ '/common/common-feedback.js', '/common/inner/cache.js', '/customize/messages.js', - '/bower_components/nthen/index.js', + '/components/nthen/index.js', '/bower_components/saferphore/index.js', '/bower_components/jszip/dist/jszip.min.js', ], function ($, FileCrypto, Hash, Util, UI, h, Feedback, diff --git a/www/common/migrate-user-object.js b/www/common/migrate-user-object.js index 09825a59d..9bbbf766b 100644 --- a/www/common/migrate-user-object.js +++ b/www/common/migrate-user-object.js @@ -8,7 +8,7 @@ define([ '/common/outer/mailbox.js', '/customize/messages.js', '/common/common-realtime.js', - '/bower_components/nthen/index.js', + '/components/nthen/index.js', '/components/chainpad-crypto/crypto.js', ], function (AppConfig, Feedback, Hash, Util, Messaging, Crypt, Mailbox, Messages, Realtime, nThen, Crypto) { // Start migration check diff --git a/www/common/onlyoffice/inner.js b/www/common/onlyoffice/inner.js index 2079c5da4..2f65e9995 100644 --- a/www/common/onlyoffice/inner.js +++ b/www/common/onlyoffice/inner.js @@ -2,7 +2,7 @@ define([ 'jquery', '/common/toolbar.js', 'json.sortify', - '/bower_components/nthen/index.js', + '/components/nthen/index.js', '/common/sframe-common.js', '/common/common-interface.js', '/common/common-hash.js', diff --git a/www/common/onlyoffice/main.js b/www/common/onlyoffice/main.js index 6a7d81a4b..2b4f28d89 100644 --- a/www/common/onlyoffice/main.js +++ b/www/common/onlyoffice/main.js @@ -1,6 +1,6 @@ // Load #1, load as little as possible because we are in a race to get the loading screen up. define([ - '/bower_components/nthen/index.js', + '/components/nthen/index.js', '/api/config', '/common/dom-ready.js', '/common/common-hash.js', diff --git a/www/common/onlyoffice/ooiframe.js b/www/common/onlyoffice/ooiframe.js index c05c559fe..b46ff26de 100644 --- a/www/common/onlyoffice/ooiframe.js +++ b/www/common/onlyoffice/ooiframe.js @@ -1,6 +1,6 @@ // Load #1, load as little as possible because we are in a race to get the loading screen up. define([ - '/bower_components/nthen/index.js', + '/components/nthen/index.js', '/api/config', 'jquery', '/common/requireconfig.js', diff --git a/www/common/outer/async-store.js b/www/common/outer/async-store.js index 8e9ced469..78cef01f8 100644 --- a/www/common/outer/async-store.js +++ b/www/common/outer/async-store.js @@ -29,7 +29,7 @@ define([ 'chainpad-netflux', 'chainpad-listmap', 'netflux-client', - '/bower_components/nthen/index.js', + '/components/nthen/index.js', '/bower_components/saferphore/index.js', ], function (ApiConfig, Sortify, UserObject, ProxyManager, Migrate, Hash, Util, Constants, Feedback, Realtime, Messaging, Pinpad, Cache, diff --git a/www/common/outer/calendar.js b/www/common/outer/calendar.js index 221cbf608..ea4053693 100644 --- a/www/common/outer/calendar.js +++ b/www/common/outer/calendar.js @@ -6,7 +6,7 @@ define([ '/common/outer/cache-store.js', '/calendar/recurrence.js', '/customize/messages.js', - '/bower_components/nthen/index.js', + '/components/nthen/index.js', 'chainpad-listmap', '/components/chainpad-crypto/crypto.js', '/components/chainpad/chainpad.dist.js', diff --git a/www/common/outer/history.js b/www/common/outer/history.js index 269821680..50d0caef2 100644 --- a/www/common/outer/history.js +++ b/www/common/outer/history.js @@ -2,7 +2,7 @@ define([ '/common/common-util.js', '/common/common-hash.js', '/common/userObject.js', - '/bower_components/nthen/index.js', + '/components/nthen/index.js', ], function (Util, Hash, UserObject, nThen) { var History = {}; var commands = {}; diff --git a/www/common/outer/messenger.js b/www/common/outer/messenger.js index 12fd90d22..4fb1cc146 100644 --- a/www/common/outer/messenger.js +++ b/www/common/outer/messenger.js @@ -8,7 +8,7 @@ define([ '/customize/messages.js', '/customize/application_config.js', - '/bower_components/nthen/index.js', + '/components/nthen/index.js', ], function (Crypto, Hash, Util, Realtime, Messaging, Constants, Messages, AppConfig, nThen) { 'use strict'; var Curve = Crypto.Curve; diff --git a/www/common/outer/roster.js b/www/common/outer/roster.js index 4ac952843..8bb93deff 100644 --- a/www/common/outer/roster.js +++ b/www/common/outer/roster.js @@ -933,7 +933,7 @@ var factory = function (Util, Hash, CPNetflux, Sortify, nThen, Crypto, Feedback) '/common/common-hash.js', 'chainpad-netflux', 'json.sortify', - '/bower_components/nthen/index.js', + '/components/nthen/index.js', '/components/chainpad-crypto/crypto.js', '/common/common-feedback.js', //'/components/tweetnacl/nacl-fast.min.js', diff --git a/www/common/outer/sharedfolder.js b/www/common/outer/sharedfolder.js index 8c4f81c22..e86682746 100644 --- a/www/common/outer/sharedfolder.js +++ b/www/common/outer/sharedfolder.js @@ -4,7 +4,7 @@ define([ '/common/userObject.js', '/common/outer/cache-store.js', - '/bower_components/nthen/index.js', + '/components/nthen/index.js', '/components/chainpad-crypto/crypto.js', 'chainpad-listmap', '/components/chainpad/chainpad.dist.js', diff --git a/www/common/outer/team.js b/www/common/outer/team.js index d1a7f0029..5d15aae12 100644 --- a/www/common/outer/team.js +++ b/www/common/outer/team.js @@ -18,7 +18,7 @@ define([ '/components/chainpad-crypto/crypto.js', 'chainpad-netflux', '/components/chainpad/chainpad.dist.js', - '/bower_components/nthen/index.js', + '/components/nthen/index.js', '/bower_components/saferphore/index.js', '/components/tweetnacl/nacl-fast.min.js', ], function (Util, Hash, Constants, Realtime, diff --git a/www/common/outer/upload.js b/www/common/outer/upload.js index 5f41cef4a..86a4789af 100644 --- a/www/common/outer/upload.js +++ b/www/common/outer/upload.js @@ -3,7 +3,7 @@ define([ '/common/common-hash.js', '/common/common-util.js', '/common/outer/cache-store.js', - '/bower_components/nthen/index.js', + '/components/nthen/index.js', '/components/tweetnacl/nacl-fast.min.js', ], function (FileCrypto, Hash, Util, Cache, nThen) { var Nacl = window.nacl; diff --git a/www/common/outer/x2t.js b/www/common/outer/x2t.js index 969d7b251..3b96f87aa 100644 --- a/www/common/outer/x2t.js +++ b/www/common/outer/x2t.js @@ -1,6 +1,6 @@ define([ '/api/config', - '/bower_components/nthen/index.js', + '/components/nthen/index.js', '/common/common-util.js', ], function (ApiConfig, nThen, Util) { var X2T = {}; diff --git a/www/common/proxy-manager.js b/www/common/proxy-manager.js index b4c985dc9..81f284e1b 100644 --- a/www/common/proxy-manager.js +++ b/www/common/proxy-manager.js @@ -5,7 +5,7 @@ define([ '/common/outer/sharedfolder.js', '/customize/messages.js', '/common/common-feedback.js', - '/bower_components/nthen/index.js', + '/components/nthen/index.js', ], function (UserObject, Util, Hash, SF, Messages, Feedback, nThen) { diff --git a/www/common/sframe-app-framework.js b/www/common/sframe-app-framework.js index 095c870ed..4c7966546 100644 --- a/www/common/sframe-app-framework.js +++ b/www/common/sframe-app-framework.js @@ -3,7 +3,7 @@ define([ '/components/hyper-json/hyperjson.js', '/common/toolbar.js', 'json.sortify', - '/bower_components/nthen/index.js', + '/components/nthen/index.js', '/common/sframe-common.js', '/customize/messages.js', '/common/hyperscript.js', diff --git a/www/common/sframe-app-outer.js b/www/common/sframe-app-outer.js index 3d3cfaf28..86b4fc6e2 100644 --- a/www/common/sframe-app-outer.js +++ b/www/common/sframe-app-outer.js @@ -1,6 +1,6 @@ // Load #1, load as little as possible because we are in a race to get the loading screen up. define([ - '/bower_components/nthen/index.js', + '/components/nthen/index.js', '/api/config', '/common/dom-ready.js', '/common/sframe-common-outer.js' diff --git a/www/common/sframe-common-file.js b/www/common/sframe-common-file.js index 811cbf414..813678c0e 100644 --- a/www/common/sframe-common-file.js +++ b/www/common/sframe-common-file.js @@ -11,7 +11,7 @@ define([ '/common/hyperscript.js', '/customize/messages.js', '/customize/pages.js', - '/bower_components/nthen/index.js', + '/components/nthen/index.js', '/common/media-tag.js', '/components/file-saver/FileSaver.min.js', diff --git a/www/common/sframe-common-history.js b/www/common/sframe-common-history.js index 298e70586..8b4a63296 100644 --- a/www/common/sframe-common-history.js +++ b/www/common/sframe-common-history.js @@ -4,7 +4,7 @@ define([ '/common/common-util.js', '/common/hyperscript.js', '/customize/messages.js', - '/bower_components/nthen/index.js', + '/components/nthen/index.js', //'/components/chainpad-json-validator/json-ot.js', '/components/chainpad/chainpad.dist.js', diff --git a/www/common/sframe-common-outer.js b/www/common/sframe-common-outer.js index 2f6d4605f..aa1f84515 100644 --- a/www/common/sframe-common-outer.js +++ b/www/common/sframe-common-outer.js @@ -1,6 +1,6 @@ // Load #1, load as little as possible because we are in a race to get the loading screen up. define([ - '/bower_components/nthen/index.js', + '/components/nthen/index.js', '/api/config', '/common/requireconfig.js', '/customize/messages.js', diff --git a/www/common/sframe-common.js b/www/common/sframe-common.js index 87054a887..0fa708d73 100644 --- a/www/common/sframe-common.js +++ b/www/common/sframe-common.js @@ -1,7 +1,7 @@ define([ 'jquery', '/api/config', - '/bower_components/nthen/index.js', + '/components/nthen/index.js', '/customize/messages.js', '/common/sframe-chainpad-netflux-inner.js', '/common/outer/worker-channel.js', diff --git a/www/contacts/inner.js b/www/contacts/inner.js index eb0fe5be2..7abb480cd 100644 --- a/www/contacts/inner.js +++ b/www/contacts/inner.js @@ -2,7 +2,7 @@ define([ 'jquery', '/components/chainpad-crypto/crypto.js', '/common/toolbar.js', - '/bower_components/nthen/index.js', + '/components/nthen/index.js', '/common/sframe-common.js', '/common/hyperscript.js', '/common/messenger-ui.js', diff --git a/www/contacts/main.js b/www/contacts/main.js index faf92f94e..c72e51880 100644 --- a/www/contacts/main.js +++ b/www/contacts/main.js @@ -1,6 +1,6 @@ // Load #1, load as little as possible because we are in a race to get the loading screen up. define([ - '/bower_components/nthen/index.js', + '/components/nthen/index.js', '/api/config', '/common/dom-ready.js', '/common/sframe-common-outer.js' diff --git a/www/convert/inner.js b/www/convert/inner.js index c17ec575e..7c192a24b 100644 --- a/www/convert/inner.js +++ b/www/convert/inner.js @@ -3,7 +3,7 @@ define([ '/api/config', '/components/chainpad-crypto/crypto.js', '/common/toolbar.js', - '/bower_components/nthen/index.js', + '/components/nthen/index.js', '/common/sframe-common.js', '/common/hyperscript.js', '/customize/messages.js', diff --git a/www/convert/main.js b/www/convert/main.js index 1d74f26b8..8dd24ed12 100644 --- a/www/convert/main.js +++ b/www/convert/main.js @@ -1,6 +1,6 @@ // Load #1, load as little as possible because we are in a race to get the loading screen up. define([ - '/bower_components/nthen/index.js', + '/components/nthen/index.js', '/api/config', '/common/dom-ready.js', '/common/sframe-common-outer.js' diff --git a/www/debug/inner.js b/www/debug/inner.js index 77b357fc9..d46ea0a56 100644 --- a/www/debug/inner.js +++ b/www/debug/inner.js @@ -4,7 +4,7 @@ define([ '/common/toolbar.js', 'json.sortify', '/common/common-util.js', - '/bower_components/nthen/index.js', + '/components/nthen/index.js', '/common/sframe-common.js', '/common/common-interface.js', '/common/common-hash.js', diff --git a/www/debug/main.js b/www/debug/main.js index 124ea39f9..b84782a3f 100644 --- a/www/debug/main.js +++ b/www/debug/main.js @@ -1,6 +1,6 @@ // Load #1, load as little as possible because we are in a race to get the loading screen up. define([ - '/bower_components/nthen/index.js', + '/components/nthen/index.js', '/api/config', 'jquery', '/common/requireconfig.js', diff --git a/www/drive/inner.js b/www/drive/inner.js index 8b3db6b82..91ee3c3c1 100644 --- a/www/drive/inner.js +++ b/www/drive/inner.js @@ -7,7 +7,7 @@ define([ '/common/common-interface.js', '/common/common-ui-elements.js', '/common/common-feedback.js', - '/bower_components/nthen/index.js', + '/components/nthen/index.js', '/common/sframe-common.js', '/common/proxy-manager.js', '/customize/application_config.js', diff --git a/www/drive/main.js b/www/drive/main.js index b2bc52121..5200a554f 100644 --- a/www/drive/main.js +++ b/www/drive/main.js @@ -1,6 +1,6 @@ // Load #1, load as little as possible because we are in a race to get the loading screen up. define([ - '/bower_components/nthen/index.js', + '/components/nthen/index.js', '/api/config', '/common/dom-ready.js', '/common/sframe-common-outer.js', diff --git a/www/file/inner.js b/www/file/inner.js index cc2398089..00e0a2fa9 100644 --- a/www/file/inner.js +++ b/www/file/inner.js @@ -1,7 +1,7 @@ define([ 'jquery', '/common/toolbar.js', - '/bower_components/nthen/index.js', + '/components/nthen/index.js', '/common/sframe-common.js', '/common/common-hash.js', '/common/common-interface.js', diff --git a/www/file/main.js b/www/file/main.js index e0165ff81..ba2497a93 100644 --- a/www/file/main.js +++ b/www/file/main.js @@ -1,6 +1,6 @@ // Load #1, load as little as possible because we are in a race to get the loading screen up. define([ - '/bower_components/nthen/index.js', + '/components/nthen/index.js', '/api/config', '/common/dom-ready.js', '/common/sframe-common-outer.js' diff --git a/www/form/inner.js b/www/form/inner.js index a76f836e9..8c5261138 100644 --- a/www/form/inner.js +++ b/www/form/inner.js @@ -6,7 +6,7 @@ define([ '/common/sframe-app-framework.js', '/common/toolbar.js', '/form/export.js', - '/bower_components/nthen/index.js', + '/components/nthen/index.js', '/common/sframe-common.js', '/common/common-util.js', '/common/common-hash.js', diff --git a/www/form/main.js b/www/form/main.js index 09a881f29..739eee4ed 100644 --- a/www/form/main.js +++ b/www/form/main.js @@ -1,6 +1,6 @@ // Load #1, load as little as possible because we are in a race to get the loading screen up. define([ - '/bower_components/nthen/index.js', + '/components/nthen/index.js', '/api/config', '/common/dom-ready.js', '/common/sframe-common-outer.js', diff --git a/www/kanban/inner.js b/www/kanban/inner.js index e482a1383..17581905e 100644 --- a/www/kanban/inner.js +++ b/www/kanban/inner.js @@ -1,7 +1,7 @@ define([ 'jquery', 'json.sortify', - '/bower_components/nthen/index.js', + '/components/nthen/index.js', '/common/sframe-common.js', '/common/sframe-app-framework.js', '/common/sframe-common-codemirror.js', diff --git a/www/logout/main.js b/www/logout/main.js index 7211dfa84..8fdef30b0 100644 --- a/www/logout/main.js +++ b/www/logout/main.js @@ -1,7 +1,7 @@ define([ '/bower_components/localforage/dist/localforage.min.js', '/common/outer/cache-store.js', - '/bower_components/nthen/index.js', + '/components/nthen/index.js', ], function (localForage, Cache, nThen) { nThen(function (w) { localStorage.clear(); diff --git a/www/notifications/inner.js b/www/notifications/inner.js index 8ab54c961..965f706a5 100644 --- a/www/notifications/inner.js +++ b/www/notifications/inner.js @@ -3,7 +3,7 @@ define([ '/api/config', '/components/chainpad-crypto/crypto.js', '/common/toolbar.js', - '/bower_components/nthen/index.js', + '/components/nthen/index.js', '/common/sframe-common.js', '/common/hyperscript.js', '/customize/messages.js', diff --git a/www/notifications/main.js b/www/notifications/main.js index 785fb3b5d..0b9936a8d 100644 --- a/www/notifications/main.js +++ b/www/notifications/main.js @@ -1,6 +1,6 @@ // Load #1, load as little as possible because we are in a race to get the loading screen up. define([ - '/bower_components/nthen/index.js', + '/components/nthen/index.js', '/api/config', '/common/dom-ready.js', '/common/sframe-common-outer.js', diff --git a/www/pad/export.js b/www/pad/export.js index 9a69ffc8e..f627c752b 100644 --- a/www/pad/export.js +++ b/www/pad/export.js @@ -4,7 +4,7 @@ define([ '/common/diffMarked.js', '/common/hyperscript.js', '/components/hyper-json/hyperjson.js', - '/bower_components/nthen/index.js', + '/components/nthen/index.js', '/lib/turndown.browser.umd.js' ], function ($, Util, DiffMd, h, Hyperjson, nThen, Turndown) { var module = { diff --git a/www/pad/inner.js b/www/pad/inner.js index 0b3161edd..0cca3575d 100644 --- a/www/pad/inner.js +++ b/www/pad/inner.js @@ -33,7 +33,7 @@ define([ '/pad/comments.js', '/pad/export.js', '/pad/cursor.js', - '/bower_components/nthen/index.js', + '/components/nthen/index.js', '/common/media-tag.js', '/api/config', '/common/common-hash.js', diff --git a/www/poll/inner.js b/www/poll/inner.js index bb5efb11a..2f1835925 100644 --- a/www/poll/inner.js +++ b/www/poll/inner.js @@ -3,7 +3,7 @@ define([ '/common/toolbar.js', '/common/common-util.js', '/common/common-hash.js', - '/bower_components/nthen/index.js', + '/components/nthen/index.js', '/common/sframe-common.js', '/common/common-realtime.js', '/customize/application_config.js', diff --git a/www/poll/main.js b/www/poll/main.js index f238a74a3..d3ca86ed9 100644 --- a/www/poll/main.js +++ b/www/poll/main.js @@ -1,6 +1,6 @@ // Load #1, load as little as possible because we are in a race to get the loading screen up. define([ - '/bower_components/nthen/index.js', + '/components/nthen/index.js', '/api/config', '/common/dom-ready.js', '/common/sframe-common-outer.js', diff --git a/www/profile/inner.js b/www/profile/inner.js index 573370097..5005042e2 100644 --- a/www/profile/inner.js +++ b/www/profile/inner.js @@ -3,7 +3,7 @@ define([ '/components/chainpad-crypto/crypto.js', 'chainpad-listmap', '/common/toolbar.js', - '/bower_components/nthen/index.js', + '/components/nthen/index.js', '/common/sframe-common.js', '/common/common-util.js', '/common/common-hash.js', diff --git a/www/profile/main.js b/www/profile/main.js index 53d10fc74..3b011874b 100644 --- a/www/profile/main.js +++ b/www/profile/main.js @@ -1,6 +1,6 @@ // Load #1, load as little as possible because we are in a race to get the loading screen up. define([ - '/bower_components/nthen/index.js', + '/components/nthen/index.js', '/api/config', '/common/dom-ready.js', '/common/sframe-common-outer.js', diff --git a/www/report/main.js b/www/report/main.js index e4ff2e07d..b9baa5e9a 100644 --- a/www/report/main.js +++ b/www/report/main.js @@ -3,7 +3,7 @@ define([ '/api/config', '/common/hyperscript.js', '/customize/messages.js', - '/bower_components/nthen/index.js', + '/components/nthen/index.js', '/common/common-hash.js', '/common/common-util.js', '/common/cryptget.js', diff --git a/www/secureiframe/inner.js b/www/secureiframe/inner.js index 1ceb5eaa1..a93fc5e26 100644 --- a/www/secureiframe/inner.js +++ b/www/secureiframe/inner.js @@ -1,7 +1,7 @@ define([ 'jquery', '/components/chainpad-crypto/crypto.js', - '/bower_components/nthen/index.js', + '/components/nthen/index.js', '/common/sframe-common.js', '/common/common-interface.js', '/common/common-ui-elements.js', diff --git a/www/secureiframe/main.js b/www/secureiframe/main.js index 8c33a2ff1..067b75314 100644 --- a/www/secureiframe/main.js +++ b/www/secureiframe/main.js @@ -1,6 +1,6 @@ // Load #1, load as little as possible because we are in a race to get the loading screen up. define([ - '/bower_components/nthen/index.js', + '/components/nthen/index.js', '/api/config', 'jquery', '/common/requireconfig.js', diff --git a/www/settings/inner.js b/www/settings/inner.js index 9c9f9f43c..fef81e41c 100644 --- a/www/settings/inner.js +++ b/www/settings/inner.js @@ -1,7 +1,7 @@ define([ 'jquery', '/common/toolbar.js', - '/bower_components/nthen/index.js', + '/components/nthen/index.js', '/common/sframe-common.js', '/common/common-interface.js', '/common/common-ui-elements.js', diff --git a/www/settings/main.js b/www/settings/main.js index 189d94eb5..a3384994f 100644 --- a/www/settings/main.js +++ b/www/settings/main.js @@ -1,6 +1,6 @@ // Load #1, load as little as possible because we are in a race to get the loading screen up. define([ - '/bower_components/nthen/index.js', + '/components/nthen/index.js', '/api/config', '/common/dom-ready.js', '/common/sframe-common-outer.js' diff --git a/www/slide/inner.js b/www/slide/inner.js index 8768fd082..0b8476651 100644 --- a/www/slide/inner.js +++ b/www/slide/inner.js @@ -1,7 +1,7 @@ define([ 'jquery', 'json.sortify', - '/bower_components/nthen/index.js', + '/components/nthen/index.js', '/common/sframe-common.js', '/slide/slide.js', '/common/sframe-app-framework.js', diff --git a/www/support/inner.js b/www/support/inner.js index 909619a09..c7a70000e 100644 --- a/www/support/inner.js +++ b/www/support/inner.js @@ -1,7 +1,7 @@ define([ 'jquery', '/common/toolbar.js', - '/bower_components/nthen/index.js', + '/components/nthen/index.js', '/common/sframe-common.js', '/common/common-interface.js', '/common/common-ui-elements.js', diff --git a/www/support/main.js b/www/support/main.js index 1dc8c0e56..79c876020 100644 --- a/www/support/main.js +++ b/www/support/main.js @@ -1,6 +1,6 @@ // Load #1, load as little as possible because we are in a race to get the loading screen up. define([ - '/bower_components/nthen/index.js', + '/components/nthen/index.js', '/api/config', '/common/dom-ready.js', '/common/sframe-common-outer.js', diff --git a/www/teams/inner.js b/www/teams/inner.js index 6cf6092db..f52817fc9 100644 --- a/www/teams/inner.js +++ b/www/teams/inner.js @@ -8,7 +8,7 @@ define([ '/common/common-ui-elements.js', '/common/common-feedback.js', '/common/common-constants.js', - '/bower_components/nthen/index.js', + '/components/nthen/index.js', '/common/sframe-common.js', '/common/proxy-manager.js', '/common/userObject.js', diff --git a/www/teams/main.js b/www/teams/main.js index 7d12126eb..6eca979a7 100644 --- a/www/teams/main.js +++ b/www/teams/main.js @@ -1,6 +1,6 @@ // Load #1, load as little as possible because we are in a race to get the loading screen up. define([ - '/bower_components/nthen/index.js', + '/components/nthen/index.js', '/api/config', '/common/dom-ready.js', '/common/sframe-common-outer.js', diff --git a/www/todo/inner.js b/www/todo/inner.js index b4d5c2692..3ed628632 100644 --- a/www/todo/inner.js +++ b/www/todo/inner.js @@ -3,7 +3,7 @@ define([ '/components/chainpad-crypto/crypto.js', 'chainpad-listmap', '/common/toolbar.js', - '/bower_components/nthen/index.js', + '/components/nthen/index.js', '/common/sframe-common.js', '/common/common-interface.js', '/common/common-hash.js', diff --git a/www/unsafeiframe/inner.js b/www/unsafeiframe/inner.js index 3db2aaa40..9c4ccfb6f 100644 --- a/www/unsafeiframe/inner.js +++ b/www/unsafeiframe/inner.js @@ -1,7 +1,7 @@ define([ 'jquery', '/components/chainpad-crypto/crypto.js', - '/bower_components/nthen/index.js', + '/components/nthen/index.js', '/common/sframe-common.js', '/common/common-interface.js', '/common/common-ui-elements.js', diff --git a/www/unsafeiframe/main.js b/www/unsafeiframe/main.js index afc6553b7..e796be029 100644 --- a/www/unsafeiframe/main.js +++ b/www/unsafeiframe/main.js @@ -1,6 +1,6 @@ // Load #1, load as little as possible because we are in a race to get the loading screen up. define([ - '/bower_components/nthen/index.js', + '/components/nthen/index.js', '/api/config', 'jquery', '/common/requireconfig.js', diff --git a/www/whiteboard/inner.js b/www/whiteboard/inner.js index 57152166f..e3ba36ed9 100644 --- a/www/whiteboard/inner.js +++ b/www/whiteboard/inner.js @@ -1,7 +1,7 @@ define([ 'jquery', 'json.sortify', - '/bower_components/nthen/index.js', + '/components/nthen/index.js', '/common/sframe-common.js', '/common/sframe-app-framework.js', '/common/common-util.js', diff --git a/www/worker/inner.js b/www/worker/inner.js index f7401e7e0..89bf1a4ce 100644 --- a/www/worker/inner.js +++ b/www/worker/inner.js @@ -2,7 +2,7 @@ define([ 'jquery', '/common/toolbar.js', '/common/cryptpad-common.js', - '/bower_components/nthen/index.js', + '/components/nthen/index.js', '/common/sframe-common.js', '/common/common-interface.js', '/customize/messages.js', diff --git a/www/worker/main.js b/www/worker/main.js index 633982146..97fb5e657 100644 --- a/www/worker/main.js +++ b/www/worker/main.js @@ -1,6 +1,6 @@ // Load #1, load as little as possible because we are in a race to get the loading screen up. define([ - '/bower_components/nthen/index.js', + '/components/nthen/index.js', '/api/config', '/common/dom-ready.js', '/common/sframe-common-outer.js'