github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-25 09:42:46 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Upgrade polls to Ember 1.11

Browse Source
This commit is contained in:
Robin Ward
2015-05-06 11:49:55 -04:00
parent 2e4d43364a
commit 585583d38c
4 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/poll/assets/javascripts/components/poll-option.js.es6
View File

@ -12,7 +12,8 @@ export default Em.Component.extend({
var styles = [];
if (this.get("color")) { styles.push("color:" + this.get("color")); }
if (this.get("background")) { styles.push("background:" + this.get("background")); }
return styles.length > 0 ? styles.join(";") : false;
return (styles.length > 0 ? styles.join(";") : '').htmlSafe();
}.property("color", "background"),
render(buffer) {