Merge pull request #10678 from matthooks/master

Fix typos in deprecations of unescaped style attribute
emberjs · Mar 20, 2015 · 7b58afc · 7b58afc
2 parents d9fa588 + 61cb273
commit 7b58afc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/packages/ember-htmlbars/tests/attr_nodes/style_test.js b/packages/ember-htmlbars/tests/attr_nodes/style_test.js
@@ -22,7 +22,7 @@ QUnit.test('specifying `<div style="width: {{userValue}}></div>` is [DEPRECATED]
 
   expectDeprecation(function() {
     runAppend(view);
-  }, /Dynamic content in the `style` attribute is not escaped and may pose a security risk. Please preform a security audit and once verified change from `<div style="foo: {{property}}">` to `<div style="foo: {{{property}}}">/);
+  }, /Dynamic content in the `style` attribute is not escaped and may pose a security risk. Please perform a security audit and once verified change from `<div style="foo: {{property}}">` to `<div style="foo: {{{property}}}">/);
 });
 
 QUnit.test('specifying `<div style="width: {{{userValue}}}></div>` works properly', function() {

diff --git a/packages/ember-htmlbars/tests/helpers/bind_attr_test.js b/packages/ember-htmlbars/tests/helpers/bind_attr_test.js
@@ -608,7 +608,7 @@ QUnit.test('specifying `<div {{bind-attr style=userValue}}></div>` is [DEPRECATE
 
   expectDeprecation(function() {
     runAppend(view);
-  }, /Dynamic content in the `style` attribute is not escaped and may pose a security risk. Please preform a security audit and once verified change from `<div {{bind-attr style=someProperty}}>` to `<div style={{{someProperty}}}>/);
+  }, /Dynamic content in the `style` attribute is not escaped and may pose a security risk. Please perform a security audit and once verified change from `<div {{bind-attr style=someProperty}}>` to `<div style={{{someProperty}}}>/);
 });
 
 QUnit.test('specifying `<div {{{bind-attr style=userValue}}}></div>` works properly', function() {

diff --git a/packages/ember-views/lib/attr_nodes/attr_node.js b/packages/ember-views/lib/attr_nodes/attr_node.js
@@ -72,7 +72,7 @@ AttrNode.prototype.render = function render(buffer) {
 AttrNode.prototype._deprecateEscapedStyle = function AttrNode_deprecateEscapedStyle(value) {
   Ember.deprecate(
     'Dynamic content in the `style` attribute is not escaped and may pose a security risk. ' +
-    'Please preform a security audit and once verified change from ' +
+    'Please perform a security audit and once verified change from ' +
     this._dynamicStyleDeprecationMessage,
     (function(name, value, escaped) {
       // SafeString