Merge branch 'master' of github.com:jupiterjs/steal into amdify

build/js/jsminify.js

@@ -6,7 +6,7 @@ steal('steal','steal/parse',function(steal, parse){
 	// removes  dev comments from text
 	js.clean = function( text, file ) {
 		var parsedTxt = String(java.lang.String(text)
-			.replaceAll("(?s)\/\/@steal-remove-start(.*?)\/\/@steal-remove-end", ""));
+			.replaceAll("(?s)\/\/!steal-remove-start(.*?)\/\/!steal-remove-end", ""));
 
 		// the next part is slow, try to skip if possible
 		// if theres not a standalone steal.dev, skip

build/pluginify/pluginify.js

@@ -49,6 +49,7 @@ steal('steal/parse','steal/build').then(
 
 		opts.exclude = !opts.exclude ? [] : (isArray(opts.exclude) ? opts.exclude : [opts.exclude]);
 		opts.global = opts.global || "jQuery";
+		opts.namespace = opts.namespace || "namespace";
 
 		if (opts.nojquery) {
 			jq = false;
@@ -105,11 +106,13 @@ steal('steal/parse','steal/build').then(
 		}, true, true);
 
 		var output = out.join(";\n");
-		if(opts.wrapInner && opts.wrapInner.length === 2){
+		if ( opts.wrapInner && opts.wrapInner.length === 2 ) {
 			output = opts.wrapInner[0] + output + opts.wrapInner[1];
 		}
-		if(opts.onefunc){
-			output = "(function(can, window, undefined){"+ output+ "})("+opts.global+", this );";
+		if ( opts.onefunc ) {
+			output = "(function( " + opts.namespace + ", window, undefined ){"
+				+ output + 
+			"}( " + opts.global + ", this ));";
 		}
 		if (opts.compress) {
 			var compressorName = (typeof(opts.compress) == "string") ? opts.compress : "localClosure";

steal.js

@@ -1502,7 +1502,7 @@ request = function( options, success, error ) {
 		},
 		check = function(){
 			var status;
-			if ( request.readyState === 4 )  {
+			if ( request && request.readyState === 4 )  {
 				status = request.status;
 				if ( status === 500 || status === 404 ||
 					 status === 2 || request.status < 0 ||