From f9881d857d342cbb9c7e0d58c22eb298b26af843 Mon Sep 17 00:00:00 2001 From: Tasso Evangelista Date: Wed, 8 May 2019 17:46:42 -0300 Subject: [PATCH] [FIX] IE11 support (#14422) * Add symlinks to ES6 node_modules imports * Add URL polyfill for IE11 * Fix thread replies for IE11 --- .eslintignore | 1 + app/threads/client/threads.css | 6 +++++- client/main.js | 2 ++ imports/client/limax | 1 + imports/client/map-age-cleaner | 1 + imports/client/mem | 1 + imports/client/mimic-fn | 1 + imports/client/p-defer | 1 + imports/client/p-is-promise | 1 + imports/client/pinyin | 1 + package-lock.json | 7 ++++++- package.json | 1 + 12 files changed, 22 insertions(+), 2 deletions(-) create mode 120000 imports/client/limax create mode 120000 imports/client/map-age-cleaner create mode 120000 imports/client/mem create mode 120000 imports/client/mimic-fn create mode 120000 imports/client/p-defer create mode 120000 imports/client/p-is-promise create mode 120000 imports/client/pinyin diff --git a/.eslintignore b/.eslintignore index 76f542a4915e..0f9a4f4d54d5 100644 --- a/.eslintignore +++ b/.eslintignore @@ -22,3 +22,4 @@ public/livechat/ !.scripts !packages/rocketchat-livechat/.app public/pdf.worker.min.js +imports/client/ diff --git a/app/threads/client/threads.css b/app/threads/client/threads.css index c40733014031..59793f8ddc1d 100644 --- a/app/threads/client/threads.css +++ b/app/threads/client/threads.css @@ -117,7 +117,7 @@ } &.collapsed .thread-reply-preview { - display: initial; + display: inline; } } @@ -131,10 +131,14 @@ } .message.collapsed > .thread-replied > .thumb { + top: 0; + bottom: 0; left: 40px; width: 20px; height: 20px; + margin-top: auto; + margin-bottom: auto; margin-left: 0; & .avatar { diff --git a/client/main.js b/client/main.js index d73c7088c824..7b0799357d61 100644 --- a/client/main.js +++ b/client/main.js @@ -1,3 +1,5 @@ +import 'url-polyfill'; + import './importsCss'; import './importPackages'; import '../imports/startup/client'; diff --git a/imports/client/limax b/imports/client/limax new file mode 120000 index 000000000000..4407cb1ffef0 --- /dev/null +++ b/imports/client/limax @@ -0,0 +1 @@ +../../node_modules/limax \ No newline at end of file diff --git a/imports/client/map-age-cleaner b/imports/client/map-age-cleaner new file mode 120000 index 000000000000..50bce06f634f --- /dev/null +++ b/imports/client/map-age-cleaner @@ -0,0 +1 @@ +../../node_modules/map-age-cleaner \ No newline at end of file diff --git a/imports/client/mem b/imports/client/mem new file mode 120000 index 000000000000..b6dfce3fa0c6 --- /dev/null +++ b/imports/client/mem @@ -0,0 +1 @@ +../../node_modules/mem \ No newline at end of file diff --git a/imports/client/mimic-fn b/imports/client/mimic-fn new file mode 120000 index 000000000000..6e14eb82385a --- /dev/null +++ b/imports/client/mimic-fn @@ -0,0 +1 @@ +../../node_modules/mimic-fn \ No newline at end of file diff --git a/imports/client/p-defer b/imports/client/p-defer new file mode 120000 index 000000000000..f68aea0461af --- /dev/null +++ b/imports/client/p-defer @@ -0,0 +1 @@ +../../node_modules/p-defer \ No newline at end of file diff --git a/imports/client/p-is-promise b/imports/client/p-is-promise new file mode 120000 index 000000000000..a7af286edcc0 --- /dev/null +++ b/imports/client/p-is-promise @@ -0,0 +1 @@ +../../node_modules/p-is-promise \ No newline at end of file diff --git a/imports/client/pinyin b/imports/client/pinyin new file mode 120000 index 000000000000..61412bef9131 --- /dev/null +++ b/imports/client/pinyin @@ -0,0 +1 @@ +../../node_modules/pinyin \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 66df9cdd970d..3d66f4bf632e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "Rocket.Chat", - "version": "1.0.0-develop", + "version": "1.1.0-develop", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -16757,6 +16757,11 @@ "requires-port": "^1.0.0" } }, + "url-polyfill": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/url-polyfill/-/url-polyfill-1.1.5.tgz", + "integrity": "sha512-9XjIJ6nwrU+nGd8t90Ze0Zs7t8A+SU0gqsqPttj6j3zAVe5q0HFcuv37nDBdVSPpi4aTHTfbUF/i+ZVD+o2EbA==" + }, "url-template": { "version": "2.0.8", "resolved": "https://registry.npmjs.org/url-template/-/url-template-2.0.8.tgz", diff --git a/package.json b/package.json index 623c60421b4c..1d73ed5bafe2 100644 --- a/package.json +++ b/package.json @@ -221,6 +221,7 @@ "ua-parser-js": "^0.7.19", "underscore": "^1.9.1", "underscore.string": "^3.3.5", + "url-polyfill": "^1.1.5", "uuid": "^3.3.2", "webdav": "^2.0.0", "wolfy87-eventemitter": "^5.2.5",