Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/titleBar

src/components/views/rooms/AppsDrawer.js

@@ -133,14 +133,17 @@ module.exports = React.createClass({
             '$matrix_avatar_url': user ? MatrixClientPeg.get().mxcUrlToHttp(user.avatarUrl) : '',
         };
 
+        app.id = appId;
+        app.name = app.name || app.type;
+
         if (app.data) {
             Object.keys(app.data).forEach((key) => {
                 params['$' + key] = app.data[key];
             });
+
+            app.waitForIframeLoad = (app.data.waitForIframeLoad === 'false' ? false : true);
         }
 
-        app.id = appId;
-        app.name = app.name || app.type;
         app.url = this.encodeUri(app.url, params);
         app.creatorUserId = (sender && sender.userId) ? sender.userId : null;
 
@@ -225,6 +228,7 @@ module.exports = React.createClass({
                     show={this.props.showApps}
                     creatorUserId={app.creatorUserId}
                     widgetPageTitle={(app.data && app.data.title) ? app.data.title : ''}
+                    waitForIframeLoad={app.waitForIframeLoad}
                 />);
             });