Skip to content

MOBILE-1508 messages: Go to message discussion from contacts tab #439

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 1, 2016
Merged

MOBILE-1508 messages: Go to message discussion from contacts tab #439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion www/addons/messages/controllers/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ angular.module('mm.addons.messages')
mmaMessagesDiscussionLoadedEvent, mmaMessagesDiscussionLeftEvent) {
// Listen for discussion loaded event to show user profile link in tablet view.
var obsLoaded = $mmEvents.on(mmaMessagesDiscussionLoadedEvent, function(userId) {
if ($ionicPlatform.isTablet() && $ionicTabsDelegate.selectedIndex() === 0) {
if ($ionicPlatform.isTablet()) {
// A discussion was loaded in tablet, get the user image and show the button to the profile.
$scope.userId = userId;
$mmUser.getProfile(userId, undefined, true).catch(function() {
Expand Down
2 changes: 1 addition & 1 deletion www/addons/messages/templates/contacts.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ <h2>{{ 'mma.messages.type_' + contactType | translate }}</h2>
</button>
</ion-item>

<a ng-repeat="contact in contacts[contactType] | orderBy:'fullname' track by $index" ng-if="contact.profileimageurl || contact.profileimageurlsmall" class="item item-avatar" mm-split-view-link="{{userStateName}}({userid: contact.id})" title="{{contact.fullname}}"> <!-- Don't show deleted users -->
<a ng-repeat="contact in contacts[contactType] | orderBy:'fullname' track by $index" ng-if="contact.profileimageurl || contact.profileimageurlsmall" class="item item-avatar" mm-split-view-link="site.messages-discussion({userId: contact.id})" title="{{contact.fullname}}"> <!-- Don't show deleted users -->
<img ng-src="{{ contact.profileimageurl || contact.profileimageurlsmall }}" alt="{{ 'mm.core.pictureof' | translate:{$a: contact.fullname} }}" role="presentation" mm-external-content >
<p class="item-heading">{{ contact.fullname }}</p>
</a>
Expand Down