Skip to content

Commit

Permalink
Merge pull request emberjs#6 from rwjblue/cleanup-comments
Browse files Browse the repository at this point in the history
Fixup per Stef's review.
  • Loading branch information
mixonic committed Nov 4, 2014
2 parents e8e60e2 + 35a85d9 commit ef0e058
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 7 deletions.
4 changes: 2 additions & 2 deletions Brocfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ function defeatureifyConfig(opts) {
/*
Returns a tree picked from `packages/#{packageName}/lib` and then move `main.js` to `/#{packageName}.js`.
*/
function vendoredPackage(packageName, options) {
if (!options) { options = {}; }
function vendoredPackage(packageName, _options) {
var options = _options || {};

var libPath = options.libPath || 'packages/' + packageName + '/lib';
var mainFile = options.mainFile || 'main.js';
Expand Down
2 changes: 1 addition & 1 deletion packages/ember-htmlbars/lib/helpers.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ function bindHelper(params, options, env) {
// TODO: is this needed?
// options.helperName = 'bind';
// bind.call(options.context, property, options, false, exists);
throw "not implemented";
throw new Error("not implemented");
} else {
simpleBind(params, options, env);
}
Expand Down
10 changes: 6 additions & 4 deletions packages/ember-htmlbars/lib/hooks.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ export function lookupHelper(name, env) {
}

function attribute(element, params, options) {
var name = params[0],
value = params[1];
var name = params[0];
var value = params[1];

value.subscribe(function(lazyValue) {
element.setAttribute(name, lazyValue.value());
Expand All @@ -82,11 +82,13 @@ function concat(params, options) {
return readArray(params).join('');
});

params.forEach(function(param) {
for (var i = 0, l = params.length; i < l; i++) {
var param = params[i];

if (param && param.isStream) {
param.subscribe(stream.notifyAll, stream);
}
});
}

return stream;
}

0 comments on commit ef0e058

Please sign in to comment.