Skip to content

Commit 1d564db

Browse files
author
Matt Karl
committed
Fixed more bugs, upgraded NWjs, updated dependencies
1 parent 8751a76 commit 1d564db

File tree

10 files changed

+48
-35
lines changed

10 files changed

+48
-35
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
SpringRollStudio
1+
SpringRollStudio [![Dependency Status](https://david-dm.org/SpringRoll/SpringRollStudio.svg)](https://david-dm.org/SpringRoll/SpringRollStudio)
22
============
33

44
SpringRollStudio is an native application (build with [nw-init](https://github.com/CloudKidStudio/nw-init) and designed to provide graphic user interfaces for building and managing [SpringRoll](https://github.com/SpringRoll/SpringRoll) projects.

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

Lines changed: 26 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name" : "Default",
33
"id" : "io.springroll.default",
4-
"version" : "1.3.1",
4+
"version" : "1.3.4",
55
"github": "SpringRoll/SpringRollTemplate",
66
"rename" : {
77
"gitignore" : ".gitignore",
@@ -17,11 +17,18 @@
1717
"main": "components/springroll/dist/core.min.js",
1818
"mainDebug": "components/springroll/dist/core.js",
1919
"bower": {
20-
"springroll": "*"
20+
"springroll": "master"
2121
},
2222
"libraries": "components/preloadjs/lib/preloadjs.min.js",
2323
"librariesDebug": "components/preloadjs/lib/preloadjs.combined.js"
2424
},
25+
{
26+
"id": "debug",
27+
"name": "Debug",
28+
"description": "Feature parity with window.console but with support remote debugging and colored logs",
29+
"mainDebug": "components/springroll/dist/modules/debug.js",
30+
"depends": ["core"]
31+
},
2532
{
2633
"id": "easeljs-display",
2734
"name": "EaselJS Display",
@@ -131,13 +138,6 @@
131138
"display": "springroll.native.NativeDisplay",
132139
"default": false
133140
},
134-
{
135-
"id": "debug",
136-
"name": "Debug",
137-
"description": "Feature parity with window.console but with support remote debugging and colored logs",
138-
"mainDebug": "components/springroll/dist/modules/debug.js",
139-
"depends": ["core"]
140-
},
141141
{
142142
"id": "tasks",
143143
"name": "Tasks",
@@ -194,7 +194,7 @@
194194
"main": "components/springroll/dist/modules/game.min.js",
195195
"mainDebug": "components/springroll/dist/modules/game.js",
196196
"depends": [
197-
"sound",
197+
"sound",
198198
"core",
199199
["easeljs-display","pixi-display"]
200200
]
@@ -213,6 +213,7 @@
213213
"description": "Integration for sending events with the Progress Tracker",
214214
"main": "components/springroll/dist/modules/progress-tracker.min.js",
215215
"mainDebug": [
216+
"components/jquery/dist/jquery.min.js",
216217
"components/springroll/dist/modules/progress-tracker.js",
217218
"components/springroll/dist/modules/progress-tracker.css"
218219
],
@@ -222,16 +223,24 @@
222223
"id": "tracking-game",
223224
"name": "Tracking Game",
224225
"description": "Special game application which can use hinting or progress-tracker",
225-
"main": "components/springroll/dist/modules/tracking-game.min.js",
226-
"mainDebug": "components/springroll/dist/modules/tracking-game.js",
226+
"main": [
227+
"components/springroll/dist/modules/tracking-game.min.js",
228+
"components/springroll/dist/modules/tracking-game.min.css"
229+
],
230+
"mainDebug": [
231+
"components/springroll/dist/modules/tracking-game.js",
232+
"components/springroll/dist/modules/tracking-game.css"
233+
],
227234
"bower": {
228235
"bellhop": "*"
229236
},
230-
"libraries":[
231-
"components/bellhop/dist/bellhop.min.js"
237+
"libraries":[
238+
"components/bellhop/dist/bellhop.min.js",
239+
"components/normalize-less/normalize.less"
232240
],
233241
"librariesDebug": [
234-
"components/bellhop/dist/bellhop.js"
242+
"components/bellhop/dist/bellhop.js",
243+
"components/normalize-less/normalize.less"
235244
],
236245
"depends": [
237246
"game",
@@ -271,7 +280,7 @@
271280
"bellhop": "*",
272281
"jquery": "*"
273282
},
274-
"libraries":[
283+
"libraries":[
275284
"components/bellhop/dist/bellhop.min.js",
276285
"components/jquery/dist/jquery.min.js"
277286
],
@@ -283,4 +292,4 @@
283292
"default": false
284293
}
285294
]
286-
}
295+
}

‎deploy/package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
"fs-extra": "~0.12.0",
2929
"glob": "~4.0.6",
3030
"grunt-cli": "^0.1.13",
31+
"lodash": "^3.7.0",
3132
"node-watch": "~0.3.4",
3233
"npm": "^2.4.1",
3334
"replace": "~0.3.0",
@@ -37,4 +38,4 @@
3738
"unzip": "^0.1.11",
3839
"ws": "~0.4.32"
3940
}
40-
}
41+
}

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
"version": "0.2.5",
55
"dependencies": {
66
"grunt": "^0.4.5",
7-
"grunt-contrib-copy": "^0.7.0",
7+
"grunt-contrib-copy": "^0.8.0",
88
"grunt-contrib-jade": "^0.14.1",
99
"grunt-exec": "^0.4.6",
1010
"grunt-node-webkit-builder": "^1.0.0",
1111
"lodash": "^3.0.0",
1212
"project-grunt": "*"
1313
}
14-
}
14+
}

