Merge pull request #2312 from SyntaxPickax/develop

Minor fix to chat links; rounded critical hit percentages
This commit is contained in:
Tyler Renelle 2014-01-08 16:04:23 -08:00
commit d892e7f8fc
3 changed files with 4 additions and 4 deletions

View file

@ -105,7 +105,7 @@ habitrpg.directive('habitrpgSortable', ['User', function(User) {
.replace(/'/g, ''');
};
if (cap[0].charAt(0) !== '!') {
return '<a class="markdown-link" href="'
return '<a class="markdown-link" target="_blank" href="'
+ escape(link.href)
+ '"'
+ (link.title
@ -117,7 +117,7 @@ habitrpg.directive('habitrpgSortable', ['User', function(User) {
+ this.output(cap[1])
+ '</a>';
} else {
return '<a class="markdown-img-link" href="'
return '<a class="markdown-img-link" target="_blank" href="'
+ escape(link.href)
+ '"'
+ (link.title

View file

@ -70,7 +70,7 @@ angular.module("notificationServices", [])
growl("<i class='icon-fire'></i> " + sign(val) + " " + round(val) + " MP", 'mp');
},
crit: function(val) {
growl("<i class='icon-certificate'></i> Critical Hit! Bonus: " + val + "%", 'crit');
growl("<i class='icon-certificate'></i> Critical Hit! Bonus: " + Math.round(val) + "%", 'crit');
}
};
}

View file

@ -2,7 +2,7 @@ li.chat-message(bindonce='group.chat', ng-repeat='message in group.chat', bo-cla
div(class='scrollable-message')
a.label.chat-message(class='hidden-label')
span {{message.user}}&nbsp;
markdown(ng-model='message.text',target='_blank', style='padding:0px 3px')
markdown(ng-model='message.text', style='padding:0px 3px')
| -
span.muted.time(from-now='message.timestamp',style='padding:0px 3px')
span(style='padding:0px 3px')