refactoring

cibernox · Feb 15, 2017 · 13ad5b5 · 13ad5b5
1 parent c021e61
commit 13ad5b5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,13 +1,13 @@
 # Master
+- [ENHANCEMENT] Providing a custom `placeholderComponent` is available for
+  `power-select-multiple` too now.
 
 # 1.5.0-beta.0
 - [ENHANCEMENT/BREAKING-ISH] `ember-basic-dropdown` has improved the experience with A11y 
   for screen readings. Some `aria-*` have changed and there is an invisible div that wasn't 
   there before. EPS doens't rely on those attributes and it's unlikely that this will 
   break for anyone, but just in case I'll bump a minor version number and keep it in 
   beta for some days.
-- [ENHANCEMENT] Providing a custom `placeholderComponent` is available for
-  `power-select-multiple` too now.
 
 # 1.4.3
 - [ENHANCEMENT] `typeInSearch` integration test helper now accepts an options scope to 

diff --git a/addon/components/power-select-multiple/trigger.js b/addon/components/power-select-multiple/trigger.js
@@ -70,10 +70,7 @@ export default Component.extend({
   }),
 
   maybePlaceholder: computed('placeholder', 'select.selected.length', function() {
-    let component = this.get('placeholderComponent');
-    let hasCustomPlaceholder = component !== 'power-select/placeholder';
-
-    if (isIE || hasCustomPlaceholder) {
+    if (isIE) {
       return null;
     }
     let select = this.get('select');

diff --git a/addon/templates/components/power-select-multiple/trigger.hbs b/addon/templates/components/power-select-multiple/trigger.hbs
@@ -16,7 +16,7 @@
       {{/if}}
     </li>
   {{else}}
-    {{#if (and placeholder (not searchEnabled))}}
+    {{#if (not searchEnabled)}}
       {{component placeholderComponent placeholder=placeholder}}
     {{/if}}
   {{/each}}