Use htmlSafe() macros

skylines-project · Mar 6, 2017 · 8c838c7 · 8c838c7
1 parent ebf852e
commit 8c838c7
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 14 deletions.
diff --git a/ember/app/components/base-barogram.js b/ember/app/components/base-barogram.js
@@ -1,6 +1,6 @@
 import Ember from 'ember';
-
-import safeComputed from '../computed/safe-computed';
+import { conditional, tag } from 'ember-awesome-macros';
+import { htmlSafe } from 'ember-awesome-macros/string';
 
 export default Ember.Component.extend({
   units: Ember.inject.service(),
@@ -18,7 +18,7 @@ export default Ember.Component.extend({
   contests: null,
   elevations: [],
 
-  flotStyle: safeComputed('height', height => Ember.String.htmlSafe(`width: 100%; height: ${height}px;`)),
+  flotStyle: conditional('height', htmlSafe(tag`width: 100%; height: ${'height'}px;`)),
 
   draw() {
     this.update();

diff --git a/ember/app/components/base-map.js b/ember/app/components/base-map.js
@@ -1,5 +1,7 @@
 import Ember from 'ember';
 import ol from 'openlayers';
+import { tag } from 'ember-awesome-macros';
+import { htmlSafe } from 'ember-awesome-macros/string';
 
 import config from '../config/environment';
 import parseQueryString from '../utils/parse-query-string';
@@ -13,10 +15,7 @@ export default Ember.Component.extend({
   height: '100%',
   baseLayer: null,
 
-  style: Ember.computed('width', 'height', function() {
-    let { width, height } = this.getProperties('width', 'height');
-    return Ember.String.htmlSafe(`width: ${width}; height: ${height}; position: relative`);
-  }),
+  style: htmlSafe(tag`width: ${'width'}; height: ${'height'}; position: relative`),
 
   init() {
     this._super(...arguments);

diff --git a/ember/app/components/fix-table-row.js b/ember/app/components/fix-table-row.js
@@ -1,14 +1,14 @@
 import Ember from 'ember';
+import { tag } from 'ember-awesome-macros';
+import { htmlSafe } from 'ember-awesome-macros/string';
 
 export default Ember.Component.extend({
   tagName: 'tr',
   classNameBindings: ['selected', 'selectable'],
 
   selectable: false,
 
-  badgeStyle: Ember.computed('row.color', function() {
-    return Ember.String.htmlSafe(`background-color: ${this.get('row.color')}`);
-  }),
+  badgeStyle: htmlSafe(tag`background-color: ${'row.color'}`),
 
   click() {
     if (this.get('selectable')) {

diff --git a/ember/app/components/wingman-row.js b/ember/app/components/wingman-row.js
@@ -1,6 +1,6 @@
 import Ember from 'ember';
-
-import safeComputed from '../computed/safe-computed';
+import { conditional, tag } from 'ember-awesome-macros';
+import { htmlSafe } from 'ember-awesome-macros/string';
 
 export default Ember.Component.extend({
   tagName: 'tr',
@@ -14,8 +14,7 @@ export default Ember.Component.extend({
   copilotName: Ember.computed.or('flight.copilot.name', 'flight.copilotName'),
   times: Ember.computed.alias('nearFlight.times'),
 
-  colorStripeStyle: safeComputed('nearFlight.color',
-    color => Ember.String.htmlSafe(`background-color: ${color}`)),
+  colorStripeStyle: conditional('nearFlight.color', htmlSafe(tag`background-color: ${'nearFlight.color'}`)),
 
   didInsertElement() {
     let popover_template = '<div class="popover" style="white-space: nowrap; z-index: 5000;">' +