Upgrade polls to Ember 1.11

2015-05-06 11:49:55 -04:00
parent 2e4d43364a
commit 585583d38c
4 changed files with 7 additions and 11 deletions
@@ -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) {
@@ -13,9 +13,9 @@ export default Em.Component.extend({
      if (backgroundColor) { styles.push("background: " + backgroundColor); }

      option.setProperties({
-        percentage: percentage,
+        percentage,
        title: I18n.t("poll.option_title", { count: option.get("votes") }),
-        style: styles.join(";")
+        style: styles.join(";").htmlSafe()
      });
    });