Upgraded to NW.js 0.12.2

* Fixed PATH issues with node and NPM
* Default all modules to be off unless explicit stated

Author: Matt Karl

bower.json

@@ -1,6 +1,6 @@
 {
 	"name": "SpringRollStudio",
-	"version": "0.2.6",
+	"version": "0.2.7",
 	"private": true,
 	"dependencies": {
 		"jqueryui": "*",

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

@@ -1,7 +1,7 @@
 {
 	"name" : "Default",
 	"id" : "io.springroll.default",
-	"version" : "1.4.0",
+	"version" : "1.4.2",
 	"github": "SpringRoll/SpringRollTemplate",
 	"rename" : {
 		"gitignore" : ".gitignore",
@@ -26,7 +26,31 @@
 				"springroll": "*"
 			},
 			"libraries": "components/preloadjs/lib/preloadjs.min.js",
-			"librariesDebug": "components/preloadjs/lib/preloadjs.combined.js"
+			"librariesDebug": "components/preloadjs/lib/preloadjs.combined.js",
+			"default": true
+		},
+		{
+			"id": "debug",
+			"name": "Debug",
+			"description": "Feature parity with window.console but with support remote debugging and colored logs",
+			"mainDebug": [
+				"components/springroll/dist/modules/debug.js",
+				"components/springroll/dist/modules/debug.css"
+			],
+			"default": true
+		},
+		{
+			"id": "container-client",
+			"name": "Container Client",
+			"description": "Required for games being loaded by the Container module",
+			"main": "components/springroll/dist/modules/container-client.min.js",
+			"mainDebug": "components/springroll/dist/modules/container-client.js",
+			"bower": {
+				"bellhop": "*"
+			},
+			"libraries": "components/bellhop/dist/bellhop.min.js",
+			"librariesDebug": "components/bellhop/dist/bellhop.js",
+			"default": true
 		},
 		{
 			"id": "states",
@@ -38,15 +62,6 @@
 				["pixi-animation", "easeljs-animation"]
 			]
 		},
-		{
-			"id": "debug",
-			"name": "Debug",
-			"description": "Feature parity with window.console but with support remote debugging and colored logs",
-			"mainDebug": [
-				"components/springroll/dist/modules/debug.js",
-				"components/springroll/dist/modules/debug.css"
-			]
-		},
 		{
 			"id": "tasks",
 			"name": "Tasks",
@@ -141,26 +156,9 @@
 			"mainDebug": "components/springroll/dist/modules/hints.js",
 			"depends": [
 				"sound",
-				"learning-media",
 				["pixi-animation", "easeljs-animation"]
 			]
 		},
-		{
-			"id": "container-client",
-			"name": "Container Client",
-			"description": "Required for games being loaded by the Container module",
-			"main": "components/springroll/dist/modules/container-client.min.js",
-			"mainDebug": "components/springroll/dist/modules/container-client.js",
-			"bower": {
-				"bellhop": "*"
-			},
-			"libraries":[ 
-				"components/bellhop/dist/bellhop.min.js"
-			],
-			"librariesDebug": [
-				"components/bellhop/dist/bellhop.js"
-			]
-		},
 		{
 			"id": "easeljs-display",
 			"name": "EaselJS Display",
@@ -261,35 +259,31 @@
 			},
 			"libraries": "components/pixi.js/bin/pixi.js",
 			"librariesDebug": "components/pixi.js/bin/pixi.dev.js",
-			"display": "springroll.pixi.PixiDisplay",
-			"default": false
+			"display": "springroll.pixi.PixiDisplay"
 		},
 		{
 			"id": "pixi-animation",
 			"name": "Pixi.js Animation",
 			"description": "Manage animation playback with sprites or Spine animations",
 			"main": "components/springroll/dist/modules/pixi-animation.min.js",
 			"mainDebug": "components/springroll/dist/modules/pixi-animation.js",
-			"depends": ["pixi-display"],
-			"default": false
+			"depends": ["pixi-display"]
 		},
 		{
 			"id": "pixi-ui",
 			"name": "Pixi.js Interface",
 			"description": "Drag management and basic buttons for Pixi.js",
 			"main": "components/springroll/dist/modules/pixi-ui.min.js",
 			"mainDebug": "components/springroll/dist/modules/pixi-ui.js",
-			"depends": ["pixi-display"],
-			"default": false
+			"depends": ["pixi-display"]
 		},
 		{
 			"id": "native-display",
 			"name": "Native Display",
 			"description": "Display plugin which uses Context2d to render the canvas",
 			"main": "components/springroll/dist/modules/native-display.min.js",
 			"mainDebug": "components/springroll/dist/modules/native-display.js",
-			"display": "springroll.native.NativeDisplay",
-			"default": false
+			"display": "springroll.native.NativeDisplay"
 		},
 		{
 			"id": "container",
@@ -308,8 +302,7 @@
 			"librariesDebug": [
 				"components/bellhop/dist/bellhop.js",
 				"components/jquery/dist/jquery.js"
-			],
-			"default": false
+			]
 		}
 	]
 }