‎project.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"components/bootstrap/less/bootstrap.less",
2323
"components/bootstrap-confirmation/bootstrap-confirmation.js",
2424
"components/underscore/underscore.js",
25-
"components/wavesurfer.js/build/wavesurfer.min.js",
25+
"components/wavesurfer.js/dist/wavesurfer.min.js",
2626
"components/sunlight/build/dist/sunlight-min.js",
2727
"components/sunlight/build/dist/lang/sunlight.javascript-min.js",
2828
"components/sunlight/build/dist/themes/sunlight.default.css"
@@ -39,7 +39,7 @@
3939
"components/bootstrap/less/bootstrap.less",
4040
"components/bootstrap-confirmation/bootstrap-confirmation.js",
4141
"components/underscore/underscore.js",
42-
"components/wavesurfer.js/build/wavesurfer.min.js",
42+
"components/wavesurfer.js/dist/wavesurfer.min.js",
4343
"components/sunlight/build/dist/sunlight-min.js",
4444
"components/sunlight/build/dist/lang/sunlight.javascript-min.js",
4545
"components/sunlight/build/dist/themes/sunlight.default.css"

‎src/jade/tasks.jade‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ html
1818
br
1919
| This may take a few minutes.
2020
.state.failed
21-
span.glyphicon.glyphicon-exclamation-sign
22-
span#failedMessage
23-
br
21+
p
22+
span.glyphicon.glyphicon-exclamation-sign
23+
|
24+
span#failedMessage
2425
button#refreshTasks.btn.btn-danger Retry

‎src/js/tasks/input/ProjectManager.js‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,16 +131,18 @@
131131

132132
var self = this;
133133
var project = this.project;
134+
var gruntPath = path.join(project.path, 'node_modules', 'grunt');
135+
var gruntFile = path.join(project.path, 'Gruntfile.js');
134136

135137
// Check for grunt within project
136-
if (!fs.existsSync(path.join(project.path, 'node_modules', 'grunt')))
138+
if (!fs.existsSync(gruntPath))
137139
{
138140
this.failed('Unable to find local grunt.');
139141
return;
140142
}
141143

142144
// Check for grunt file
143-
if (!fs.existsSync(path.join(project.path, 'Gruntfile.js')))
145+
if (!fs.existsSync(gruntFile))
144146
{
145147
this.failed('Unable to find Gruntfile.js.');
146148
return;
@@ -154,7 +156,8 @@
154156
{
155157
if (error)
156158
{
157-
self.failed('Exec error: ' + error);
159+
console.error(error.toString());
160+
self.failed(error.toString());
158161
return;
159162
}
160163

@@ -232,6 +235,8 @@
232235
{
233236
if (error)
234237
{
238+
console.error(error.toString());
239+
235240
// Try to get tasks from the help
236241
tasksFromHelp();
237242
return;

‎src/less/preview/Preview.less‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ body {
1111
width:100%;
1212
top:40px;
1313
bottom:0;
14+
background:#000;
1415
iframe {
1516
position:absolute;
1617
width:100%;

‎src/less/tasks/base.less‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ body {
3030
position:absolute;
3131
width:100%;
3232
top:50%;
33+
margin-top:20px;
3334
-webkit-transform:translateY(-50%);
3435
transform:translateY(-50%);
3536
}
@@ -80,11 +81,6 @@ body {
8081
}
8182
#tasks, .status {
8283
overflow: auto;
83-
position: fixed;
84-
top: 40px;
85-
bottom: 0;
86-
right: 0;
87-
left: 0;
8884
}
8985
#tasks {
9086
z-index:1;

‎tasks/nodewebkit.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module.exports = {
22
options: {
3-
version: '0.12.0',
3+
version: '0.12.1',
44
buildDir: '<%= buildDir %>',
55
macIcns: '<%= distFolder %>/assets/images/icon.icns',
66
winIco: '<%= distFolder %>/assets/images/icon.ico',

0 commit comments

Comments
 (0)