sudoxreboot/habitica-self-host
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-self-host.git synced 2026-08-03 12:40:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

perf(groups): bindonce on guild listings for better performance guild

Browse source 
page. This requires refreshing when making changes to guilds. Fixes #3663
This commit is contained in:
Tyler Renelle 2014-06-29 13:33:40 -06:00
parent 14c6019258
commit c180d899c1
3 changed files with 40 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
public/js/controllers/groupsCtrl.js
View file

@ -212,6 +212,7 @@ habitrpg.controller("GroupsCtrl", ['$scope', '$rootScope', 'Shared', 'Groups', '
guilds: Groups.myGuilds(),
"public": Groups.publicGuilds()
}
$scope.type = 'guild';
$scope.text = window.env.t('guild');
var newGroup = function(){
@ -219,15 +220,12 @@ habitrpg.controller("GroupsCtrl", ['$scope', '$rootScope', 'Shared', 'Groups', '
}
$scope.newGroup = newGroup()
$scope.create = function(group){
if (User.user.balance < 1) return $rootScope.openModal('buyGems', {track:"Gems > Create Group"});
if (User.user.balance < 1)
return $rootScope.openModal('buyGems', {track:"Gems > Create Group"});
if (confirm(window.env.t('confirmGuild'))) {
group.$save(function(saved){
User.user.balance--;
$scope.groups.guilds.push(saved);
if(saved.privacy === 'public') $scope.groups.public.push(saved);
$state.go('options.social.guilds.detail', {gid: saved._id});
$scope.newGroup = newGroup();
$rootScope.hardRedirect('/#/options/groups/guilds/' + saved._id);
});
}
}
@ -241,38 +239,20 @@ habitrpg.controller("GroupsCtrl", ['$scope', '$rootScope', 'Shared', 'Groups', '
}
group.$join(function(joined){
var i = _.findIndex(User.user.invitations.guilds, {id:joined._id});
if (~i) User.user.invitations.guilds.splice(i,1);
$scope.groups.guilds.push(joined);
if(joined.privacy == 'public'){
joined._isMember = true;
joined.memberCount++;
}
$state.go('options.social.guilds.detail', {gid: joined._id});
$rootScope.hardRedirect('/#/options/groups/guilds/' + joined._id);
})
}
$scope.leave = function(keep) {
$scope.leave = function(keep) {
if (keep == 'cancel') {
$scope.selectedGroup = undefined;
$scope.selectedGroup = undefined;
$scope.popoverEl.popover('destroy');
} else {
var group = $scope.selectedGroup;
Groups.Group.leave({gid: group._id, keep:keep}, undefined, function(){
$scope.groups.guilds.splice(_.indexOf($scope.groups.guilds, group), 1);
// remove user from group members if guild is public so that he can re-join it immediately
if(group.privacy == 'public' || !group.privacy){ //public guilds with only some fields fetched
var i = _.findIndex($scope.groups.public, {_id: group._id});
if(~i){
var guild = $scope.groups.public[i];
guild.memberCount--;
guild._isMember = false;
}
}
$state.go('options.social.guilds');
});
Groups.Group.leave({gid: $scope.selectedGroup._id, keep:keep}, undefined, function(){
$rootScope.hardRedirect('/#/options/groups/guilds');
});
}
}
$scope.popoverEl.popover('destroy');
}
$scope.clickLeave = function(group, $event){
$scope.selectedGroup = group;
@ -323,32 +303,29 @@ habitrpg.controller("GroupsCtrl", ['$scope', '$rootScope', 'Shared', 'Groups', '
Groups.seenMessage($scope.group._id);
$scope.create = function(group){
group.$save(function(newGroup){
$scope.group = newGroup;
group.$save(function(){
$rootScope.hardRedirect('/#/options/social/party');
});
}
$scope.join = function(party){
var group = new Groups.Group({_id: party.id, name: party.name});
// there a better way to access GroupsCtrl.groups.party?
group.$join(function(groupJoined){
$scope.group = groupJoined;
group.$join(function(){
$rootScope.hardRedirect('/#/options/social/party');
});
}
// TODO: refactor guild and party leave into one function
$scope.leave = function(keep) {
if (keep == 'cancel') {
$scope.selectedGroup = undefined;
} else {
var group = $scope.selectedGroup;
Groups.Group.leave({gid: group._id, keep:keep}, undefined, function(){
$scope.group = undefined;
});
$state.go('options.social.party');
};
$scope.popoverEl.popover('destroy');
}
// TODO: refactor guild and party leave into one function
$scope.leave = function(keep) {
if (keep == 'cancel') {
$scope.selectedGroup = undefined;
$scope.popoverEl.popover('destroy');
} else {
Groups.Group.leave({gid: $scope.selectedGroup._id, keep:keep}, undefined, function(){
$rootScope.hardRedirect('/#/options/social/party');
});
}
}
// TODO: refactor guild and party clickLeave into one function
$scope.clickLeave = function(group, $event){

7
public/js/controllers/rootCtrl.js
View file

@ -221,5 +221,12 @@ habitrpg.controller("RootCtrl", ['$scope', '$rootScope', '$location', 'User', '$
$rootScope.applyingAction = false;
$scope.spell = null;
}
// Becuase our angular-ui-router uses anchors for urls (/#/options/groups/party), window.location.href=... won't
// reload the page. Perform manually.
$rootScope.hardRedirect = function(url){
window.location.href = url;
window.location.reload(false);
}
}
]);

12
views/options/social/index.jade
View file

@ -42,17 +42,17 @@ script(type='text/ng-template', id='partials/options.social.guilds.public.html')
tr(ng-repeat='group in groups.public | filter:guildSearch')
td
ul.pull-right.challenge-accordion-header-specs
li='{{group.memberCount}} ' + env.t('members')
li='{{::group.memberCount}} ' + env.t('members')
// join / leave
li
// join / leave
a.btn.btn-sm.btn-danger(ng-show='group._isMember', ng-click='clickLeave(group, $event)')
a.btn.btn-sm.btn-danger(ng-if="::group._isMember", ng-click='clickLeave(group, $event)')
span.glyphicon.glyphicon-ban-circle
=env.t('leave')
a.btn.btn-sm.btn-success(ng-hide='group._isMember', ng-click='join(group)')
a.btn.btn-sm.btn-success(ng-if="::!group._isMember", ng-click='join(group)')
span.glyphicon.glyphicon-ok
=env.t('join')
h4 {{group.name}}
p {{group.description}}
h4 {{::group.name}}
p {{::group.description}}
script(type='text/ng-template', id='partials/options.social.guilds.detail.html')
include ./group