migrate to grunt 0.4

This commit is contained in:
vitalets
2013-08-31 13:15:19 +04:00
parent 0c1ea90005
commit 0abd9831ae
50 changed files with 250 additions and 144 deletions

@ -1,28 +1,27 @@
<!DOCTYPE HTML>
<html lang="en">
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>Test X-editable</title>
<script>
window.onload = function() {
//console.log('onlonad');
QUnit.config.autostart = false;
};
</script>
<!-- <script data-main="main.js" src="require-jquery.js"></script>-->
<script data-main="main.js" src="require.js"></script>
<script data-main="main.js" src="require.js"></script>
<!-- qunit (should be included here, otherwise phantomjs hangs-up on several tests )-->
<link rel="stylesheet" href="libs/qunit/qunit-1.12.0.css" type="text/css" media="screen" />
<script src="libs/qunit/qunit-1.12.0.js"></script>
<link rel="stylesheet" href="libs/qunit/qunit-1.12.0.css"/>
</head>
<body>
<div>
<div id="qunit"></div>
<div id="qunit-fixture"></div>
<div id="qunit-fixture1"></div>
<div id="async-fixture" style="padding-left:300px"></div>
</div>
<div id="qunit"></div>
<div id="qunit-fixture"></div>
<div id="qunit-fixture1"></div>
<div id="async-fixture" style="padding-left:300px"></div>
<script src="libs/qunit/qunit-1.12.0.js"></script>
</body>
</html>

@ -8,7 +8,7 @@ var jqver = decodeURIComponent((new RegExp('[?|&]' + 'jquery' + '=' + '([^&;]+?)
jqurl = jqver ? "http://code.jquery.com/jquery-"+jqver+".min.js" : "libs/jquery/jquery-1.9.1.min.js";
require(["loader", jqurl], function(loader) {
var config = loader.getConfig("../src"),
params = loader.getParams();