sugar refactor based on stefan's feedback

HospitalRun · Dec 6, 2015 · e6384b9 · e6384b9
1 parent 5da0115
commit e6384b9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/app/components/inventory/rank-display.js b/app/components/inventory/rank-display.js
@@ -1,6 +1,5 @@
 import Ember from 'ember';
-
-const c = Ember.computed;
+import computed from 'ember-computed';
 
 export default Ember.Component.extend({
   tagName: 'span',
@@ -9,7 +8,7 @@ export default Ember.Component.extend({
   rank: null,
   noValueProp: 'n/a',
 
-  classProperty: c('rank', function() {
+  classProperty: computed('rank', function() {
     const rank = this.get('rank');
 
     if (Ember.isEmpty(rank)) {
@@ -26,7 +25,7 @@ export default Ember.Component.extend({
     }
   }),
 
-  rankDisplay: c('rank', function() {
+  rankDisplay: computed('rank', function() {
     const rank = this.get('rank');
     return Ember.isEmpty(rank) ? this.get('noValueProp') : rank;
   })

diff --git a/app/components/inventory/rank-select.js b/app/components/inventory/rank-select.js
@@ -1,20 +1,19 @@
 import Ember from 'ember';
 import SelectValues from 'hospitalrun/utils/select-values';
-
-const c = Ember.computed;
+import computed from 'ember-computed';
 
 export default Ember.Component.extend({
   label: 'Rank',
   rankOptions: [],
   prompt: ' ',
   class: 'col-sm-2 test-inv-rank',
 
-  options: c('rankOptions', function() {
+  options: computed('rankOptions', function() {
     return SelectValues.selectValues(this.get('rankOptions'));
   }),
 
   init() {
-    this._super();
+    this._super(...arguments);
 
     // set available options
     this.set('rankOptions', Ember.A(['A', 'B', 'C']));