PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

support scrollable content for UnknownDeviceDialog

Browse source
This commit is contained in:
Matthew Hodgson 2017-02-02 00:25:49 +00:00
parent c09d173415
commit 5e5b7f89f4
4 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Modal.js
View file

@ -177,7 +177,7 @@ class ModalManager {
var modal = this._modals[0]; var modal = this._modals[0];
var dialog = ( var dialog = (
<div className={"mx_Dialog_wrapper " + modal.className}> <div className={"mx_Dialog_wrapper " + (modal.className ? modal.className : '') }>
<div className="mx_Dialog"> <div className="mx_Dialog">
{modal.elem} {modal.elem}
</div> </div>

2
src/Resend.js
View file

@ -33,7 +33,7 @@ module.exports = {
var UnknownDeviceDialog = sdk.getComponent("dialogs.UnknownDeviceDialog"); var UnknownDeviceDialog = sdk.getComponent("dialogs.UnknownDeviceDialog");
Modal.createDialog(UnknownDeviceDialog, { Modal.createDialog(UnknownDeviceDialog, {
devices: err.devices devices: err.devices
}); }, "mx_Dialog_unknownDevice");
} }
dis.dispatch({ dis.dispatch({

7
src/components/views/dialogs/UnknownDeviceDialog.js
View file

@ -17,6 +17,7 @@ limitations under the License.
import React from 'react'; import React from 'react';
import sdk from '../../../index'; import sdk from '../../../index';
import MatrixClientPeg from '../../../MatrixClientPeg'; import MatrixClientPeg from '../../../MatrixClientPeg';
import GeminiScrollbar from 'react-gemini-scrollbar';
function UserUnknownDeviceList(props) { function UserUnknownDeviceList(props) {
const {userDevices} = props; const {userDevices} = props;
@ -81,12 +82,12 @@ export default React.createClass({
onFinished={this.props.onFinished} onFinished={this.props.onFinished}
title='Room contains unknown devices' title='Room contains unknown devices'
> >
<div className="mx_Dialog_content"> <GeminiScrollbar autoshow={true} className="mx_Dialog_content">
<h4>This room contains devices which have not been <h4>This room contains devices which have not been
verified.</h4> verified.</h4>
<p> <p>
This means there is no guarantee that the devices belong This means there is no guarantee that the devices belong
to a valid user of the room. to a rightful user of the room.
</p><p> </p><p>
We recommend you go through the verification process We recommend you go through the verification process
for each device before continuing, but you can resend for each device before continuing, but you can resend
@ -94,7 +95,7 @@ export default React.createClass({
</p> </p>
<p>Unknown devices:</p> <p>Unknown devices:</p>
<UnknownDeviceList devices={this.props.devices} /> <UnknownDeviceList devices={this.props.devices} />
</div> </GeminiScrollbar>
<div className="mx_Dialog_buttons"> <div className="mx_Dialog_buttons">
<button className="mx_Dialog_primary" autoFocus={ true } <button className="mx_Dialog_primary" autoFocus={ true }
onClick={ this.props.onFinished } > onClick={ this.props.onFinished } >

2
src/components/views/rooms/MessageComposerInputOld.js
View file

@ -34,7 +34,7 @@ export function onSendMessageFailed(err) {
const UnknownDeviceDialog = sdk.getComponent("dialogs.UnknownDeviceDialog"); const UnknownDeviceDialog = sdk.getComponent("dialogs.UnknownDeviceDialog");
Modal.createDialog(UnknownDeviceDialog, { Modal.createDialog(UnknownDeviceDialog, {
devices: err.devices, devices: err.devices,
}); }, "mx_Dialog_unknownDevice");
} }
dis.dispatch({ dis.dispatch({
action: 'message_send_failed', action: 'message_send_failed',