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.

Sign up for GitHub

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

Jump to bottom

Ensure attributeBindings work when legacy view addon is disabled. #12318

Merged
merged 2 commits into from
Sep 10, 2015
Merged

Ensure attributeBindings work when legacy view addon is disabled. #12318

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d3e20d8
Ensure attributeBindings work when legacy view addon is disabled.
rwjblue Sep 10, 2015
b60e201
Remove unsupported global check for class bindings.
rwjblue Sep 10, 2015
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
19 changes: 9 additions & 10 deletions packages/ember-views/lib/system/build-component-template.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { assert, deprecate } from 'ember-metal/debug';
import { get } from 'ember-metal/property_get';
import assign from 'ember-metal/assign';
import { isGlobal } from 'ember-metal/path_cache';
import { internal, render } from 'htmlbars-runtime';
import getValue from 'ember-htmlbars/hooks/get-value';
import { isStream } from 'ember-metal/streams/utils';
Expand Down Expand Up @@ -158,6 +157,7 @@ function tagNameFor(view) {
function normalizeComponentAttributes(component, isAngleBracket, attrs) {
var normalized = {};
var attributeBindings = component.attributeBindings;
var streamBasePath = component.isComponent ? '' : 'view.';
var i, l;

if (attrs.id && getValue(attrs.id)) {
Expand All @@ -177,7 +177,7 @@ function normalizeComponentAttributes(component, isAngleBracket, attrs) {
if (colonIndex !== -1) {
var attrProperty = attr.substring(0, colonIndex);
attrName = attr.substring(colonIndex + 1);
expression = ['get', 'view.' + attrProperty];
expression = ['get', `${streamBasePath}${attrProperty}`];
} else if (attrs[attr]) {
// TODO: For compatibility with 1.x, we probably need to `set`
// the component's attribute here if it is a CP, but we also
Expand All @@ -187,7 +187,7 @@ function normalizeComponentAttributes(component, isAngleBracket, attrs) {
expression = ['value', attrs[attr]];
} else {
attrName = attr;
expression = ['get', 'view.' + attr];
expression = ['get', `${streamBasePath}${attr}`];
}

assert('You cannot use class as an attributeBinding, use classNameBindings instead.', attrName !== 'class');
Expand All @@ -211,7 +211,7 @@ function normalizeComponentAttributes(component, isAngleBracket, attrs) {
component.tagName = attrs.tagName;
}

var normalizedClass = normalizeClass(component, attrs);
var normalizedClass = normalizeClass(component, attrs, streamBasePath);

if (normalizedClass) {
normalized.class = normalizedClass;
Expand All @@ -231,7 +231,7 @@ function normalizeComponentAttributes(component, isAngleBracket, attrs) {
return normalized;
}

function normalizeClass(component, attrs) {
function normalizeClass(component, attrs, streamBasePath) {
var i, l;
var normalizedClass = [];
var classNames = get(component, 'classNames');
Expand All @@ -246,7 +246,7 @@ function normalizeClass(component, attrs) {
}

if (attrs.classBinding) {
normalizeClasses(attrs.classBinding.split(' '), normalizedClass);
normalizeClasses(attrs.classBinding.split(' '), normalizedClass, streamBasePath);
}

if (classNames) {
Expand All @@ -256,15 +256,15 @@ function normalizeClass(component, attrs) {
}

if (classNameBindings) {
normalizeClasses(classNameBindings, normalizedClass);
normalizeClasses(classNameBindings, normalizedClass, streamBasePath);
}

if (normalizeClass.length) {
return ['subexpr', '-join-classes', normalizedClass, []];
}
}

function normalizeClasses(classes, output) {
function normalizeClasses(classes, output, streamBasePath) {
var i, l;

for (i = 0, l = classes.length; i < l; i++) {
Expand All @@ -279,8 +279,7 @@ function normalizeClasses(classes, output) {
continue;
}

// 2.0TODO: Remove deprecated global path
var prop = isGlobal(propName) ? propName : 'view.' + propName;
var prop = `${streamBasePath}${propName}`;

output.push(['subexpr', '-normalize-class', [
// params
Expand Down