matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-11 20:22:36 +03:00
Code Activity

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

Browse Source 
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
parent 42f6703112 f4d41b7847
commit 3780d82f6f
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/views/settings/DevicesPanelEntry.js
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}