Skip to content

Commit 8d1e98c

Browse files
author
Matt Karl
committed
Updated default template
1 parent e4ca744 commit 8d1e98c

File tree

5 files changed

+7
-36
lines changed

5 files changed

+7
-36
lines changed
Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1 @@
1-
module.exports = function(grunt)
2-
{
3-
var path = require('path'),
4-
_ = require('lodash');
5-
6-
// Combine the game builder and current project
7-
// configs into one object
8-
grunt.initConfig(_.extend(
9-
10-
// Setup the default game tasks
11-
require('grunt-springroll')(grunt, { autoInit: false }),
12-
13-
// Setup the current project tasks
14-
require('load-grunt-config')(grunt,
15-
{
16-
// The path for the tasks
17-
configPath: path.join(process.cwd(), 'tasks'),
18-
autoInit: false,
19-
20-
// We don't want to reload builder
21-
loadGruntTasks:
22-
{
23-
pattern: [
24-
'grunt-*',
25-
'!grunt-springroll'
26-
]
27-
}
28-
})
29-
));
30-
};
1+
module.exports = require('grunt-springroll');
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
{
22
"private": true,
3+
"version": "_version_",
34
"dependencies": {
45
"grunt": "*",
5-
"grunt-springroll": "*",
6-
"load-grunt-config": "*",
7-
"lodash": "*"
6+
"grunt-springroll": "*"
87
}
98
}

deploy/assets/templates/default/springroll-template.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name" : "Default",
33
"id" : "io.springroll.default",
4-
"version" : "1.1.1",
4+
"version" : "1.2.0",
55
"rename" : {
66
"gitignore" : ".gitignore",
77
"bowerrc" : ".bowerrc"

deploy/assets/templates/default/src/_namespace_/_className_.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@
1818

1919
// Assign to namespace
2020
namespace('_namespace_')._className_ = _className_;
21-
21+
2222
}());

src/springroll/SpringRollStudio.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
}
6868

6969
// Bind reference to the open project handler
70-
var openProject = this.openProject.bind(this);
70+
var openProject = this.openProject.bind(this);
7171

7272
/**
7373
* Open button
@@ -136,6 +136,7 @@
136136
if (!fs.existsSync(path.join(project, 'springroll.json')))
137137
{
138138
alert("Folder is not a valid SpringRoll project");
139+
this.closeProject();
139140
return;
140141
}
141142
this.projectName.text(path.basename(project));

0 commit comments

Comments
 (0)