diff options
| author | schneefux <schneefux+commit@schneefux.xyz> | 2019-03-25 19:12:32 +0100 |
|---|---|---|
| committer | schneefux <schneefux+commit@schneefux.xyz> | 2019-04-27 09:22:59 +0200 |
| commit | c7d12a8aaaad45b6d131fedd8a2169348c0ef3f5 (patch) | |
| tree | 47bb320ffba03a69fbc886e627389076abcbbd90 | |
| parent | 0dd62c0291f401e7e66b569af4d021410378a43c (diff) | |
| download | brokentalents-c7d12a8aaaad45b6d131fedd8a2169348c0ef3f5.tar.gz brokentalents-c7d12a8aaaad45b6d131fedd8a2169348c0ef3f5.zip | |
Use es6 method syntax
| -rw-r--r-- | src/App.vue | 2 | ||||
| -rw-r--r-- | src/HeroDraftGrid.vue | 2 | ||||
| -rw-r--r-- | src/HeroImage.vue | 2 | ||||
| -rw-r--r-- | src/HeroTalentTable.vue | 12 | ||||
| -rw-r--r-- | src/Highlights.vue | 4 | ||||
| -rw-r--r-- | src/InstallNotification.vue | 10 | ||||
| -rw-r--r-- | src/IntroBox.vue | 12 | ||||
| -rw-r--r-- | src/ModeTab.vue | 4 | ||||
| -rw-r--r-- | src/ReportTable.vue | 8 | ||||
| -rw-r--r-- | src/RouterParamMixin.js | 24 | ||||
| -rw-r--r-- | src/Summaries.vue | 8 | ||||
| -rw-r--r-- | src/TalentBox.vue | 4 | ||||
| -rw-r--r-- | src/TalentImage.vue | 4 | ||||
| -rw-r--r-- | src/TopTalentsBox.vue | 10 | ||||
| -rw-r--r-- | src/WinPickScatter.vue | 2 | ||||
| -rw-r--r-- | src/index.js | 2 |
16 files changed, 55 insertions, 55 deletions
diff --git a/src/App.vue b/src/App.vue index 9eead1b..d421f3d 100644 --- a/src/App.vue +++ b/src/App.vue @@ -76,7 +76,7 @@ import * as maps from './maps/maps'; export default { name: 'App', mixins: [ RouterParamMixin ], - data: function() { + data() { return { totalMatches: Math.floor(ReportService.getTotalMatches()/100)*100, lastUpdate: ReportService.getLastUpdate(), diff --git a/src/HeroDraftGrid.vue b/src/HeroDraftGrid.vue index bdf6cbf..6121530 100644 --- a/src/HeroDraftGrid.vue +++ b/src/HeroDraftGrid.vue @@ -33,7 +33,7 @@ import * as maps from './maps/maps'; export default Vue.component('hero-draft-grid', { mixins: [ RouterParamMixin ], - data: function() { + data() { return { actors: ReportService.getActors().sort(), getHero: maps.getHero, diff --git a/src/HeroImage.vue b/src/HeroImage.vue index e3d3163..20f2292 100644 --- a/src/HeroImage.vue +++ b/src/HeroImage.vue @@ -14,7 +14,7 @@ import * as maps from './maps/maps'; export default Vue.component('hero-image', { props: [ 'actor', 'round' ], computed: { - hero: function() { + hero() { return maps.getHero(this.actor); }, }, diff --git a/src/HeroTalentTable.vue b/src/HeroTalentTable.vue index 77d868c..b335421 100644 --- a/src/HeroTalentTable.vue +++ b/src/HeroTalentTable.vue @@ -53,7 +53,7 @@ import * as maps from './maps/maps'; export default Vue.component('hero-talent-table', { mixins: [ RouterParamMixin ], - data: function() { + data() { return { getTalentName: maps.getTalentName, getLevelBuckets: ReportService.getLevelBuckets, @@ -61,25 +61,25 @@ export default Vue.component('hero-talent-table', { }; }, computed: { - hasTalents: function() { + hasTalents() { return maps.hasTalents(this.selectedMode); }, - totalPicks: function() { + totalPicks() { return ReportService.getTotalPicks(this.selectedMode); }, - heroReport: function() { + heroReport() { return ReportService.getReport(this.selectedMode) .filter((entry) => entry.Actor == this.selectedActor) .sort((entry1, entry2) => maps.getTalentRarityIndex(entry1.Talent) - maps.getTalentRarityIndex(entry2.Talent)); }, - totalHeroReport: function() { + totalHeroReport() { return this.heroReport .map((entry) => ({ 'TotalWinner': entry.TotalPicks * entry.TotalWinner, 'TotalPicks': entry.TotalPicks })) .reduce((agg, cur) => ({ 'TotalWinner': agg.TotalWinner + cur.TotalWinner, 'TotalPicks': agg.TotalPicks + cur.TotalPicks }), { 'TotalWinner': 0, 'TotalPicks': 0 }); }, - playersPerMatch: function() { + playersPerMatch() { return maps.playersPerMatch(this.selectedMode); }, }, diff --git a/src/Highlights.vue b/src/Highlights.vue index 0b3be87..73cdf7b 100644 --- a/src/Highlights.vue +++ b/src/Highlights.vue @@ -111,7 +111,7 @@ import * as maps from './maps/maps.js'; export default Vue.component('highlights', { mixins: [ RouterParamMixin ], computed: { - stats: function() { + stats() { return { topWin: ReportService.getTopWin(this.selectedMode), topUnpopularWin: ReportService.getTopUnpopularWin(this.selectedMode), @@ -127,7 +127,7 @@ export default Vue.component('highlights', { topBlitzPointsDelta: ReportService.getTopBlitzPointsDelta(this.selectedMode), }; }, - playersPerMatch: function() { + playersPerMatch() { return maps.playersPerMatch(this.selectedMode); }, }, diff --git a/src/InstallNotification.vue b/src/InstallNotification.vue index a60ec9c..f870ee5 100644 --- a/src/InstallNotification.vue +++ b/src/InstallNotification.vue @@ -22,13 +22,13 @@ import Vue from 'vue'; export default Vue.component('install-notification', { - data: function() { + data() { return { deferredPrompt: undefined, }; }, methods: { - promptInstall: function(p) { + promptInstall(p) { this.$ga.event('PWA', 'available'); p.preventDefault(); this.deferredPrompt = p; @@ -37,15 +37,15 @@ export default Vue.component('install-notification', { this.deferredPrompt = null; }); }, - installed: function(e) { + installed(e) { this.$ga.event('PWA', 'installed'); }, }, - created: function() { + created() { window.addEventListener('beforeinstallprompt', this.promptInstall); window.addEventListener('appinstalled', this.installed); }, - destroyed: function() { + destroyed() { window.removeEventListener('beforeinstallprompt', this.promptInstall); window.removeEventListener('appinstalled', this.installed); }, diff --git a/src/IntroBox.vue b/src/IntroBox.vue index e0a1abb..a00fc64 100644 --- a/src/IntroBox.vue +++ b/src/IntroBox.vue @@ -25,31 +25,31 @@ import RouterParamMixin from './RouterParamMixin'; export default Vue.component('intro-box', { mixins: [ RouterParamMixin ], - data: function() { + data() { return { hideIntro: !!localStorage.getItem('hideIntro'), gaOptedOut: !!localStorage.getItem('gaOptOut'), }; }, methods: { - optOutAnalytics: function() { + optOutAnalytics() { this.$ga.disable(); this.gaOptedOut = true; }, }, - created: function() { + created() { if (this.gaOptedOut) { this.$ga.disable(); } }, watch: { - hideIntro: function(value) { + hideIntro(value) { localStorage.setItem('hideIntro', value); }, - gaOptedOut: function(value) { + gaOptedOut(value) { localStorage.setItem('gaOptOut', value); }, - selectedMode: function(value) { + selectedMode(value) { this.hideIntro = !!localStorage.getItem('hideIntro'); }, }, diff --git a/src/ModeTab.vue b/src/ModeTab.vue index 0b57e35..e9c3b5b 100644 --- a/src/ModeTab.vue +++ b/src/ModeTab.vue @@ -79,13 +79,13 @@ import * as maps from './maps/maps.js'; export default Vue.component('mode-tab', { mixins: [ RouterParamMixin ], - data: function() { + data() { return { getHero: maps.getHero, }; }, computed: { - hasTalents: function() { + hasTalents() { return maps.hasTalents(this.selectedMode); }, }, diff --git a/src/ReportTable.vue b/src/ReportTable.vue index 972b006..aaee402 100644 --- a/src/ReportTable.vue +++ b/src/ReportTable.vue @@ -112,7 +112,7 @@ import * as maps from './maps/maps'; export default Vue.component('report-table', { mixins: [ RouterParamMixin ], - data: function() { + data() { return { RARITIES: maps.RARITIES, getTalentName: maps.getTalentName, @@ -123,7 +123,7 @@ export default Vue.component('report-table', { }; }, computed: { - report: function() { + report() { const giveTrue = (x) => true; const filters = [ this.filterRarity != ''? (entry) => maps.getTalentRarity(entry.Talent) == this.filterRarity : giveTrue, @@ -133,12 +133,12 @@ export default Vue.component('report-table', { return ReportService.getReport(this.selectedMode) .filter((entry) => filters.map((filter) => filter(entry)).reduce(and, true)); }, - totalPicks: function() { + totalPicks() { return ReportService.getTotalPicks(this.selectedMode); }, }, methods: { - downloadCsv: function() { + downloadCsv() { const csv = ReportService.getCsv(this.selectedMode); const downloaderElement = document.createElement('a'); downloaderElement.href = 'data:text/csv;charset=utf-8,' + encodeURI(csv); diff --git a/src/RouterParamMixin.js b/src/RouterParamMixin.js index cf42920..9d9527a 100644 --- a/src/RouterParamMixin.js +++ b/src/RouterParamMixin.js @@ -2,57 +2,57 @@ import * as maps from './maps/maps'; export default { computed: { - playersPerMatch: function() { + playersPerMatch() { return maps.playersPerMatch(this.selectedMode); }, - hasTalents: function() { + hasTalents() { return maps.hasTalents(this.selectedMode); }, selectedActor: { - get: function() { + get() { return this.$route.query.actor || '*Kinetic*'; }, - set: function(value) { + set(value) { this.$ga.event('Hero', 'update', value); const query = Object.assign({}, this.$route.query, { actor: value }); this.$router.push({ query }); }, }, selectedMode: { - get: function() { + get() { return this.$route.query.mode || 'blitz_pvp_ranked'; }, - set: function(value) { + set(value) { this.$ga.event('Mode', 'update', value); const query = Object.assign({}, this.$route.query, { mode: value }); this.$router.push({ query }); }, }, filterRarity: { - get: function() { + get() { return this.$route.query.rarity || ''; }, - set: function(value) { + set(value) { this.$ga.event('Rarity', 'update', value); const query = Object.assign({}, this.$route.query, { rarity: value }); this.$router.push({ query }); }, }, filterName: { - get: function() { + get() { return this.$route.query.search || ''; }, - set: function(value) { + set(value) { this.$ga.event('Search', 'update', value); const query = Object.assign({}, this.$route.query, { search: value }); this.$router.push({ query }); }, }, filterLowPickrate: { - get: function() { + get() { return this.$route.query.lowPickrate == true; }, - set: function(value) { + set(value) { this.$ga.event('LowPickrate', 'update', value); const query = Object.assign({}, this.$route.query, { lowPickrate: value }); this.$router.push({ query }); diff --git a/src/Summaries.vue b/src/Summaries.vue index 009a36b..d28bf32 100644 --- a/src/Summaries.vue +++ b/src/Summaries.vue @@ -88,7 +88,7 @@ import * as maps from './maps/maps'; export default Vue.component('summaries', { mixins: [ RouterParamMixin ], - data: function() { + data() { return { talentsVisible: false, winrateVisible: true, @@ -98,14 +98,14 @@ export default Vue.component('summaries', { }; }, computed: { - summaries: function() { + summaries() { return ReportService.getSummaries(this.selectedMode) .filter((summary) => this.hasTalents? true : summary.key != 'Rarity'); }, - summary: function() { + summary() { return this.summaries.find((summary) => summary.key == [this.selectedTrait]); }, - totalPicks: function() { + totalPicks() { return this.summary.data.map((entry) => entry.TotalPicks).reduce((agg, cur) => agg + cur, 0); }, }, diff --git a/src/TalentBox.vue b/src/TalentBox.vue index 8e6a319..8c980f1 100644 --- a/src/TalentBox.vue +++ b/src/TalentBox.vue @@ -67,10 +67,10 @@ import * as maps from './maps/maps'; export default Vue.component('talent-box', { props: ['title', 'content', 'entry', 'type', 'value', 'label'], computed: { - hero: function() { + hero() { return maps.getHero(this.entry.Actor); }, - hasTalent: function() { + hasTalent() { return maps.getTalentRarity(this.entry.Talent) != 'None'; }, }, diff --git a/src/TalentImage.vue b/src/TalentImage.vue index 4dd2e95..3a36495 100644 --- a/src/TalentImage.vue +++ b/src/TalentImage.vue @@ -23,10 +23,10 @@ import * as maps from './maps/maps'; export default Vue.component('talent-image', { props: [ 'entry', 'size' ], computed: { - hero: function() { + hero() { return maps.getHero(this.entry.Actor); }, - rarity: function() { + rarity() { return maps.getTalentRarity(this.entry.Talent); }, }, diff --git a/src/TopTalentsBox.vue b/src/TopTalentsBox.vue index fdda6c3..598c9a3 100644 --- a/src/TopTalentsBox.vue +++ b/src/TopTalentsBox.vue @@ -36,23 +36,23 @@ import * as maps from './maps/maps'; export default Vue.component('top-talents-box', { mixins: [ RouterParamMixin ], - data: function() { + data() { return { getHero: maps.getHero, getTalentName: maps.getTalentName, }; }, computed: { - top10Talents: function() { + top10Talents() { return ReportService.getTop10Picks(this.selectedMode); }, - hasTalents: function() { + hasTalents() { return maps.hasTalents(this.selectedMode); }, - totalPicks: function() { + totalPicks() { return ReportService.getTotalPicks(this.selectedMode); }, - playersPerMatch: function() { + playersPerMatch() { return maps.playersPerMatch(this.selectedMode); }, }, diff --git a/src/WinPickScatter.vue b/src/WinPickScatter.vue index ae2cfc6..92a9a49 100644 --- a/src/WinPickScatter.vue +++ b/src/WinPickScatter.vue @@ -64,7 +64,7 @@ export default Vue.component('win-pick-scatter', { this.refresh(); }, }, - data: function() { + data() { return { yMetric: 'TotalWinner', fixedXRange: false, diff --git a/src/index.js b/src/index.js index 9f511cf..ce2c1e4 100644 --- a/src/index.js +++ b/src/index.js @@ -37,7 +37,7 @@ new Vue({ router, el: '#app', render: h => h(App), - mounted: function() { + mounted() { if (window.matchMedia('(display-mode: standalone)').matches || window.navigator.standalone === true) { this.$ga.event('PWA', 'started'); } |
