krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-19 15:48:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

[#1465] allow clicking self for modal

Browse Source
This commit is contained in:
Tyler Renelle
2013-09-07 13:59:49 -04:00
parent b820417953
commit a960d310f7
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/js/controllers/groupsCtrl.js
View File

@@ -15,8 +15,8 @@ habitrpg.controller("GroupsCtrl", ['$scope', '$rootScope', 'Groups', '$http', 'A
// ------ Modals ------ // ------ Modals ------
$scope.clickMember = function(uid) { $scope.clickMember = function(uid, forceShow) {
if (User.user._id == uid) { if (User.user._id == uid && !forceShow) {
if ($location.path() == '/tasks') { if ($location.path() == '/tasks') {
$location.path('/options'); $location.path('/options');
} else { } else {

2
views/options/groups/chat-message.jade
View File

@@ -1,5 +1,5 @@
li(ng-repeat='message in group.chat', ng-class='{highlight: message.text.indexOf(username(user.auth,user.profile.name)) != -1}') li(ng-repeat='message in group.chat', ng-class='{highlight: message.text.indexOf(username(user.auth,user.profile.name)) != -1}')
a.label.chat-message(class='{{nameTagClasses(message)}}', tooltip='{{message.contributor}}', ng-click='clickMember(message.uuid)') a.label.chat-message(class='{{nameTagClasses(message)}}', tooltip='{{message.contributor}}', ng-click='clickMember(message.uuid, true)')
| {{message.user}} | {{message.user}}
span span
span(ng-bind-html="message.text | linky:'_blank'") - span(ng-bind-html="message.text | linky:'_blank'") -

2
views/shared/profiles/achievements.jade
View File

@@ -24,7 +24,7 @@
.achievement.achievement-firefox(ng-show='profile.backer.contributor') .achievement.achievement-firefox(ng-show='profile.backer.contributor')
div(ng-class='{muted: !profile.backer.contributor}') div(ng-class='{muted: !profile.backer.contributor}')
h5 h5
span.label(ng-if='profile.backer.contributor', ng-class='nameTagClasses(profile.backer.contributor)') {{profile.backer.contributor}} span.label.label-inverse(ng-if='profile.backer.contributor') {{profile.backer.contributor}}
span.label(ng-if='!profile.backer.contributor') Contributor span.label(ng-if='!profile.backer.contributor') Contributor
small. small.
Has contributed to HabitRPG (code, design, pixel art, legal advice, docs, etc). Want this badge? Fix a bug :) Has contributed to HabitRPG (code, design, pixel art, legal advice, docs, etc). Want this badge? Fix a bug :)