From 9bee043e4110008f5b28e5f00bcb12fee55587fa Mon Sep 17 00:00:00 2001 From: Miguel Andrade Date: Wed, 26 Jul 2017 02:57:00 +0100 Subject: [PATCH] fixes #377 --- addon/components/paper-progress-linear.js | 30 ++++--------------- .../app/controllers/demo/progress-linear.js | 1 + 2 files changed, 7 insertions(+), 24 deletions(-) diff --git a/addon/components/paper-progress-linear.js b/addon/components/paper-progress-linear.js index bbbef2e43..cfde88200 100644 --- a/addon/components/paper-progress-linear.js +++ b/addon/components/paper-progress-linear.js @@ -32,11 +32,6 @@ export default Component.extend(ColorMixin, { constants: inject.service(), - init() { - this._super(...arguments); - this.setupTransforms(); - }, - mode: computed('value', function() { let value = this.get('value'); let bufferValue = this.get('bufferValue'); @@ -54,28 +49,15 @@ export default Component.extend(ColorMixin, { queryModeClass: computed('mode', function() { let mode = this.get('mode'); - - switch (mode) { - case MODE_QUERY: - case MODE_BUFFER: - case MODE_DETERMINATE: - case MODE_INDETERMINATE: - return `md-mode-${mode}`; - default: - return ''; + if ([MODE_QUERY, MODE_BUFFER, MODE_DETERMINATE, MODE_INDETERMINATE].includes(mode)) { + return `md-mode-${mode}`; + } else { + return ''; } }), - transforms: new Array(101), - - setupTransforms() { - for (let i = 0; i < 101; i++) { - this.transforms[i] = makeTransform(i); - } - }, - bar1Style: computed('clampedBufferValue', function() { - return htmlSafe(`${this.get('constants.CSS.TRANSFORM')}: ${this.transforms[this.get('clampedBufferValue')]}`); + return htmlSafe(`${this.get('constants.CSS.TRANSFORM')}: ${makeTransform(this.get('clampedBufferValue'))}`); }), bar2Style: computed('clampedValue', 'mode', function() { @@ -83,7 +65,7 @@ export default Component.extend(ColorMixin, { return htmlSafe(''); } - return htmlSafe(`${this.get('constants.CSS.TRANSFORM')}: ${this.transforms[this.get('clampedValue')]}`); + return htmlSafe(`${this.get('constants.CSS.TRANSFORM')}: ${makeTransform(this.get('clampedValue'))}`); }), clampedValue: computed('value', function() { diff --git a/tests/dummy/app/controllers/demo/progress-linear.js b/tests/dummy/app/controllers/demo/progress-linear.js index 0b6e3f562..770ac4257 100644 --- a/tests/dummy/app/controllers/demo/progress-linear.js +++ b/tests/dummy/app/controllers/demo/progress-linear.js @@ -34,6 +34,7 @@ export default Controller.extend({ this.set('timer2', run.later(this, function() { this.set('mode', this.get('mode') === 'query' ? 'determinate' : 'query'); this.set('determinateValue', 30); + this.set('determinateValue2', 30); run.later(this, this.setupTimer2); }, 7200)); },