Update Ember to 3.1 #55

Merged
raucao merged 5 commits from dev/ember_upgrade into master 2018-04-17 10:53:30 +00:00
3 changed files with 8 additions and 3 deletions
Showing only changes of commit ba3c707da3 - Show all commits
+5
View File
@@ -4,6 +4,9 @@ module.exports = {
ecmaVersion: 2017,
sourceType: 'module'
},
globals: {
console: true
},
plugins: [
'ember'
],
@@ -15,6 +18,8 @@ module.exports = {
browser: true
},
rules: {
'ember/avoid-leaking-state-in-ember-objects': 'warn',
'no-console': 'off'
},
overrides: [
// node files
+1 -1
View File
@@ -9,7 +9,7 @@ export default Component.extend({
confirm(proposalId) {
if (this.contractInteractionEnabled) {
this.sendAction('confirmAction', proposalId);
this.confirmProposal(proposalId);
} else {
window.alert('Only members can vote on proposals. Please ask someone to set you up.');
}
+2 -2
View File
@@ -32,7 +32,7 @@
<div class="content">
{{!-- TODO: We need a better naming for kredits.hasAccounts --}}
{{proposal-list proposals=proposalsOpenSorted
confirmAction="confirmProposal"
confirmProposal=(action "confirmProposal")
contractInteractionEnabled=kredits.hasAccounts}}
{{!-- TODO: We need a better naming --}}
@@ -51,7 +51,7 @@
</header>
<div class="content">
{{proposal-list proposals=proposalsClosedSorted
confirmAction="confirmProposal"}}
confirmProposal=(action "confirmProposal")}}
{{!-- TODO: We need a better naming --}}
{{#if kredits.hasAccounts}}