From 1bd80139f7681c322255fb14c0840aeee61a78b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= Date: Wed, 19 Dec 2018 09:48:20 +0100 Subject: [PATCH] Remove full window dragging hack It's more trouble than it's worth really. For one, it doesn't work in brady bunch mode. --- .../conference/components/Conference.js | 21 ------------------- app/index.html | 6 ------ main.js | 1 - 3 files changed, 28 deletions(-) diff --git a/app/features/conference/components/Conference.js b/app/features/conference/components/Conference.js index 1ee0ea5..6fbab70 100644 --- a/app/features/conference/components/Conference.js +++ b/app/features/conference/components/Conference.js @@ -330,8 +330,6 @@ class Conference extends Component { * @returns {void} */ _onVideoConferenceJoined(conferenceInfo: Object) { - setupDragAreas(this._api.getIFrame()); - this._setAvatarURL(this.props._avatarURL); this._setEmail(this.props._email); this._setName(this.props._name); @@ -376,25 +374,6 @@ class Conference extends Component { } -/** - * Inject some style into the iframe so everything except the filmstrip, chat, - * buttons or any input is draggable. - * - * @param {Object} iframe - Reference to the iframe where the drag areas will - * be set. - * @returns {void} - */ -function setupDragAreas(iframe) { - const injectStyle = document.createElement('style'); - - injectStyle.type = 'text/css'; - injectStyle.textContent - = 'body { -webkit-app-region: drag; }' - + 'button, input { -webkit-app-region: no-drag }' - + '#chatconversation, .filmstrip { -webkit-app-region: no-drag; }'; - iframe.contentDocument.head.appendChild(injectStyle); -} - /** * Maps (parts of) the redux state to the React props. * diff --git a/app/index.html b/app/index.html index 1df451e..405d3ac 100644 --- a/app/index.html +++ b/app/index.html @@ -5,12 +5,6 @@ body, html { overflow: hidden; } - body { - -webkit-app-region: drag - } - button, input { - -webkit-app-region: no-drag - } diff --git a/main.js b/main.js index d2bcb61..38f455c 100644 --- a/main.js +++ b/main.js @@ -132,7 +132,6 @@ function createJitsiMeetWindow() { minWidth: 800, minHeight: 600, show: false, - titleBarStyle: 'hidden', webPreferences: { nativeWindowOpen: true }