From c44c607ae70124129ee9176b57c98cf01513d3ac Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Fri, 5 Dec 2014 06:50:41 -0600 Subject: [PATCH] Renamed flagChat to flagChatMessage --- public/js/controllers/groupsCtrl.js | 2 +- views/options/social/chat-message.jade | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/js/controllers/groupsCtrl.js b/public/js/controllers/groupsCtrl.js index 63933e4fe7..523b9abff7 100644 --- a/public/js/controllers/groupsCtrl.js +++ b/public/js/controllers/groupsCtrl.js @@ -105,7 +105,7 @@ habitrpg.controller("GroupsCtrl", ['$scope', '$rootScope', 'Shared', 'Groups', ' $rootScope.openModal('private-message',{controller:'MemberModalCtrl'}); }); } - $scope.flagChat = function(message) { + $scope.flagChatMessage = function(message) { $scope.abuseObject = message; Members.selectMember(message.uuid, function(){ $rootScope.openModal('abuse-flag',{controller:'MemberModalCtrl', diff --git a/views/options/social/chat-message.jade b/views/options/social/chat-message.jade index 9c5545523f..4878e2e6aa 100644 --- a/views/options/social/chat-message.jade +++ b/views/options/social/chat-message.jade @@ -25,7 +25,7 @@ mixin chatMessages(inbox) |         a(ng-click='#{inbox? "user.ops.deletePM({params:{id:message.$key}})" : "deleteChatMessage(group, message)"}', ng-if='#{inbox ? "true" : ":: user.contributor.admin || message.uuid == user.id"}') span.glyphicon.glyphicon-trash(tooltip=env.t('delete')) - a(ng-click="flagChat(message)", ng-if='#{inbox ? "true" : ":: message.uuid != user.id"}') + a(ng-click="flagChatMessage(message)", ng-if='#{inbox ? "true" : ":: message.uuid != user.id"}') span.glyphicon.glyphicon-flag(tooltip=env.t('abuseFlag')) span.float-label a.label.label-default.chat-message(ng-if=':: message.user', ng-class='::userLevelStyleFromLevel(message.contributor.level, message.backer.npc, style)', ng-click='clickMember(message.uuid, true)')