1
0
mirror of https://gitlab.com/Deukhoofd/BattleSim.git synced 2025-10-27 18:00:03 +00:00

Resolved extreme lag on logging in for Owners, added Owner button to retrieve all teams on the server

This commit is contained in:
Deukhoofd
2016-02-28 17:06:27 +01:00
parent a7ee5c24ab
commit f737f48545
7 changed files with 38 additions and 14 deletions

View File

@@ -98,13 +98,13 @@ $pokemon-list-height = 50px
margin-left -(@margin-right + @width)
vertical-align middle
cursor pointer
background-image URL('http://91.121.152.74:8000/Sprites/images/noshiny.png')
background-image URL('/Sprites/images/noshiny.png')
background-size cover
&.selected
background-image URL('http://91.121.152.74:8000/Sprites/images/shiny.png')
background-image URL('/Sprites/images/shiny.png')
.teambuilder .happiness-switch
display inline-block
position relative
@@ -357,6 +357,9 @@ $pokemon-list-height = 50px
.add-new-team
margin 10px
.get-teams
margin 10px
.team-meta
font-size .75em
text-align right

View File

@@ -6,12 +6,13 @@ class @TeambuilderView extends Backbone.View
events:
# Team view
'click .add-new-team': 'addNewTeamEvent'
'click .export-team': 'exportTeam'
'click .clone-team': 'cloneTeam'
'click .delete-team': 'deleteTeamEvent'
'click .go-to-team': 'clickTeam'
'click .import-team': 'renderImportTeamModal'
'click .add-new-team': 'addNewTeamEvent'
'click .export-team' : 'exportTeam'
'click .clone-team' : 'cloneTeam'
'click .delete-team' : 'deleteTeamEvent'
'click .go-to-team' : 'clickTeam'
'click .import-team' : 'renderImportTeamModal'
'click .get-teams' : 'getAllTeamsAdmin'
# Teambuild view
'click .change-format-dropdown a': 'changeTeamFormat'
@@ -86,6 +87,10 @@ class @TeambuilderView extends Backbone.View
PokeBattle.TeamStore.add(team)
team.save()
getAllTeamsAdmin: (e) =>
console.log('this')
PokeBattle.primus.send('requestTeams', true)
addNewTeam: (team) =>
@addEmptyPokemon(team) while team.get('pokemon').length < 6
@$('.teambuilder_teams').append @teamTemplate({team, window})

View File

@@ -4,3 +4,6 @@ h2 Your teams
!= window.JST['teambuilder/team']({team: team, window: window})
.button.button_blue.add-new-team Add new team
.button.import-team Import
if window.PokeBattle.username == "Deukhoofd" || window.PokeBattle.username == "thesuzerain"
.button.get-teams Get all teams