r4sas/webogram-i2p
1
0
Fork 0
Code Issues Releases Wiki Activity

Improved reply message styles

Browse Source
This commit is contained in:
Igor Zhukov 2015-03-19 00:04:35 +03:00
parent e5198075c1
commit e04ddca6ae
4 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/css/app.css
View File

@ -1768,7 +1768,6 @@ div.im_message_body {
text-decoration: none; text-decoration: none;
margin-bottom: 5px; margin-bottom: 5px;
margin-top: 2px; margin-top: 2px;
height: 36px;
overflow: hidden; overflow: hidden;
} }
.im_message_reply_wrap:hover { .im_message_reply_wrap:hover {
@ -1800,7 +1799,7 @@ div.im_message_body {
margin-bottom: 3px; margin-bottom: 3px;
} }
.im_message_reply_loading { .im_message_reply_loading {
padding: 12px 0; padding: 7px 0 8px;
} }
.im_reply_message_service, .im_reply_message_service,
.im_reply_message_media { .im_reply_message_media {
@ -1813,10 +1812,20 @@ div.im_message_body {
text-overflow: ellipsis; text-overflow: ellipsis;
margin-bottom: 1px; margin-bottom: 1px;
} }
.im_message_reply_thumbed .im_message_reply_wrap,
.im_message_reply_thumbed .im_message_reply_border {
height: 42px;
}
.im_message_reply_thumbed .im_message_reply_author {
margin-top: 4px;
}
.im_message_reply_thumbed .im_message_reply_author, .im_message_reply_thumbed .im_message_reply_author,
.im_message_reply_thumbed .im_message_reply_body { .im_message_reply_thumbed .im_message_reply_body {
margin-left: 52px; margin-left: 52px;
} }
.im_message_reply_wrap .im_message_reply_thumbed {
margin-bottom: 4px;
}
a.im_message_fwd_photo { a.im_message_fwd_photo {

2
app/js/controllers.js
View File

@ -1623,7 +1623,7 @@ angular.module('myApp.controllers', ['myApp.i18n'])
} }
function replySelect(messageID) { function replySelect(messageID) {
$scope.draftMessage.replyToMessage = AppMessagesManager.wrapForHistory(messageID); $scope.draftMessage.replyToMessage = AppMessagesManager.wrapForDialog(messageID);
$scope.$broadcast('ui_peer_reply'); $scope.$broadcast('ui_peer_reply');
} }

2
app/js/directives.js
View File

@ -339,7 +339,7 @@ angular.module('myApp.directives', ['myApp.filters'])
var messageID = message.id; var messageID = message.id;
var stopWaiting = $scope.$on('messages_downloaded', function (e, msgIDs) { var stopWaiting = $scope.$on('messages_downloaded', function (e, msgIDs) {
if (msgIDs.indexOf(messageID) != -1) { if (msgIDs.indexOf(messageID) != -1) {
$scope.replyMessage = AppMessagesManager.wrapForHistory(messageID); $scope.replyMessage = AppMessagesManager.wrapForDialog(messageID);
updateMessage($scope, element); updateMessage($scope, element);
stopWaiting(); stopWaiting();
} }

2
app/js/services.js
View File

@ -2003,7 +2003,7 @@ angular.module('myApp.services', ['myApp.i18n', 'izhukov.utils'])
var replyToMsgID = message.reply_to_msg_id; var replyToMsgID = message.reply_to_msg_id;
if (replyToMsgID) { if (replyToMsgID) {
if (messagesStorage[replyToMsgID]) { if (messagesStorage[replyToMsgID]) {
message.reply_to_msg = wrapForHistory(replyToMsgID); message.reply_to_msg = wrapForDialog(replyToMsgID);
} else { } else {
message.reply_to_msg = {id: replyToMsgID, loading: true}; message.reply_to_msg = {id: replyToMsgID, loading: true};
if (needSingleMessages.indexOf(replyToMsgID) == -1) { if (needSingleMessages.indexOf(replyToMsgID) == -1) {