Merge pull request #386 from matrix-org/rav/default_to_device_id

DevicesPanel: use device_id as a placeholder
This commit is contained in:
David Baker 2016-08-03 16:12:46 +01:00 committed by GitHub
commit 3780d82f6f

View file

@ -111,7 +111,9 @@ export default class DevicesPanelEntry extends React.Component {
<div className="mx_DevicesPanel_device"> <div className="mx_DevicesPanel_device">
<div className="mx_DevicesPanel_deviceName"> <div className="mx_DevicesPanel_deviceName">
<EditableTextContainer initialValue={device.display_name} <EditableTextContainer initialValue={device.display_name}
onSubmit={this._onDisplayNameChanged} /> onSubmit={this._onDisplayNameChanged}
placeholder={device.device_id}
/>
</div> </div>
<div className="mx_DevicesPanel_lastSeen"> <div className="mx_DevicesPanel_lastSeen">
{lastSeen} {lastSeen}