pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-02-10 18:05:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

[main] fix for IE

Browse Source
This commit is contained in:
maxkadushkin
2024-12-10 01:21:52 +03:00
parent c057bb38d6
commit 13665f10c6
17 changed files with 89 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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: window.customBaseUrl || '../../',
baseUrl: '../../',
paths: {
jquery : '../vendor/jquery/jquery',
underscore : '../vendor/underscore/underscore',

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

@ -366,9 +366,15 @@
<inline src="resources/img/form-points.svg" />
<div class="inlined-svg"></div>
<script src="../../../../../../sdkjs/common/device_scale.js?__inline=true"></script>
<script>
isIEBrowser === true &&
(document.write('<script src="../../common/main/lib/util/fix-ie-compat.js"><\/script>'),
document.write('<script src="../../../../sdkjs/vendor/string.js"><\/script>'));
</script>
<script src="../../../vendor/requirejs/require.js"></script>
<script>
isIEBrowser === true ? (window.customBaseUrl = '../../../', require(['ie/app'])) : require(['app']);
isIEBrowser === true ? require(['ie/app']) : require(['app']);
</script>
<link rel="stylesheet" href="../../../apps/documenteditor/main/resources/css/app.css" media="print" onload="this.media='all'">

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

@ -331,12 +331,18 @@
<div id="viewport"></div>
<div class="inlined-svg"></div>
<script src="../../../../../../sdkjs/common/device_scale.js?__inline=true"></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']);
isIEBrowser === true &&
(document.write('<script src="../../common/main/lib/util/fix-ie-compat.js"><\/script>'),
document.write('<script src="../../../../sdkjs/vendor/string.js"><\/script>'));
</script>
<script src="../../../vendor/requirejs/require.js"></script>
<script>
isIEBrowser === true ? 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'">

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: window.customBaseUrl || '../../',
baseUrl: '../../',
paths: {
jquery : '../vendor/jquery/jquery',
underscore : '../vendor/underscore/underscore',

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

@ -346,7 +346,11 @@
<script>
function startApp() {
var script = document.createElement("script");
isIEBrowser === true && (window.customBaseUrl = '../../../');
isIEBrowser === true &&
(document.write('<script src="../../common/main/lib/util/fix-ie-compat.js"><\/script>'),
document.write('<script src="../../../../sdkjs/vendor/string.js"><\/script>'));
script.setAttribute("data-main", isIEBrowser === true ? "ie/app" : "app");
script.src = "../../../vendor/requirejs/require.js";
document.body.appendChild(script);

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

@ -331,7 +331,11 @@
<script>
function startApp() {
var script = document.createElement("script");
isIEBrowser === true && (window.customBaseUrl = '../../../');
isIEBrowser === true &&
(document.write('<script src="../../common/main/lib/util/fix-ie-compat.js"><\/script>'),
document.write('<script src="../../../../sdkjs/vendor/string.js"><\/script>'));
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: window.customBaseUrl || '../../',
baseUrl: '../../',
paths: {
jquery : '../vendor/jquery/jquery',
underscore : '../vendor/underscore/underscore',

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

@ -385,12 +385,18 @@
<inline src="../../common/main/resources/img/combo-border-size/BorderSize.svg" />
<div class="inlined-svg"></div>
<script src="../../../../../../sdkjs/common/device_scale.js?__inline=true"></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']);
isIEBrowser === true &&
(document.write('<script src="../../common/main/lib/util/fix-ie-compat.js"><\/script>'),
document.write('<script src="../../../../sdkjs/vendor/string.js"><\/script>'));
</script>
<script src="../../../vendor/requirejs/require.js"></script>
<script>
isIEBrowser === true ? require(['ie/app']) : require(['app']);
</script>
<link rel="stylesheet" href="../../../apps/presentationeditor/main/resources/css/app.css" media="print" onload="this.media='all'">

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

@ -329,9 +329,15 @@
<div class="inlined-svg"></div>
<script src="../../../../../../sdkjs/common/device_scale.js?__inline=true"></script>
<script>
isIEBrowser === true &&
(document.write('<script src="../../common/main/lib/util/fix-ie-compat.js"><\/script>'),
document.write('<script src="../../../../sdkjs/vendor/string.js"><\/script>'));
</script>
<script src="../../../vendor/requirejs/require.js"></script>
<script>
isIEBrowser === true ? (window.customBaseUrl = '../../../', require(['ie/app'])) : require(['app']);
isIEBrowser === true ? require(['ie/app']) : require(['app']);
</script>
<link rel="stylesheet" href="../../../apps/presentationeditor/main/resources/css/app.css" media="print" onload="this.media='all'">

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: window.customBaseUrl || '../../',
baseUrl: '../../',
paths: {
jquery : '../vendor/jquery/jquery',
underscore : '../vendor/underscore/underscore',

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

@ -407,9 +407,15 @@
<inline src="resources/img/cf-icons.svg" />
<div class="inlined-svg"></div>
<script src="../../../../../../sdkjs/common/device_scale.js?__inline=true"></script>
<script>
isIEBrowser === true &&
(document.write('<script src="../../common/main/lib/util/fix-ie-compat.js"><\/script>'),
document.write('<script src="../../../../sdkjs/vendor/string.js"><\/script>'));
</script>
<script src="../../../vendor/requirejs/require.js"></script>
<script>
isIEBrowser === true ? (window.customBaseUrl = '../../../', require(['ie/app'])) : require(['app']);
isIEBrowser === true ? require(['ie/app']) : require(['app']);
</script>
<link rel="stylesheet" href="../../../apps/spreadsheeteditor/main/resources/css/app.css" media="print" onload="this.media='all'">
</body>

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

@ -237,12 +237,18 @@
<div class="inlined-svg"></div>
<script src="../../../../../../sdkjs/common/device_scale.js?__inline=true"></script>
<script src="../../../vendor/requirejs/require.js"></script>
<script>
var userAgent = navigator.userAgent.toLowerCase(),
const 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']);
isIEBrowser === true &&
(document.write('<script src="../../common/main/lib/util/fix-ie-compat.js"><\/script>'),
document.write('<script src="../../../../sdkjs/vendor/string.js"><\/script>'));
</script>
<script src="../../../vendor/requirejs/require.js"></script>
<script>
isIEBrowser === true ? require(['ie/app']) : require(['app']);
</script>
<link rel="stylesheet" href="../../../apps/spreadsheeteditor/main/resources/css/app.css" media="print" onload="this.media='all'">

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

@ -331,12 +331,17 @@
<div class="inlined-svg"></div>
<script src="../../../../../../sdkjs/common/device_scale.js?__inline=true"></script>
<script src="../../../vendor/requirejs/require.js"></script>
<script>
var userAgent = navigator.userAgent.toLowerCase(),
const 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']);
isIEBrowser === true &&
(document.write('<script src="../../common/main/lib/util/fix-ie-compat.js"><\/script>'),
document.write('<script src="../../../../sdkjs/vendor/string.js"><\/script>'));
</script>
<script src="../../../vendor/requirejs/require.js"></script>
<script>
isIEBrowser === true ? require(['ie/app']) : require(['app']);
</script>
<link rel="stylesheet" href="../../../apps/spreadsheeteditor/main/resources/css/app.css" media="print" onload="this.media='all'">

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

@ -437,8 +437,14 @@
<div class="inlined-svg"></div>
<script src="../../../../../../sdkjs/common/device_scale.js?__inline=true"></script>
<script src="../../../vendor/requirejs/require.js"></script>
<script>
isIEBrowser === true ? (window.customBaseUrl = '../../../', require(['ie/app'])) : require(['app']);
isIEBrowser === true &&
(document.write('<script src="../../common/main/lib/util/fix-ie-compat.js"><\/script>'),
document.write('<script src="../../../../sdkjs/vendor/string.js"><\/script>'));
</script>
<script>
isIEBrowser === true ? require(['ie/app']) : require(['app']);
</script>
<link rel="stylesheet" href="../../../apps/visioeditor/main/resources/css/app.css" media="print" onload="this.media='all'">

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

@ -324,12 +324,18 @@
<div class="inlined-svg"></div>
<script src="../../../../../../sdkjs/common/device_scale.js?__inline=true"></script>
<script src="../../../vendor/requirejs/require.js"></script>
<script>
var userAgent = navigator.userAgent.toLowerCase(),
const 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']);
isIEBrowser === true &&
(document.write('<script src="../../common/main/lib/util/fix-ie-compat.js"><\/script>'),
document.write('<script src="../../../../sdkjs/vendor/string.js"><\/script>'));
</script>
<script src="../../../vendor/requirejs/require.js"></script>
<script>
isIEBrowser === true ? require(['ie/app']) : require(['app']);
</script>
<link rel="stylesheet" href="../../../apps/visioeditor/main/resources/css/app.css" media="print" onload="this.media='all'">

2
build/Gruntfile.js
View File

@ -526,7 +526,7 @@ module.exports = function(grunt) {
babel: {
options: {
sourceMap: false,
presets: ['@babel/preset-env']
presets: [['@babel/preset-env', {modules: false}]]
},
dist: {
files: packageFile.main.js.babel.files

4
build/common.json
View File

@ -94,6 +94,10 @@
"src": "../apps/common/main/resources/themes/themes.json",
"dest": "../deploy/web-apps/apps/common/main/resources/themes/themes.json"
},
"iecompat": {
"src": "../apps/common/main/lib/util/fix-ie-compat.js",
"dest": "../deploy/web-apps/apps/common/main/lib/util/fix-ie-compat.js"
},
"help": {
"expand": true,
"cwd": "../apps/common/main/resources/help/",