Robot
/
morris.js
mirror of https://github.com/morrisjs/morris.js.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Support different jQuery package paths for travis builds.

This commit is contained in:
Olly Smith 2014-06-14 10:13:31 +01:00
parent 4a67502b05
commit bce2c80fde
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spec/specs.html
View File

@ -4,7 +4,9 @@
<title>morris.js tests</title>
<link rel="stylesheet" href="../bower_components/mocha/mocha.css" type="text/css" media="screen" />
<link rel="stylesheet" href="../morris.css" type="text/css" media="screen" />
<script src="../bower_components/jquery/dist/jquery.min.js"></script>
<!-- jQuery packaging changed for 2.1.0, so try to load both paths, one will work. -->
<script src="../bower_components/jquery/dist/jquery.js"></script>
<script src="../bower_components/jquery/jquery.js"></script>
<script type="text/javascript" src="../bower_components/raphael/raphael-min.js"></script>
</head>
<body>

4
spec/viz/test.html
View File

@ -1,6 +1,8 @@
<!doctype html>
<head>
<script src="../../bower_components/jquery/dist/jquery.min.js"></script>
<!-- jQuery packaging changed for 2.1.0, so try to load both paths, one will work. -->
<script src="../../bower_components/jquery/dist/jquery.js"></script>
<script src="../../bower_components/jquery/jquery.js"></script>
<script src="../../bower_components/raphael/raphael-min.js"></script>
<script src="../../morris.js"></script>
<link rel="stylesheet" href="../../morris.css">