refactoring

cibernox · Feb 15, 2017 · 3b9a183 · 3b9a183
1 parent c021e61
commit 3b9a183
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
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}}