don't render two placeholders

cibernox · Feb 15, 2017 · 6e5129f · 6e5129f
1 parent fcfc309
commit 6e5129f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/addon/components/power-select-multiple/trigger.js b/addon/components/power-select-multiple/trigger.js
@@ -70,7 +70,10 @@ export default Component.extend({
   }),
 
   maybePlaceholder: computed('placeholder', 'select.selected.length', function() {
-    if (isIE) {
+    const component = this.get('placeholderComponent');
+    const hasCustomPlaceholder = component !== 'power-select/placeholder';
+
+    if (isIE || hasCustomPlaceholder) {
       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 placeholder}}
+    {{#if (not-eq placeholder maybePlaceholder)}}
       {{component placeholderComponent placeholder=placeholder}}
     {{/if}}
   {{/each}}