Skip to content

Commit

Permalink
Add comma for parentRegistry, add .jshintrc file from ember-cli, and …
Browse files Browse the repository at this point in the history
…fix other jshint items.
  • Loading branch information
hemp committed Feb 13, 2015
1 parent e5ab575 commit e39b91f
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 5 deletions.
44 changes: 44 additions & 0 deletions .jshintrc
@@ -0,0 +1,44 @@
{
"predef": [
"console",
"it",
"describe",
"beforeEach",
"afterEach",
"before",
"after",
"-Promise"
],
"proto": true,
"strict": true,
"indent": 2,
"camelcase": true,
"node": true,
"browser": false,
"boss": true,
"curly": true,
"latedef": "nofunc",
"debug": false,
"devel": false,
"eqeqeq": true,
"evil": true,
"forin": false,
"immed": false,
"laxbreak": false,
"newcap": true,
"noarg": true,
"noempty": false,
"quotmark": true,
"nonew": false,
"nomen": false,
"onevar": false,
"plusplus": false,
"regexp": false,
"undef": true,
"unused": true,
"sub": true,
"trailing": true,
"white": false,
"eqnull": true,
"esnext": true
}
8 changes: 3 additions & 5 deletions ember-addon-main.js
Expand Up @@ -9,7 +9,7 @@ module.exports = {

init: function() {
checker.assertAbove(this, '0.1.2');
}
},

parentRegistry: null,

Expand All @@ -30,16 +30,14 @@ module.exports = {

return htmlbarsCompile(tree, self.htmlbarsOptions());
}
})
});

if (type === 'parent') {
this.parentRegistry = registry;
}
},

included: function (app) {
var self = this;

this._super.included.apply(this, arguments);

if (this.shouldSetupRegistryInIncluded()) {
Expand Down Expand Up @@ -86,4 +84,4 @@ module.exports = {

return plugins;
}
}
};

0 comments on commit e39b91f

Please sign in to comment.