OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1316 from matrix-org/luke/fix-app-name-case 

Don't apply case logic to app names
pull/21833/head
Luke Barnard 2017-08-18 15:08:40 +01:00 committed by GitHub
parent 3c7eec711b 5e0a7212d9
commit bf07333915
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/TextForEvent.js
View File

@ -252,10 +252,7 @@ function textForWidgetEvent(event) {
const senderName = event.sender ? event.sender.name : event.getSender();
const previousContent = event.getPrevContent() || {};
const {name, type, url} = event.getContent() || {};
let widgetName = widgetName || name || type || previousContent.type || '';
// Apply sentence case
widgetName = widgetName ? widgetName[0].toUpperCase() + widgetName.slice(1).toLowerCase() + ' ' : '';
const widgetName = widgetName || name || type || previousContent.type || '';
// If the widget was removed, its content should be {}, but this is sufficiently
// equivalent to that condition.

1
src/components/views/elements/AppTile.js
View File

@ -183,7 +183,6 @@ export default React.createClass({
let appTileName = "No name";
if(this.props.name && this.props.name.trim()) {
appTileName = this.props.name.trim();
appTileName = appTileName[0].toUpperCase() + appTileName.slice(1).toLowerCase();
}
return appTileName;
},