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 @@
- + + diff --git a/apps/pdfeditor/main/app.js b/apps/pdfeditor/main/app.js index 9ff95990b5..067b8fcef3 100644 --- a/apps/pdfeditor/main/app.js +++ b/apps/pdfeditor/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/pdfeditor/main/index.html.deploy b/apps/pdfeditor/main/index.html.deploy index 3fa0161ea9..15030b5446 100644 --- a/apps/pdfeditor/main/index.html.deploy +++ b/apps/pdfeditor/main/index.html.deploy @@ -399,7 +399,8 @@ diff --git a/apps/presentationeditor/main/index_loader.html.deploy b/apps/presentationeditor/main/index_loader.html.deploy index 29a2e860c6..9fb49ac421 100644 --- a/apps/presentationeditor/main/index_loader.html.deploy +++ b/apps/presentationeditor/main/index_loader.html.deploy @@ -329,7 +329,10 @@
- + + diff --git a/apps/spreadsheeteditor/main/app.js b/apps/spreadsheeteditor/main/app.js index 2d01621973..f62cadddde 100644 --- a/apps/spreadsheeteditor/main/app.js +++ b/apps/spreadsheeteditor/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/spreadsheeteditor/main/index.html.deploy b/apps/spreadsheeteditor/main/index.html.deploy index 1e7a84a4f7..0722af8bd0 100644 --- a/apps/spreadsheeteditor/main/index.html.deploy +++ b/apps/spreadsheeteditor/main/index.html.deploy @@ -463,7 +463,7 @@ diff --git a/apps/spreadsheeteditor/main/index_internal.html.deploy b/apps/spreadsheeteditor/main/index_internal.html.deploy index 50555025b1..b7cfd6b123 100644 --- a/apps/spreadsheeteditor/main/index_internal.html.deploy +++ b/apps/spreadsheeteditor/main/index_internal.html.deploy @@ -237,7 +237,13 @@
- + + diff --git a/apps/spreadsheeteditor/main/index_loader.html.deploy b/apps/spreadsheeteditor/main/index_loader.html.deploy index e045353ea7..b532452f57 100644 --- a/apps/spreadsheeteditor/main/index_loader.html.deploy +++ b/apps/spreadsheeteditor/main/index_loader.html.deploy @@ -331,7 +331,13 @@
- + + diff --git a/apps/visioeditor/main/app.js b/apps/visioeditor/main/app.js index 5213049f6c..ff827d7475 100644 --- a/apps/visioeditor/main/app.js +++ b/apps/visioeditor/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/visioeditor/main/index.html.deploy b/apps/visioeditor/main/index.html.deploy index f711736650..e5dc81b74c 100644 --- a/apps/visioeditor/main/index.html.deploy +++ b/apps/visioeditor/main/index.html.deploy @@ -436,7 +436,10 @@
- + + diff --git a/apps/visioeditor/main/index_loader.html.deploy b/apps/visioeditor/main/index_loader.html.deploy index 55012e70dc..669f840a10 100644 --- a/apps/visioeditor/main/index_loader.html.deploy +++ b/apps/visioeditor/main/index_loader.html.deploy @@ -324,7 +324,13 @@
- + +