Skip to content
This repository has been archived by the owner on Sep 5, 2024. It is now read-only.

Commit

Permalink
fix(md-chips placeholder): correct placeholder/secondary logic
Browse files Browse the repository at this point in the history
The logic test deciding when to show the secondary placeholder was backwards, causing the secondary placeholder to be shown when no chips were present.

Fixes github issues #2770 and #4476.

Closes #6535
  • Loading branch information
ericgundrum authored and ThomasBurleson committed Feb 4, 2016
1 parent d2953a9 commit dfd4ba2
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/components/chips/js/chipsController.js
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ MdChipsCtrl.prototype.getPlaceholder = function() {
// Allow `secondary-placeholder` to be blank.
var useSecondary = (this.items.length &&
(this.secondaryPlaceholder == '' || this.secondaryPlaceholder));
return useSecondary ? this.placeholder : this.secondaryPlaceholder;
return useSecondary ? this.secondaryPlaceholder : this.placeholder;
};

/**
Expand Down

0 comments on commit dfd4ba2

Please sign in to comment.