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

Fix ie11 compatibility issues

frontend/config/polyfills.js

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

frontend/config/webpack.entry.js

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

frontend/package.json

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

seahub/templates/react_app.html

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