restore BR after the quoted text (but hide it using css) otherwise trouble on Android
This commit is contained in:
@@ -1333,5 +1333,12 @@
|
||||
"description": "Reply to message",
|
||||
"missing": true,
|
||||
"obsolete": false
|
||||
},
|
||||
"menu_item_forward": {
|
||||
"translation": "",
|
||||
"defaultMessage": "Forward",
|
||||
"description": "Forward message",
|
||||
"missing": true,
|
||||
"obsolete": false
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1389,5 +1389,12 @@
|
||||
"description": "Label for unarchiving the topic",
|
||||
"missing": false,
|
||||
"obsolete": false
|
||||
},
|
||||
"menu_item_forward": {
|
||||
"translation": "Forward",
|
||||
"defaultMessage": "Forward",
|
||||
"description": "Forward message",
|
||||
"missing": false,
|
||||
"obsolete": false
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1333,5 +1333,12 @@
|
||||
"description": "Reply to message",
|
||||
"missing": true,
|
||||
"obsolete": false
|
||||
},
|
||||
"menu_item_forward": {
|
||||
"translation": "",
|
||||
"defaultMessage": "Forward",
|
||||
"description": "Forward message",
|
||||
"missing": true,
|
||||
"obsolete": false
|
||||
}
|
||||
}
|
||||
|
||||
@@ -429,6 +429,10 @@
|
||||
"defaultMessage": "Edit permissions",
|
||||
"description": "Menu item [Edit permissions]"
|
||||
},
|
||||
"menu_item_forward": {
|
||||
"defaultMessage": "Forward",
|
||||
"description": "Forward message"
|
||||
},
|
||||
"menu_item_info": {
|
||||
"defaultMessage": "Info",
|
||||
"description": "Show extended topic information"
|
||||
|
||||
@@ -1333,5 +1333,12 @@
|
||||
"description": "Reply to message",
|
||||
"missing": true,
|
||||
"obsolete": false
|
||||
},
|
||||
"menu_item_forward": {
|
||||
"translation": "",
|
||||
"defaultMessage": "Forward",
|
||||
"description": "Forward message",
|
||||
"missing": true,
|
||||
"obsolete": false
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1333,5 +1333,12 @@
|
||||
"description": "Reply to message",
|
||||
"missing": true,
|
||||
"obsolete": false
|
||||
},
|
||||
"menu_item_forward": {
|
||||
"translation": "",
|
||||
"defaultMessage": "Forward",
|
||||
"description": "Forward message",
|
||||
"missing": true,
|
||||
"obsolete": false
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1333,5 +1333,12 @@
|
||||
"description": "Reply to message",
|
||||
"missing": true,
|
||||
"obsolete": false
|
||||
},
|
||||
"menu_item_forward": {
|
||||
"translation": "",
|
||||
"defaultMessage": "Forward",
|
||||
"description": "Forward message",
|
||||
"missing": true,
|
||||
"obsolete": false
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1333,5 +1333,12 @@
|
||||
"description": "Reply to message",
|
||||
"missing": true,
|
||||
"obsolete": false
|
||||
},
|
||||
"menu_item_forward": {
|
||||
"translation": "",
|
||||
"defaultMessage": "Forward",
|
||||
"description": "Forward message",
|
||||
"missing": true,
|
||||
"obsolete": false
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1333,5 +1333,12 @@
|
||||
"description": "Reply to message",
|
||||
"missing": true,
|
||||
"obsolete": false
|
||||
},
|
||||
"menu_item_forward": {
|
||||
"translation": "",
|
||||
"defaultMessage": "Forward",
|
||||
"description": "Forward message",
|
||||
"missing": true,
|
||||
"obsolete": false
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
File diff suppressed because one or more lines are too long
@@ -688,7 +688,7 @@ class MessagesView extends React.Component {
|
||||
if (typeof msg == 'string') {
|
||||
msg = Drafty.parse(msg);
|
||||
}
|
||||
msg = Drafty.append(this.state.reply.content, msg);
|
||||
msg = Drafty.append(Drafty.appendLineBreak(this.state.reply.content), msg);
|
||||
this.handleCancelReply();
|
||||
}
|
||||
this.props.sendMessage(msg, uploadCompletionPromise, uploader, head);
|
||||
|
||||
@@ -78,9 +78,15 @@ class BaseChatMessage extends React.PureComponent {
|
||||
menuItems.push('menu_item_reply');
|
||||
menuItems.push('menu_item_forward');
|
||||
}
|
||||
this.props.showContextMenu({ seq: this.props.seq, content: this.props.content,
|
||||
userFrom: this.props.userFrom, userName: this.props.userName,
|
||||
y: e.pageY, x: e.pageX, pickReply: this.props.pickReply }, menuItems);
|
||||
this.props.showContextMenu({
|
||||
seq: this.props.seq,
|
||||
content: this.props.content,
|
||||
userFrom: this.props.userFrom,
|
||||
userName: this.props.userName,
|
||||
y: e.pageY,
|
||||
x: e.pageX,
|
||||
pickReply: this.props.pickReply
|
||||
}, menuItems);
|
||||
}
|
||||
|
||||
handleProgress(ratio) {
|
||||
|
||||
Reference in New Issue
Block a user