Skip to content

Commit

Permalink
[FIX] IE11 support (#14422)
Browse files Browse the repository at this point in the history
* Add symlinks to ES6 node_modules imports

* Add URL polyfill for IE11

* Fix thread replies for IE11
  • Loading branch information
tassoevan authored and ggazzo committed May 8, 2019
1 parent b2117a0 commit f9881d8
Show file tree
Hide file tree
Showing 12 changed files with 22 additions and 2 deletions.
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,4 @@ public/livechat/
!.scripts
!packages/rocketchat-livechat/.app
public/pdf.worker.min.js
imports/client/
6 changes: 5 additions & 1 deletion app/threads/client/threads.css
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
}

&.collapsed .thread-reply-preview {
display: initial;
display: inline;
}
}

Expand All @@ -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 {
Expand Down
2 changes: 2 additions & 0 deletions client/main.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import 'url-polyfill';

import './importsCss';
import './importPackages';
import '../imports/startup/client';
Expand Down
1 change: 1 addition & 0 deletions imports/client/limax
1 change: 1 addition & 0 deletions imports/client/map-age-cleaner
1 change: 1 addition & 0 deletions imports/client/mem
1 change: 1 addition & 0 deletions imports/client/mimic-fn
1 change: 1 addition & 0 deletions imports/client/p-defer
1 change: 1 addition & 0 deletions imports/client/p-is-promise
1 change: 1 addition & 0 deletions imports/client/pinyin
7 changes: 6 additions & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit f9881d8

Please sign in to comment.