Revert "Merge pull request #2395 from matrix-org/dbkr/merge_develop_experimental"

This reverts commit ad47144355.

src/components/views/elements/AppTile.js

@@ -22,6 +22,7 @@ import qs from 'querystring';
 import React from 'react';
 import PropTypes from 'prop-types';
 import MatrixClientPeg from '../../../MatrixClientPeg';
+import PlatformPeg from '../../../PlatformPeg';
 import ScalarAuthClient from '../../../ScalarAuthClient';
 import WidgetMessaging from '../../../WidgetMessaging';
 import TintableSvgButton from './TintableSvgButton';
@@ -48,6 +49,7 @@ export default class AppTile extends React.Component {
         this.state = this._getNewState(props);
 
         this._onAction = this._onAction.bind(this);
+        this._onMessage = this._onMessage.bind(this);
         this._onLoaded = this._onLoaded.bind(this);
         this._onEditClick = this._onEditClick.bind(this);
         this._onDeleteClick = this._onDeleteClick.bind(this);
@@ -141,6 +143,10 @@ export default class AppTile extends React.Component {
     }
 
     componentDidMount() {
+        // Legacy Jitsi widget messaging -- TODO replace this with standard widget
+        // postMessaging API
+        window.addEventListener('message', this._onMessage, false);
+
         // Widget action listeners
         this.dispatcherRef = dis.register(this._onAction);
     }
@@ -149,6 +155,9 @@ export default class AppTile extends React.Component {
         // Widget action listeners
         dis.unregister(this.dispatcherRef);
 
+        // Jitsi listener
+        window.removeEventListener('message', this._onMessage);
+
         // if it's not remaining on screen, get rid of the PersistedElement container
         if (!ActiveWidgetStore.getWidgetPersistence(this.props.id)) {
             ActiveWidgetStore.destroyPersistentWidget();
@@ -224,6 +233,32 @@ export default class AppTile extends React.Component {
         }
     }
 
+    // Legacy Jitsi widget messaging
+    // TODO -- This should be replaced with the new widget postMessaging API
+    _onMessage(event) {
+        if (this.props.type !== 'jitsi') {
+            return;
+        }
+        if (!event.origin) {
+            event.origin = event.originalEvent.origin;
+        }
+
+        const widgetUrlObj = url.parse(this.state.widgetUrl);
+        const eventOrigin = url.parse(event.origin);
+        if (
+            eventOrigin.protocol !== widgetUrlObj.protocol ||
+            eventOrigin.host !== widgetUrlObj.host
+        ) {
+            return;
+        }
+
+        if (event.data.widgetAction === 'jitsi_iframe_loaded') {
+            const iframe = this.refs.appFrame.contentWindow
+                .document.querySelector('iframe[id^="jitsiConferenceFrame"]');
+            PlatformPeg.get().setupScreenSharingForIframe(iframe);
+        }
+    }
+
     _canUserModify() {
         // User widgets should always be modifiable by their creator
         if (this.props.userWidget && MatrixClientPeg.get().credentials.userId === this.props.creatorUserId) {
@@ -509,7 +544,7 @@ export default class AppTile extends React.Component {
 
         // Additional iframe feature pemissions
         // (see - https://sites.google.com/a/chromium.org/dev/Home/chromium-security/deprecating-permissions-in-cross-origin-iframes and https://wicg.github.io/feature-policy/)
-        const iframeFeatures = "microphone; camera; encrypted-media; autoplay;";
+        const iframeFeatures = "microphone; camera; encrypted-media;";
 
         const appTileBodyClass = 'mx_AppTileBody' + (this.props.miniMode ? '_mini  ' : ' ');
 

src/components/views/elements/TintableSvg.js

@@ -29,7 +29,6 @@ var TintableSvg = React.createClass({
         width: PropTypes.string.isRequired,
         height: PropTypes.string.isRequired,
         className: PropTypes.string,
-        forceColors: PropTypes.arrayOf(PropTypes.string),
     },
 
     statics: {
@@ -51,12 +50,6 @@ var TintableSvg = React.createClass({
         delete TintableSvg.mounts[this.id];
     },
 
-    componentDidUpdate: function(prevProps, prevState) {
-        if (prevProps.forceColors !== this.props.forceColors) {
-            this.calcAndApplyFixups(this.refs.svgContainer);
-        }
-    },
-
     tint: function() {
         // TODO: only bother running this if the global tint settings have changed
         // since we loaded!
@@ -64,13 +57,8 @@ var TintableSvg = React.createClass({
     },
 
     onLoad: function(event) {
-        this.calcAndApplyFixups(event.target);
-    },
-
-    calcAndApplyFixups: function(target) {
-        if (!target) return;
-        // console.log("TintableSvg.calcAndApplyFixups for " + this.props.src);
-        this.fixups = Tinter.calcSvgFixups([target], this.props.forceColors);
+        // console.log("TintableSvg.onLoad for " + this.props.src);
+        this.fixups = Tinter.calcSvgFixups([event.target]);
         Tinter.applySvgFixups(this.fixups);
     },
 
@@ -83,7 +71,6 @@ var TintableSvg = React.createClass({
                     height={this.props.height}
                     onLoad={this.onLoad}
                     tabIndex="-1"
-                    ref="svgContainer"
                 />
         );
     },