diff --git a/apps/common/main/lib/util/docserviceworker.js b/apps/common/main/lib/util/docserviceworker.js index dfad17a1ae..6b33f1ff66 100644 --- a/apps/common/main/lib/util/docserviceworker.js +++ b/apps/common/main/lib/util/docserviceworker.js @@ -10,7 +10,9 @@ }) .then(function (registrations) { //delete stale service workers - for (const registration of registrations) { + // for (const registration of registrations) { + for (let r in registrations) { + const registration = registrations[r]; if (registration !== reg && registration.active && registration.active.scriptURL.endsWith(serviceWorkerName)) { registration.unregister(); } diff --git a/apps/common/main/lib/util/htmlutils.js b/apps/common/main/lib/util/htmlutils.js index fc72cf69d2..81228ce1bb 100644 --- a/apps/common/main/lib/util/htmlutils.js +++ b/apps/common/main/lib/util/htmlutils.js @@ -29,7 +29,6 @@ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * */ -const isIE = /msie|trident/i.test(navigator.userAgent); var checkLocalStorage = (function () { try { diff --git a/apps/documenteditor/main/app.js b/apps/documenteditor/main/app.js index b6295a2d14..5627c996ce 100644 --- a/apps/documenteditor/main/app.js +++ b/apps/documenteditor/main/app.js @@ -41,7 +41,7 @@ var reqerr; require.config({ // The shim config allows us to configure dependencies for // scripts that do not call define() to register a module - baseUrl: '../../', + baseUrl: window.customBaseUrl || '../../', paths: { jquery : '../vendor/jquery/jquery', underscore : '../vendor/underscore/underscore', diff --git a/apps/documenteditor/main/index.html.deploy b/apps/documenteditor/main/index.html.deploy index 91db987dfc..4ce41d4e83 100644 --- a/apps/documenteditor/main/index.html.deploy +++ b/apps/documenteditor/main/index.html.deploy @@ -421,7 +421,7 @@ diff --git a/apps/documenteditor/main/index_loader.html.deploy b/apps/documenteditor/main/index_loader.html.deploy index 4e3af3cca3..fb8eef7471 100644 --- a/apps/documenteditor/main/index_loader.html.deploy +++ b/apps/documenteditor/main/index_loader.html.deploy @@ -331,7 +331,13 @@
- + +