Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[BUGFIX beta] Remove style warning when the binding is quoted #14293

Merged
merged 1 commit into from
Nov 3, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 40 additions & 0 deletions packages/ember-glimmer/tests/integration/content-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -1281,5 +1281,45 @@ if (!EmberDev.runningProdBuild) {

this.assertNoWarning();
}

['@test no warnings are triggered when a safe string is quoted'](assert) {
this.render('<div style="{{userValue}}"></div>', {
userValue: new SafeString('width: 42px')
});

this.assertNoWarning();
}

['@test binding warning is triggered when an unsafe string is quoted'](assert) {
this.render('<div style="{{userValue}}"></div>', {
userValue: 'width: 42px'
});

this.assertStyleWarning();
}

['@test binding warning is triggered when a safe string for a complete property is concatenated in place'](assert) {
this.render('<div style="color: green; {{userValue}}"></div>', {
userValue: new SafeString('width: 42px')
});

this.assertStyleWarning();
}

['@test binding warning is triggered when a safe string for a value is concatenated in place'](assert) {
this.render('<div style="color: green; width: {{userValue}}"></div>', {
userValue: new SafeString('42px')
});

this.assertStyleWarning();
}

['@test binding warning is triggered when a safe string for a property name is concatenated in place'](assert) {
this.render('<div style="color: green; {{userProperty}}: 42px"></div>', {
userProperty: new SafeString('width')
});

this.assertStyleWarning();
}
});
}
2 changes: 2 additions & 0 deletions packages/ember-template-compiler/lib/plugins/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import TransformInputOnToOnEvent from './transform-input-on-to-onEvent';
import TransformTopLevelComponents from './transform-top-level-components';
import TransformInlineLinkTo from './transform-inline-link-to';
import TransformOldClassBindingSyntax from './transform-old-class-binding-syntax';
import TransformQuotedBindingsIntoJustBindings from './transform-quoted-bindings-into-just-bindings';
import DeprecateRenderModel from './deprecate-render-model';
import AssertReservedNamedArguments from './assert-reserved-named-arguments';
import TransformActionSyntax from './transform-action-syntax';
Expand All @@ -21,6 +22,7 @@ export default Object.freeze([
TransformTopLevelComponents,
TransformInlineLinkTo,
TransformOldClassBindingSyntax,
TransformQuotedBindingsIntoJustBindings,
DeprecateRenderModel,
AssertReservedNamedArguments,
TransformActionSyntax,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
export default function TransformQuotedBindingsIntoJustBindings() {
// set later within HTMLBars to the syntax package
this.syntax = null;
}

/**
@private
@method transform
@param {AST} ast The AST to be transformed.
*/
TransformQuotedBindingsIntoJustBindings.prototype.transform = function TransformQuotedBindingsIntoJustBindings_transform(ast) {
let walker = new this.syntax.Walker();

walker.visit(ast, node => {
if (!validate(node)) { return; }

let styleAttr = getStyleAttr(node);

if (!validStyleAttr(styleAttr)) { return; }

styleAttr.value = styleAttr.value.parts[0];
});

return ast;
};

function validate(node) {
return node.type === 'ElementNode';
}

function validStyleAttr(attr) {
if (!attr) { return false; }

let value = attr.value;

if (!value ||
value.type !== 'ConcatStatement' ||
value.parts.length !== 1) { return false; }

let onlyPart = value.parts[0];

return onlyPart.type === 'MustacheStatement';
}

function getStyleAttr(node) {
let attributes = node.attributes;

for (let i = 0; i < attributes.length; i++) {
if (attributes[i].name === 'style') {
return attributes[i];
}
}
}