Verified users
typing bugfix
This commit is contained in:
parent
02cfbdc6c0
commit
fd804a59bf
@ -2679,7 +2679,8 @@ angular.module('myApp.directives', ['myApp.filters'])
|
|||||||
var key = short ? 'rFirstName' : 'rFullName';
|
var key = short ? 'rFirstName' : 'rFullName';
|
||||||
|
|
||||||
element.html(
|
element.html(
|
||||||
(override[key] || user[key] || '').valueOf()
|
(override[key] || user[key] || '').valueOf() +
|
||||||
|
(attrs.verified && user.pFlags && user.pFlags.verified ? ' <i class="icon-verified"></i>' : '')
|
||||||
);
|
);
|
||||||
if (attrs.color && $scope.$eval(attrs.color)) {
|
if (attrs.color && $scope.$eval(attrs.color)) {
|
||||||
element.addClass('user_color_' + user.num);
|
element.addClass('user_color_' + user.num);
|
||||||
|
@ -1731,6 +1731,7 @@ angular.module('myApp.services')
|
|||||||
var unreadCount = dialog && dialog.unread_count;
|
var unreadCount = dialog && dialog.unread_count;
|
||||||
|
|
||||||
if (useCache && messagesForDialogs[msgID] !== undefined) {
|
if (useCache && messagesForDialogs[msgID] !== undefined) {
|
||||||
|
delete messagesForDialogs[msgID].typing;
|
||||||
return messagesForDialogs[msgID];
|
return messagesForDialogs[msgID];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -120,7 +120,8 @@ angular.module('myApp.services', ['myApp.i18n', 'izhukov.utils'])
|
|||||||
deleted: (apiUser.flags & (1 << 13)) > 0,
|
deleted: (apiUser.flags & (1 << 13)) > 0,
|
||||||
bot: (apiUser.flags & (1 << 14)) > 0,
|
bot: (apiUser.flags & (1 << 14)) > 0,
|
||||||
botNoPrivacy: (apiUser.flags & (1 << 15)) > 0,
|
botNoPrivacy: (apiUser.flags & (1 << 15)) > 0,
|
||||||
botNoGroups: (apiUser.flags & (1 << 16)) > 0
|
botNoGroups: (apiUser.flags & (1 << 16)) > 0,
|
||||||
|
verified: (apiUser.flags & (1 << 17)) > 0
|
||||||
};
|
};
|
||||||
|
|
||||||
apiUser.sortName = apiUser.pFlags.deleted ? '' : SearchIndexManager.cleanSearchText(apiUser.first_name + ' ' + (apiUser.last_name || ''));
|
apiUser.sortName = apiUser.pFlags.deleted ? '' : SearchIndexManager.cleanSearchText(apiUser.first_name + ' ' + (apiUser.last_name || ''));
|
||||||
|
@ -37,7 +37,7 @@
|
|||||||
<div class="im_dialog_photo pull-left" my-peer-photolink="contact.userID" img-class="im_dialog_photo" watch="true"></div>
|
<div class="im_dialog_photo pull-left" my-peer-photolink="contact.userID" img-class="im_dialog_photo" watch="true"></div>
|
||||||
<div class="im_dialog_message_wrap">
|
<div class="im_dialog_message_wrap">
|
||||||
<div class="im_dialog_peer">
|
<div class="im_dialog_peer">
|
||||||
<span class="im_dialog_user" my-peer-link="contact.userID"></span>
|
<span class="im_dialog_user" my-peer-link="contact.userID" verified="true"></span>
|
||||||
</div>
|
</div>
|
||||||
<div class="im_dialog_message">
|
<div class="im_dialog_message">
|
||||||
<span class="im_dialog_message_text" my-user-status="::contact.userID"></span>
|
<span class="im_dialog_message_text" my-user-status="::contact.userID"></span>
|
||||||
@ -56,7 +56,7 @@
|
|||||||
<div class="im_dialog_photo pull-left" my-peer-photolink="foundPeer.id" img-class="im_dialog_photo" watch="true"></div>
|
<div class="im_dialog_photo pull-left" my-peer-photolink="foundPeer.id" img-class="im_dialog_photo" watch="true"></div>
|
||||||
<div class="im_dialog_message_wrap">
|
<div class="im_dialog_message_wrap">
|
||||||
<div class="im_dialog_peer">
|
<div class="im_dialog_peer">
|
||||||
<span class="im_dialog_user" my-peer-link="foundPeer.id"></span>
|
<span class="im_dialog_user" my-peer-link="foundPeer.id" verified="true"></span>
|
||||||
</div>
|
</div>
|
||||||
<div class="im_dialog_message">
|
<div class="im_dialog_message">
|
||||||
<span class="im_dialog_message_text" ng-bind="::'@' + foundPeer.username"></span>
|
<span class="im_dialog_message_text" ng-bind="::'@' + foundPeer.username"></span>
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
<a ng-click="openPhoto(user.photo.photo_id, {p: user.id})" class="peer_modal_photo" ng-class="{disabled: !user.photo.photo_id}" ng-disabled="!user.photo.photo_id" my-peer-photolink="::user.id" img-class="peer_modal_photo" no-open="true"></a>
|
<a ng-click="openPhoto(user.photo.photo_id, {p: user.id})" class="peer_modal_photo" ng-class="{disabled: !user.photo.photo_id}" ng-disabled="!user.photo.photo_id" my-peer-photolink="::user.id" img-class="peer_modal_photo" no-open="true"></a>
|
||||||
</div>
|
</div>
|
||||||
<div class="peer_modal_profile">
|
<div class="peer_modal_profile">
|
||||||
<div class="peer_modal_profile_name" my-peer-link="user.id"></div>
|
<div class="peer_modal_profile_name" my-peer-link="user.id" verified="true"></div>
|
||||||
<div class="peer_modal_profile_description" my-user-status="::user.id"></div>
|
<div class="peer_modal_profile_description" my-user-status="::user.id"></div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -35,7 +35,7 @@
|
|||||||
<div class="im_dialog_photo pull-left" my-peer-photolink="contact.userID" img-class="im_dialog_photo" watch="true"></div>
|
<div class="im_dialog_photo pull-left" my-peer-photolink="contact.userID" img-class="im_dialog_photo" watch="true"></div>
|
||||||
<div class="im_dialog_message_wrap">
|
<div class="im_dialog_message_wrap">
|
||||||
<div class="im_dialog_peer">
|
<div class="im_dialog_peer">
|
||||||
<span class="im_dialog_user" my-peer-link="contact.userID"></span>
|
<span class="im_dialog_user" my-peer-link="contact.userID" verified="true"></span>
|
||||||
</div>
|
</div>
|
||||||
<div class="im_dialog_message">
|
<div class="im_dialog_message">
|
||||||
<span class="im_dialog_message_text" my-user-status="::contact.userID"></span>
|
<span class="im_dialog_message_text" my-user-status="::contact.userID"></span>
|
||||||
@ -54,7 +54,7 @@
|
|||||||
<div class="im_dialog_photo pull-left" my-peer-photolink="foundPeer.id" img-class="im_dialog_photo" watch="true"></div>
|
<div class="im_dialog_photo pull-left" my-peer-photolink="foundPeer.id" img-class="im_dialog_photo" watch="true"></div>
|
||||||
<div class="im_dialog_message_wrap">
|
<div class="im_dialog_message_wrap">
|
||||||
<div class="im_dialog_peer">
|
<div class="im_dialog_peer">
|
||||||
<span class="im_dialog_user" my-peer-link="foundPeer.id"></span>
|
<span class="im_dialog_user" my-peer-link="foundPeer.id" verified="true"></span>
|
||||||
</div>
|
</div>
|
||||||
<div class="im_dialog_message">
|
<div class="im_dialog_message">
|
||||||
<span class="im_dialog_message_text" ng-bind="::'@' + foundPeer.username"></span>
|
<span class="im_dialog_message_text" ng-bind="::'@' + foundPeer.username"></span>
|
||||||
|
@ -52,7 +52,7 @@
|
|||||||
<a ng-click="openPhoto(user.photo.photo_id, {u: user.id})" class="mobile_user_modal_image_wrap pull-left" my-peer-photolink="::user.id" img-class="mobile_user_modal_image" no-open="true" watch="true" ng-class="{disabled: !user.photo.photo_id}" ng-disabled="!user.photo.photo_id"></a>
|
<a ng-click="openPhoto(user.photo.photo_id, {u: user.id})" class="mobile_user_modal_image_wrap pull-left" my-peer-photolink="::user.id" img-class="mobile_user_modal_image" no-open="true" watch="true" ng-class="{disabled: !user.photo.photo_id}" ng-disabled="!user.photo.photo_id"></a>
|
||||||
|
|
||||||
<div class="mobile_user_modal_info_wrap clearfix">
|
<div class="mobile_user_modal_info_wrap clearfix">
|
||||||
<h4 class="mobile_user_modal_header" ng-bind="user | userName"></h4>
|
<h4 class="mobile_user_modal_header" my-peer-link="user.id" verified="true"></h4>
|
||||||
<p class="mobile_user_modal_status" ng-if="user.status" my-user-status="::user.id"></p>
|
<p class="mobile_user_modal_status" ng-if="user.status" my-user-status="::user.id"></p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user