Merge branch 'pr/228'

DaftMonk · DaftMonk · commit db405027b286 · 2014-05-24T23:22:55.000-06:00
Conflicts:
	script-base.js
diff --git a/script-base.js b/script-base.js
@@ -117,7 +117,7 @@ Generator.prototype.addScriptToIndex = function (script) {
       file: fullPath,
       needle: '<!-- endbuild -->',
       splicable: [
-        '<script src="scripts/' + script.replace('\\', '/').toLowerCase() + '.js"></script>'
+        '<script src="scripts/' + script.toLowerCase().replace(/\\/g, '/') + '.js"></script>'
       ]
     });
   } catch (e) {

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ Generator.prototype.addScriptToIndex = function (script) {`
`117`	`117`	`file: fullPath,`
`118`	`118`	`needle: '<!-- endbuild -->',`
`119`	`119`	`splicable: [`
`120`		`- '<script src="scripts/' + script.replace('\\', '/').toLowerCase() + '.js"></script>'`
	`120`	`+ '<script src="scripts/' + script.toLowerCase().replace(/\\/g, '/') + '.js"></script>'`
`121`	`121`	`]`
`122`	`122`	`});`
`123`	`123`	`} catch (e) {`