do not import directly computed prop methods for consistency with the…

… rest of the project
adopted-ember-addons · Apr 6, 2017 · 8b70af4 · 8b70af4
1 parent 768aae5
commit 8b70af4
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 29 deletions.
diff --git a/addon/components/paper-pagination-wrapper.js b/addon/components/paper-pagination-wrapper.js
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-const { computed, computed: { reads, empty, or }, Component, String: { htmlSafe } } = Ember;
+const { computed, Component, String: { htmlSafe } } = Ember;
 
 export default Component.extend({
   tagName: 'md-pagination-wrapper',
@@ -13,21 +13,21 @@ export default Component.extend({
   ],
 
   /* Inherited from {{paper-tabs-wrapper}} */
-  tabs: reads('parent.tabs'),
-  noInkBar: reads('parent.noInkBar'),
-  lastSelectedIndex: reads('parent.lastSelectedIndex'),
-  centerTabs: reads('parent.centerTabs'),
-  selected: reads('parent.selected'),
-  selectedTab: reads('parent.selectedTab'),
-  canvasWidth: reads('parent.canvasWidth'),
-  pagingWidth: reads('parent.pagingWidth'),
-  offsetLeft: reads('parent.offsetLeft'),
-  shouldCenterTabs: reads('parent.shouldCenterTabs'),
-  shouldStretchTabs: reads('parent.shouldStretchTabs'),
+  tabs: computed.reads('parent.tabs'),
+  noInkBar: computed.reads('parent.noInkBar'),
+  lastSelectedIndex: computed.reads('parent.lastSelectedIndex'),
+  centerTabs: computed.reads('parent.centerTabs'),
+  selected: computed.reads('parent.selected'),
+  selectedTab: computed.reads('parent.selectedTab'),
+  canvasWidth: computed.reads('parent.canvasWidth'),
+  pagingWidth: computed.reads('parent.pagingWidth'),
+  offsetLeft: computed.reads('parent.offsetLeft'),
+  shouldCenterTabs: computed.reads('parent.shouldCenterTabs'),
+  shouldStretchTabs: computed.reads('parent.shouldStretchTabs'),
 
-  isEmpty: empty('tabs'),
+  isEmpty: computed.empty('tabs'),
 
-  hideInkBar: or('isEmpty', 'noInkBar'),
+  hideInkBar: computed.or('isEmpty', 'noInkBar'),
 
   inkBarDirection: computed('lastSelectedIndex', 'selected', function() {
     return (this.get('lastSelectedIndex') > this.get('selected')) ? 'left' : 'right';

diff --git a/addon/components/paper-tabs-wrapper.js b/addon/components/paper-tabs-wrapper.js
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-const { computed, computed: { reads }, Component, Object: EmberObject, run } = Ember;
+const { computed, Component, Object: EmberObject, run } = Ember;
 
 export default Component.extend({
 
@@ -12,20 +12,20 @@ export default Component.extend({
   }),
 
   /* Inherited from {{paper-tabs}} */
-  centerTabs: reads('parent.centerTabs'),
-  tabs: reads('parent.tabs'),
-  noInkBar: reads('parent.noInkBar'),
-  selected: reads('parent.selected'),
-  lastSelectedIndex: reads('parent.lastSelectedIndex'),
-  selectedTab: reads('parent.selectedTab'),
-  canvasWidth: reads('parent.canvasWidth'),
-  pagingWidth: reads('parent.pagingWidth'),
-  shouldPaginate: reads('parent.shouldPaginate'),
-  canPageBack: reads('parent.canPageBack'),
-  canPageForward: reads('parent.canPageForward'),
-  offsetLeft: reads('parent.offsetLeft'),
-  shouldCenterTabs: reads('parent.shouldCenterTabs'),
-  shouldStretchTabs: reads('parent.shouldStretchTabs'),
+  centerTabs: computed.reads('parent.centerTabs'),
+  tabs: computed.reads('parent.tabs'),
+  noInkBar: computed.reads('parent.noInkBar'),
+  selected: computed.reads('parent.selected'),
+  lastSelectedIndex: computed.reads('parent.lastSelectedIndex'),
+  selectedTab: computed.reads('parent.selectedTab'),
+  canvasWidth: computed.reads('parent.canvasWidth'),
+  pagingWidth: computed.reads('parent.pagingWidth'),
+  shouldPaginate: computed.reads('parent.shouldPaginate'),
+  canPageBack: computed.reads('parent.canPageBack'),
+  canPageForward: computed.reads('parent.canPageForward'),
+  offsetLeft: computed.reads('parent.offsetLeft'),
+  shouldCenterTabs: computed.reads('parent.shouldCenterTabs'),
+  shouldStretchTabs: computed.reads('parent.shouldStretchTabs'),
 
   canvasClass: computed('shouldPaginate', function() {
     return this.get('shouldPaginate') ? 'md-paginated' : '';