From 7b636a7bc36d8b656d96d907d515e1eb065c8666 Mon Sep 17 00:00:00 2001 From: Diego Sampaio Date: Tue, 25 Apr 2017 17:33:39 -0300 Subject: [PATCH 1/3] Try to directly install screen share extension --- packages/rocketchat-webrtc/WebRTCClass.coffee | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/rocketchat-webrtc/WebRTCClass.coffee b/packages/rocketchat-webrtc/WebRTCClass.coffee index be46fdb70b8..a957e411d7c 100644 --- a/packages/rocketchat-webrtc/WebRTCClass.coffee +++ b/packages/rocketchat-webrtc/WebRTCClass.coffee @@ -377,8 +377,13 @@ class WebRTCClass , (isConfirm) => if isConfirm if @navigator is 'chrome' - chrome.webstore.install undefined, refresh, -> - window.open('https://chrome.google.com/webstore/detail/rocketchat-screen-share/nocfbnnmjnndkbipkabodnheejiegccf') + url = 'https://chrome.google.com/webstore/detail/rocketchat-screen-share/nocfbnnmjnndkbipkabodnheejiegccf' + try + chrome.webstore.install url, refresh, -> + window.open(url) + refresh() + catch e + window.open(url) refresh() else if @navigator is 'firefox' window.open('https://addons.mozilla.org/en-GB/firefox/addon/rocketchat-screen-share/') From e6004426bee9e7f14e9a994ccd7c536c5d162436 Mon Sep 17 00:00:00 2001 From: Diego Sampaio Date: Tue, 25 Apr 2017 17:34:48 -0300 Subject: [PATCH 2/3] Wait for iframe setting to start sending postMessages --- .../rocketchat-ui/client/lib/fireEvent.js | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/packages/rocketchat-ui/client/lib/fireEvent.js b/packages/rocketchat-ui/client/lib/fireEvent.js index 4238ca12b39..3a1ae3fe6c1 100644 --- a/packages/rocketchat-ui/client/lib/fireEvent.js +++ b/packages/rocketchat-ui/client/lib/fireEvent.js @@ -1,10 +1,16 @@ -window.fireGlobalEvent = (eventName, params) => { - window.dispatchEvent(new CustomEvent(eventName, {detail: params})); - - if (RocketChat.settings.get('Iframe_Integration_send_enable') === true) { - parent.postMessage({ - eventName, - data: params - }, RocketChat.settings.get('Iframe_Integration_send_target_origin')); - } +window.fireGlobalEvent = function _fireGlobalEvent(eventName, params) { + Tracker.autorun((computation) => { + const enabled = RocketChat.settings.get('Iframe_Integration_send_enable'); + if (enabled === undefined) { + return; + } + computation.stop(); + if (enabled) { + window.dispatchEvent(new CustomEvent(eventName, {detail: params})); + parent.postMessage({ + eventName, + data: params + }, RocketChat.settings.get('Iframe_Integration_send_target_origin')); + } + }); }; From 070a0089db1da25a06ba4da72b03a9f3f3851415 Mon Sep 17 00:00:00 2001 From: Diego Sampaio Date: Tue, 25 Apr 2017 17:35:04 -0300 Subject: [PATCH 3/3] Hide users tryping if on iframe --- packages/rocketchat-theme/client/imports/base.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/rocketchat-theme/client/imports/base.less b/packages/rocketchat-theme/client/imports/base.less index c06687ef4d9..308dff9e5b5 100644 --- a/packages/rocketchat-theme/client/imports/base.less +++ b/packages/rocketchat-theme/client/imports/base.less @@ -4996,7 +4996,7 @@ a + br.only-after-a { border-width: 0; } - .stream-info { + .users-typing { display: none; }