1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-08-01 15:23:05 +00:00

Merge pull request #4919 from haiwen/fix-ie11-compatibility-issues

Fix ie11 compatibility issues
This commit is contained in:
Daniel Pan 2021-06-17 16:49:27 +08:00 committed by GitHub
commit bcfc8eb83e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 1665 additions and 120 deletions

View File

@ -0,0 +1,4 @@
'use strict';
require('react-app-polyfill/ie9');
require('react-app-polyfill/stable');

View File

@ -40,6 +40,7 @@ const getEntries = (isEnvDevelopment) => {
let entries = {};
Object.keys(entryFiles).forEach(key => {
let entry = [];
entry.push(require.resolve('./polyfills'));
if (isEnvDevelopment) {
entry.push(require.resolve('react-dev-utils/webpackHotDevClient'));
}

File diff suppressed because it is too large Load Diff

View File

@ -23,6 +23,7 @@
"prop-types": "^15.6.2",
"raf": "3.4.0",
"react": "^16.8.6",
"react-app-polyfill": "^2.0.0",
"react-chartjs-2": "^2.8.0",
"react-codemirror": "^1.0.0",
"react-cookies": "^0.1.0",
@ -53,12 +54,14 @@
"production": [
">0.2%",
"not dead",
"not op_mini all"
"not op_mini all",
"ie 11"
],
"development": [
"last 1 chrome version",
"last 1 firefox version",
"last 1 safari version"
"last 1 safari version",
"ie 11"
]
},
"jest": {
@ -143,7 +146,6 @@
"postcss-preset-env": "6.7.0",
"postcss-safe-parser": "5.0.2",
"prompts": "2.4.0",
"react-app-polyfill": "^2.0.0",
"react-dev-utils": "11.0.4",
"react-refresh": "^0.8.3",
"resolve": "1.18.1",

File diff suppressed because one or more lines are too long

View File

@ -8,7 +8,7 @@
{% block extra_script %}
<script type="text/javascript">
Object.assign(app.pageOptions, {
var newOptions = {
enableShareToDepartment: {% if enable_share_to_department %} true {% else %} false {% endif %},
shareLinkExpireDaysDefault: {{ share_link_expire_days_default }},
shareLinkExpireDaysMin: {{ share_link_expire_days_min }},
@ -16,14 +16,17 @@
uploadLinkExpireDaysDefault: {{ upload_link_expire_days_default }},
uploadLinkExpireDaysMin: {{ upload_link_expire_days_min }},
uploadLinkExpireDaysMax: {{ upload_link_expire_days_max }}
});
};
for (var key in newOptions) {
app.pageOptions[key] = newOptions[key];
}
{% if onlyoffice_desktop_editors_portal_login %}
let params = {
var params = {
"displayName": "{{request.user.username|email2nickname|escapejs}}",
"email": "{{request.user.username|escapejs}}",
"domain": "{{service_url}}",
"provider": "{{site_name}}"
}
};
window.AscDesktopEditor.execCommand('portal:login', JSON.stringify(params));
{% endif %}
</script>