Skip to content
This repository has been archived by the owner on Mar 26, 2018. It is now read-only.

Commit

Permalink
Merge pull request #391 from mteodori/issue-378
Browse files Browse the repository at this point in the history
fixes #378 404 main css, main.js
  • Loading branch information
ruyadorno committed Mar 26, 2016
2 parents 8da66c0 + eb26c98 commit bc001b6
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions generators/app/index.js
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ var BackboneGenerator = yeoman.generators.Base.extend({
this.templatePath('_bower.json'), this.templatePath('_bower.json'),
this.destinationPath('bower.json'), this.destinationPath('bower.json'),
{ {
appSlugName: paramCase(this.appname), appParamCaseName: paramCase(this.appname),
sassBootstrap: this.sassBootstrap, sassBootstrap: this.sassBootstrap,
includeRequireJS: this.includeRequireJS, includeRequireJS: this.includeRequireJS,
includeModernizr: this.includeModernizr, includeModernizr: this.includeModernizr,
Expand All @@ -163,7 +163,7 @@ var BackboneGenerator = yeoman.generators.Base.extend({
this.destinationPath('.jshintrc'), this.destinationPath('.jshintrc'),
{ {
appName: this.appname, appName: this.appname,
appSlugName: paramCase(this.appname), appPascalCaseName: pascalCase(this.appname),
includeRequireJS: this.includeRequireJS includeRequireJS: this.includeRequireJS
} }
); );
Expand Down Expand Up @@ -354,7 +354,7 @@ var BackboneGenerator = yeoman.generators.Base.extend({
'app', 'app',
this.env.options.appPath + '/scripts/main', this.env.options.appPath + '/scripts/main',
{ {
appSlugName: paramCase(this.appname) appPascalCaseName: pascalCase(this.appname)
} }
); );
}, },
Expand Down
2 changes: 1 addition & 1 deletion generators/app/templates/_bower.json
Original file line number Original file line Diff line number Diff line change
@@ -1,5 +1,5 @@
{ {
"name": "<%= appSlugName %>", "name": "<%= appParamCaseName %>",
"version": "0.0.0", "version": "0.0.0",
"dependencies": { "dependencies": {
<% if (sassBootstrap) { -%> <% if (sassBootstrap) { -%>
Expand Down
4 changes: 2 additions & 2 deletions generators/app/templates/app.coffee
Original file line number Original file line Diff line number Diff line change
@@ -1,4 +1,4 @@
window.<%= appSlugName %> = window.<%= appPascalCaseName %> =
Models: {} Models: {}
Collections: {} Collections: {}
Views: {} Views: {}
Expand All @@ -9,4 +9,4 @@ window.<%= appSlugName %> =


$ -> $ ->
'use strict' 'use strict'
<%= appSlugName %>.init(); <%= appPascalCaseName %>.init();
6 changes: 3 additions & 3 deletions generators/app/templates/app.js
Original file line number Original file line Diff line number Diff line change
@@ -1,7 +1,7 @@
/*global <%= appSlugName %>, $*/ /*global <%= appPascalCaseName %>, $*/




window.<%= appSlugName %> = { window.<%= appPascalCaseName %> = {
Models: {}, Models: {},
Collections: {}, Collections: {},
Views: {}, Views: {},
Expand All @@ -14,5 +14,5 @@ window.<%= appSlugName %> = {


$(document).ready(function () { $(document).ready(function () {
'use strict'; 'use strict';
<%= appSlugName %>.init(); <%= appPascalCaseName %>.init();
}); });
2 changes: 1 addition & 1 deletion generators/app/templates/jshintrc
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"jquery": true, "jquery": true,
"globals": { "globals": {
"<%= appName %>": true, "<%= appName %>": true,
"<%= appSlugName %>": true, "<%= appPascalCaseName %>": true,
"_": false, "_": false,
"Backbone": false, "Backbone": false,
"JST": false, "JST": false,
Expand Down

0 comments on commit bc001b6

Please sign in to comment.