deploy/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "SpringRollStudio",
 	"description": "Application for SpringRoll projects",
-	"version": "0.2.6",
+	"version": "0.2.7",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/SpringRoll/SpringRollStudio"
@@ -24,13 +24,13 @@
 	"dependencies": {
 		"MD5": "~1.2.0",
 		"ansi2html": "~0.0.1",
+		"async": "^1.2.0",
 		"connect": "^3.3.4",
 		"fs-extra": "~0.12.0",
 		"glob": "~4.0.6",
 		"grunt-cli": "^0.1.13",
 		"lodash": "^3.7.0",
 		"node-watch": "~0.3.4",
-		"npm": "^2.4.1",
 		"replace": "~0.3.0",
 		"request": "^2.48.0",
 		"semver": "~4.0.3",

installer/win32.nsi

@@ -4,7 +4,7 @@
 # These three must be integers
 !define VERSIONMAJOR 0
 !define VERSIONMINOR 2
-!define VERSIONBUILD 6
+!define VERSIONBUILD 7
 # These will be displayed by the "Click here for support information" link in "Add/Remove Programs"
 # It is possible to use "mailto:" links in here to open the email client
 !define HELPURL "https://github.com/SpringRoll/SpringRollStudio/issues"

installer/win64.nsi

@@ -4,7 +4,7 @@
 # These three must be integers
 !define VERSIONMAJOR 0
 !define VERSIONMINOR 2
-!define VERSIONBUILD 6
+!define VERSIONBUILD 7
 # These will be displayed by the "Click here for support information" link in "Add/Remove Programs"
 # It is possible to use "mailto:" links in here to open the email client
 !define HELPURL "https://github.com/SpringRoll/SpringRollStudio/issues"

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "SpringRollStudio",
 	"private": true,
-	"version": "0.2.6",
+	"version": "0.2.7",
 	"dependencies": {
 		"grunt": "^0.4.5",
 		"grunt-contrib-copy": "^0.8.0",

project.json

@@ -1,6 +1,6 @@
 {
 	"name": "SpringRollStudio",
-	"version": "0.2.6",
+	"version": "0.2.7",
 	"main": [
 		"components/node-webkit-app/src/utils/UpdateChecker.js",
 		"components/node-webkit-app/src/utils/Browser.js",

src/js/new/NewProject.js

@@ -180,11 +180,6 @@
 			var displays = this.templates.displays();
 			var template = this.templates.val();
 
-			if (!displays.length)
-			{
-				throw "Please select a renderer to use.";
-			}
-
 			// Create a collection of selected modules
 			var modules = [];
 			var checkboxes = $(".module:checkbox:checked")
@@ -228,7 +223,7 @@
 					libraries: libraries.concat(main),
 					librariesDebug: librariesDebug.concat(mainDebug),
 					librariesCopy: librariesCopy,
-					displayClass: displays[0],
+					displayClass: displays.length ? displays[0] : "",
 					bower: bower
 				},
 				this._onCompleted.bind(this)

src/js/new/Template.js

@@ -72,12 +72,21 @@
 		this.rename = data.rename || null;
 
 		/**
-		 * The collection of parent modules that are required
+		 * The collection of parent modules that are required,
+		 * these are checked by default
 		 * @property {array} _required
 		 * @private
 		 */
 		this._required = data.required || [];
 
+		/**
+		 * The modules to exclude from the listing, these
+		 * will show up unchecked and disabled
+		 * @property {array} _disabled
+		 * @private
+		 */
+		this._disabled = data.disabled || [];
+
 		/**
 		 * Template to extend to
 		 * @property {string} extend
@@ -202,6 +211,22 @@
 		}
 	});
 
+	/**
+	 * Get the list of disabled module ids
+	 * @property {object} disabled
+	 */
+	Object.defineProperty(p, "disabled", {
+		get: function()
+		{
+			var disabled = [];
+			if (this.parent)
+			{
+				disabled = disabled.concat(this.parent.disabled);
+			}
+			return disabled.concat(this._disabled);
+		}
+	});
+
 	/**
 	 * Convert the template to JSON
 	 * @method  toJSON

src/js/new/TemplateManager.js

@@ -164,6 +164,7 @@
 
 		var modules = template.modules,
 			required = template.required,
+			disabled = template.disabled,
 			checkbox,
 			id, 
 			input, 
@@ -198,6 +199,12 @@
 				input.attr('disabled', true)
 					.prop('checked', true);
 			}
+			// Explicitly disable modules
+			if (disabled.indexOf(module.id) > -1)
+			{
+				input.attr('disabled', true)
+					.prop('checked', false);
+			}
 			if (module.display)
 			{
 				input.data('display', module.display);