Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FIX] Fixed svg for older chrome browsers bug #11414 #11416

Merged
merged 7 commits into from
Jul 17, 2018
Merged

[FIX] Fixed svg for older chrome browsers bug #11414 #11416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ec92ef6
Fixed svg for older chrome browsers bug #11414
tpDBL Jul 10, 2018
f8791d6
Merge branch 'develop' into fix-svg-chrome
tpDBL Jul 10, 2018
cfadcdd
Created own check for Chrome
tpDBL Jul 11, 2018
8ada76a
Fixed broken lint comment
tpDBL Jul 11, 2018
c251e79
Merge branch 'develop' into fix-svg-chrome
tpDBL Jul 11, 2018
f52b54f
Fixed 'space-in-parens' mistake
tpDBL Jul 11, 2018
a1cbdff
Merge branch 'fix-svg-chrome' of https://github.com/tpDBL/Rocket.Chat…
tpDBL Jul 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/rocketchat-ui-master/client/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import s from 'underscore.string';
RocketChat.settings.collection.find({_id:/theme-color-rc/i}, {fields:{ value: 1 }}).observe({changed: () => { DynamicCss.run(true); }});

this.isFirefox = navigator.userAgent.match(/Firefox\/(\d+)\.\d/);
this.isChrome = navigator.userAgent.match(/Chrome\/(\d+)\.\d/);

Template.body.onRendered(function() {
new Clipboard('.clipboard');
Expand Down
6 changes: 3 additions & 3 deletions packages/rocketchat-ui/client/components/icon.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* globals isFirefox */
/* globals isFirefox, isChrome */

const firefoxBaseUrlFix = () => `${ window.location.origin }${ FlowRouter.current().path }`;
const baseUrlFix = () => `${ window.location.origin }${ FlowRouter.current().path }`;

Template.icon.helpers({
baseUrl: isFirefox && isFirefox[1] < 55 ? firefoxBaseUrlFix : undefined
baseUrl: ((isFirefox && isFirefox[1] < 55) || (isChrome && isChrome[1] < 55)) ? baseUrlFix : undefined
});