diff --git a/src/ScalarMessaging.js b/src/ScalarMessaging.js index 88a78595d6..d14d439d66 100644 --- a/src/ScalarMessaging.js +++ b/src/ScalarMessaging.js @@ -491,7 +491,7 @@ function canSendEvent(event, roomId) { } if (!canSend) { - sendError(event, _t('You do not have permission in this room.')); + sendError(event, _t('You do not have permission to do that in this room.')); return; } diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js index 3c3f01c1cd..effe50643c 100644 --- a/src/components/views/elements/AppTile.js +++ b/src/components/views/elements/AppTile.js @@ -21,7 +21,9 @@ import React from 'react'; import MatrixClientPeg from '../../../MatrixClientPeg'; import ScalarAuthClient from '../../../ScalarAuthClient'; import SdkConfig from '../../../SdkConfig'; +import Modal from '../../../Modal'; import { _t } from '../../../languageHandler'; +import sdk from '../../../index'; const ALLOWED_APP_URL_SCHEMES = ['https:', 'http:']; @@ -33,6 +35,7 @@ export default React.createClass({ url: React.PropTypes.string.isRequired, name: React.PropTypes.string.isRequired, room: React.PropTypes.object.isRequired, + type: React.PropTypes.string.isRequired, }, getDefaultProps: function() { @@ -86,8 +89,13 @@ export default React.createClass({ }); }, - _onEditClick: function() { - console.log("Edit widget %s", this.props.id); + _onEditClick: function(e) { + console.log("Edit widget ID ", this.props.id); + const IntegrationsManager = sdk.getComponent("views.settings.IntegrationsManager"); + const src = this._scalarClient.getScalarInterfaceUrlForRoom(this.props.room.roomId, 'type_' + this.props.type); + Modal.createDialog(IntegrationsManager, { + src: src, + }, "mx_IntegrationsManager"); }, _onDeleteClick: function() { @@ -120,10 +128,10 @@ export default React.createClass({
Loading...
); } else { - // Note that there is advice saying allow-scripts shouldn;t be used with allow-same-origin + // Note that there is advice saying allow-scripts shouldn't be used with allow-same-origin // because that would allow the iframe to prgramatically remove the sandbox attribute, but // this would only be for content hosted on the same origin as the riot client: anything - // hosted on the same origin as the client will get the same access access as if you clicked + // hosted on the same origin as the client will get the same access as if you clicked // a link to it. const sandboxFlags = "allow-forms allow-popups allow-popups-to-escape-sandbox "+ "allow-same-origin allow-scripts"; @@ -140,18 +148,22 @@ export default React.createClass({ ); } + + // editing is done in scalar + const showEditButton = Boolean(this._scalarClient); + return (
{this.formatAppTileName()} {/* Edit widget */} - {/* Edit */} + />} {/* Delete widget */}