pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-04-07 14:06:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

[main] fix for IE

Browse Source
This commit is contained in:
maxkadushkin
2024-12-07 23:22:44 +03:00
parent 9bcaf19bb3
commit d229f22d78
18 changed files with 54 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/common/main/lib/util/docserviceworker.js
View File

@ -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();
}

1
apps/common/main/lib/util/htmlutils.js
View File

@ -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 {

2
apps/documenteditor/main/app.js
View File

@ -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',

2
apps/documenteditor/main/index.html.deploy
View File

@ -421,7 +421,7 @@
<script src="../../../../../../sdkjs/common/device_scale.js?__inline=true"></script>
<script src="../../../vendor/requirejs/require.js"></script>
<script>
isIE === true ? require(['ie/app']) : require(['app']);
isIEBrowser === true ? (window.customBaseUrl = '../../../', require(['ie/app'])) : require(['app']);
</script>
<link rel="stylesheet" href="../../../apps/documenteditor/main/resources/css/app.css" media="print" onload="this.media='all'">

8
apps/documenteditor/main/index_loader.html.deploy
View File

@ -331,7 +331,13 @@
<div id="viewport"></div>
<div class="inlined-svg"></div>
<script src="../../../../../../sdkjs/common/device_scale.js?__inline=true"></script>
<script data-main="app" src="../../../vendor/requirejs/require.js"></script>
<script src="../../../vendor/requirejs/require.js"></script>
<script>
var userAgent = navigator.userAgent.toLowerCase(),
check = function(regex){ return regex.test(userAgent); },
isIEBrowser = !check(/opera/) && (check(/msie/) || check(/trident/));
isIEBrowser === true ? (window.customBaseUrl = '../../../', require(['ie/app'])) : require(['app']);
</script>
<link rel="stylesheet" type="text/css" href="../../../apps/documenteditor/main/resources/css/app.css" media="print" onload="this.media='all'">
</body>

2
apps/pdfeditor/main/app.js
View File

@ -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',

3
apps/pdfeditor/main/index.html.deploy
View File

@ -399,7 +399,8 @@
<script>
function startApp() {
var script = document.createElement("script");
script.setAttribute("data-main", isIE === true ? "ie/app" : "app");
isIEBrowser === true && (window.customBaseUrl = '../../../');
script.setAttribute("data-main", isIEBrowser === true ? "ie/app" : "app");
script.src = "../../../vendor/requirejs/require.js";
document.body.appendChild(script);
}

3
apps/pdfeditor/main/index_loader.html.deploy
View File

@ -331,7 +331,8 @@
<script>
function startApp() {
var script = document.createElement("script");
script.setAttribute("data-main", "app");
isIEBrowser === true && (window.customBaseUrl = '../../../');
script.setAttribute("data-main", isIEBrowser === true ? "ie/app" : "app");
script.src = "../../../vendor/requirejs/require.js";
document.body.appendChild(script);
}

2
apps/presentationeditor/main/app.js
View File

@ -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',

5
apps/presentationeditor/main/index.html.deploy
View File

@ -439,7 +439,10 @@
<script src="../../../../../../sdkjs/common/device_scale.js?__inline=true"></script>
<script src="../../../vendor/requirejs/require.js"></script>
<script>
isIE === true ? require(['ie/app']) : require(['app']);
var userAgent = navigator.userAgent.toLowerCase(),
check = function(regex){ return regex.test(userAgent); },
isIEBrowser = !check(/opera/) && (check(/msie/) || check(/trident/));
isIEBrowser === true ? (window.customBaseUrl = '../../../', require(['ie/app'])) : require(['app']);
</script>
<link rel="stylesheet" href="../../../apps/presentationeditor/main/resources/css/app.css" media="print" onload="this.media='all'">

5
apps/presentationeditor/main/index_loader.html.deploy
View File

@ -329,7 +329,10 @@
<div class="inlined-svg"></div>
<script src="../../../../../../sdkjs/common/device_scale.js?__inline=true"></script>
<script data-main="app" src="../../../vendor/requirejs/require.js"></script>
<script src="../../../vendor/requirejs/require.js"></script>
<script>
isIEBrowser === true ? (window.customBaseUrl = '../../../', require(['ie/app'])) : require(['app']);
</script>
<link rel="stylesheet" href="../../../apps/presentationeditor/main/resources/css/app.css" media="print" onload="this.media='all'">
</body>

2
apps/spreadsheeteditor/main/app.js
View File

@ -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',

2
apps/spreadsheeteditor/main/index.html.deploy
View File

@ -463,7 +463,7 @@
<script src="../../../../../../sdkjs/common/device_scale.js?__inline=true"></script>
<script src="../../../vendor/requirejs/require.js"></script>
<script>
isIE === true ? require(['ie/app']) : require(['app']);
isIEBrowser === true ? (window.customBaseUrl = '../../../', require(['ie/app'])) : require(['app']);
</script>
<link rel="stylesheet" href="../../../apps/spreadsheeteditor/main/resources/css/app.css" media="print" onload="this.media='all'">
</body>

8
apps/spreadsheeteditor/main/index_internal.html.deploy
View File

@ -237,7 +237,13 @@
<div class="inlined-svg"></div>
<script src="../../../../../../sdkjs/common/device_scale.js?__inline=true"></script>
<script data-main="app" src="../../../vendor/requirejs/require.js"></script>
<script src="../../../vendor/requirejs/require.js"></script>
<script>
var userAgent = navigator.userAgent.toLowerCase(),
check = function(regex){ return regex.test(userAgent); },
isIEBrowser = !check(/opera/) && (check(/msie/) || check(/trident/));
isIEBrowser === true ? (window.customBaseUrl = '../../../', require(['ie/app'])) : require(['app']);
</script>
<link rel="stylesheet" href="../../../apps/spreadsheeteditor/main/resources/css/app.css" media="print" onload="this.media='all'">
</body>

8
apps/spreadsheeteditor/main/index_loader.html.deploy
View File

@ -331,7 +331,13 @@
<div class="inlined-svg"></div>
<script src="../../../../../../sdkjs/common/device_scale.js?__inline=true"></script>
<script data-main="app" src="../../../vendor/requirejs/require.js"></script>
<script src="../../../vendor/requirejs/require.js"></script>
<script>
var userAgent = navigator.userAgent.toLowerCase(),
check = function(regex){ return regex.test(userAgent); },
isIEBrowser = !check(/opera/) && (check(/msie/) || check(/trident/));
isIEBrowser === true ? (window.customBaseUrl = '../../../', require(['ie/app'])) : require(['app']);
</script>
<link rel="stylesheet" href="../../../apps/spreadsheeteditor/main/resources/css/app.css" media="print" onload="this.media='all'">
</body>

2
apps/visioeditor/main/app.js
View File

@ -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',

5
apps/visioeditor/main/index.html.deploy
View File

@ -436,7 +436,10 @@
<inline src="../../common/main/resources/img/header/icons.svg" />
<div class="inlined-svg"></div>
<script src="../../../../../../sdkjs/common/device_scale.js?__inline=true"></script>
<script data-main="app" src="../../../vendor/requirejs/require.js"></script>
<script src="../../../vendor/requirejs/require.js"></script>
<script>
isIEBrowser === true ? (window.customBaseUrl = '../../../', require(['ie/app'])) : require(['app']);
</script>
<link rel="stylesheet" href="../../../apps/visioeditor/main/resources/css/app.css" media="print" onload="this.media='all'">
</body>

8
apps/visioeditor/main/index_loader.html.deploy
View File

@ -324,7 +324,13 @@
<div class="inlined-svg"></div>
<script src="../../../../../../sdkjs/common/device_scale.js?__inline=true"></script>
<script data-main="app" src="../../../vendor/requirejs/require.js"></script>
<script src="../../../vendor/requirejs/require.js"></script>
<script>
var userAgent = navigator.userAgent.toLowerCase(),
check = function(regex){ return regex.test(userAgent); },
isIEBrowser = !check(/opera/) && (check(/msie/) || check(/trident/));
isIEBrowser === true ? (window.customBaseUrl = '../../../', require(['ie/app'])) : require(['app']);
</script>
<link rel="stylesheet" href="../../../apps/visioeditor/main/resources/css/app.css" media="print" onload="this.media='all'">
</body>