Merge branch 'fixes' into develop

This commit is contained in:
Georg Fischer 2013-11-30 20:37:34 +01:00
commit a2917280a9
2 changed files with 2 additions and 4 deletions

View File

@ -11,7 +11,6 @@ this experiment is very much based on the [smack my glitch up js](https://github
build script
---
the build script takes care of concatenating and minifying all scripts and styles. it uses [gruntjs](http://gruntjs.com/).
please make sure that both [nodejs](http://nodejs.org/) and grunt-cli are [set up properly](http://gruntjs.com/getting-started) on your machine.

View File

@ -1,9 +1,8 @@
/*global require, requirejs, define, Modernizr, _basepath_ */
/*global require, requirejs, define */
// http://requirejs.org/docs/api.html#config
var path = typeof _basepath_ === 'string' ? _basepath_ + '/' : '';
requirejs.config(
{
baseUrl: path + 'scripts/',
baseUrl: 'scripts/',
waitSeconds: 50,
urlArgs: 'bust=' + ( new Date() ).getTime()
}