From ec92ef6367fe067d892447a8b9d471c651a3658d Mon Sep 17 00:00:00 2001 From: "DBL-ZENTRALE\\tp514760" Date: Tue, 10 Jul 2018 13:54:31 +0200 Subject: [PATCH 1/4] Fixed svg for older chrome browsers bug #11414 --- packages/rocketchat-ui-master/client/main.js | 2 +- packages/rocketchat-ui/client/components/icon.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/rocketchat-ui-master/client/main.js b/packages/rocketchat-ui-master/client/main.js index 17736ef86227..3921d3d1b3bb 100644 --- a/packages/rocketchat-ui-master/client/main.js +++ b/packages/rocketchat-ui-master/client/main.js @@ -4,7 +4,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.isFirefox = navigator.userAgent.match(/(Firefox|Chrome)\/(\d+)\.\d/); Template.body.onRendered(function() { new Clipboard('.clipboard'); diff --git a/packages/rocketchat-ui/client/components/icon.js b/packages/rocketchat-ui/client/components/icon.js index c16c92c2c1c8..ae4930109bde 100644 --- a/packages/rocketchat-ui/client/components/icon.js +++ b/packages/rocketchat-ui/client/components/icon.js @@ -3,5 +3,5 @@ const firefoxBaseUrlFix = () => `${ window.location.origin }${ FlowRouter.current().path }`; Template.icon.helpers({ - baseUrl: isFirefox && isFirefox[1] < 55 ? firefoxBaseUrlFix : undefined + baseUrl: isFirefox && isFirefox[2] < 55 ? firefoxBaseUrlFix : undefined }); From cfadcdd765bb7d7fdbbaf81c3768518f249bb679 Mon Sep 17 00:00:00 2001 From: "DBL-ZENTRALE\\tp514760" Date: Wed, 11 Jul 2018 08:24:03 +0200 Subject: [PATCH 2/4] Created own check for Chrome --- packages/rocketchat-ui-master/client/main.js | 3 ++- packages/rocketchat-ui/client/components/icon.js | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/rocketchat-ui-master/client/main.js b/packages/rocketchat-ui-master/client/main.js index 3921d3d1b3bb..d718b196722d 100644 --- a/packages/rocketchat-ui-master/client/main.js +++ b/packages/rocketchat-ui-master/client/main.js @@ -4,7 +4,8 @@ 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|Chrome)\/(\d+)\.\d/); +this.isFirefox = navigator.userAgent.match(/Firefox\/(\d+)\.\d/); +this.isChrome = navigator.userAgent.match(/Chrome\/(\d+)\.\d/); Template.body.onRendered(function() { new Clipboard('.clipboard'); diff --git a/packages/rocketchat-ui/client/components/icon.js b/packages/rocketchat-ui/client/components/icon.js index ae4930109bde..aa4e384b60c1 100644 --- a/packages/rocketchat-ui/client/components/icon.js +++ b/packages/rocketchat-ui/client/components/icon.js @@ -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[2] < 55 ? firefoxBaseUrlFix : undefined + baseUrl: ( (isFirefox && isFirefox[1] < 55) || (isChrome && isChrome[1] < 55) ) ? baseUrlFix : undefined }); From 8ada76acb70e22bc90be2fc4b40e8c71bf6b7b0a Mon Sep 17 00:00:00 2001 From: "DBL-ZENTRALE\\tp514760" Date: Wed, 11 Jul 2018 08:34:02 +0200 Subject: [PATCH 3/4] Fixed broken lint comment --- packages/rocketchat-ui/client/components/icon.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/rocketchat-ui/client/components/icon.js b/packages/rocketchat-ui/client/components/icon.js index aa4e384b60c1..ee17dc63c66a 100644 --- a/packages/rocketchat-ui/client/components/icon.js +++ b/packages/rocketchat-ui/client/components/icon.js @@ -1,4 +1,4 @@ -/* globals isFirefox isChrome */ +/* globals isFirefox, isChrome */ const baseUrlFix = () => `${ window.location.origin }${ FlowRouter.current().path }`; From f52b54f7c30b58a2027017dbb3447f9a66b34767 Mon Sep 17 00:00:00 2001 From: "DBL-ZENTRALE\\tp514760" Date: Wed, 11 Jul 2018 08:40:50 +0200 Subject: [PATCH 4/4] Fixed 'space-in-parens' mistake --- packages/rocketchat-ui/client/components/icon.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/rocketchat-ui/client/components/icon.js b/packages/rocketchat-ui/client/components/icon.js index ee17dc63c66a..08f92ca01c28 100644 --- a/packages/rocketchat-ui/client/components/icon.js +++ b/packages/rocketchat-ui/client/components/icon.js @@ -3,5 +3,5 @@ const baseUrlFix = () => `${ window.location.origin }${ FlowRouter.current().path }`; Template.icon.helpers({ - baseUrl: ( (isFirefox && isFirefox[1] < 55) || (isChrome && isChrome[1] < 55) ) ? baseUrlFix : undefined + baseUrl: ((isFirefox && isFirefox[1] < 55) || (isChrome && isChrome[1] < 55)) ? baseUrlFix : undefined });