Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Removing third_party folder. Using cdn links in examples. Using bower… 
….js for deps. Build matrix for Travic-CI.
  • Loading branch information
@simonoff
simonoff committed Feb 2, 2014
1 parent ecd6fd7 commit 0f602d1
Show file tree
Hide file tree
Showing 44 changed files with 124 additions and 13,318 deletions.
2 changes: 2 additions & 0 deletions .gitignore
View file
Expand Up @@ -2,3 +2,5 @@ build/
node_modules/
spec/viz/output/
spec/viz/diff/
bower_components
.idea
14 changes: 14 additions & 0 deletions .travis.yml
View file
@@ -1,6 +1,20 @@
language: node_js
node_js:
- 0.8
- 0.10
before_script:
- "npm install -g grunt-cli"
- "npm install"
- "cp -f bower.travis.json bower.json"
- 'sed -i -e "s/JQUERY/$JQUERY/" bower.json'
- 'sed -i -e "s/RAPHAEL/$RAPHAEL/" bower.json'
- "bower install"
env:
- JQUERY="~> 1.8.0" RAPHAEL="~ 2.0"
- JQUERY="~> 1.9.0" RAPHAEL="~ 2.0"
- JQUERY="~> 2.0.0" RAPHAEL="~ 2.0"
- JQUERY="~> 2.1.0" RAPHAEL="~ 2.0"
- JQUERY="~> 1.8.0" RAPHAEL="~ 2.1"
- JQUERY="~> 1.9.0" RAPHAEL="~ 2.1"
- JQUERY="~> 2.0.0" RAPHAEL="~ 2.1"
- JQUERY="~> 2.1.0" RAPHAEL="~ 2.1"
20 changes: 20 additions & 0 deletions bower.json
View file
@@ -0,0 +1,20 @@
{
"name": "morris.js",
"version": "0.5.0",
"main": [
"./morris.js",
"./morris.css"
],
"dependencies": {
"jquery": ">= 2.1.0",

This comment has been minimized.

Sign in to view

Copy link
@andreasklinger

andreasklinger Feb 10, 2014

Why do you go for jquery version ">= 2" ?
This breaks with rails which looks for ">1.7.* <2.0.0".
It seems morris itself runs fine with 1.7.x

context: I am installing morris.js via bower and get conflicts.
"raphael": ">= 2.0",
"mocha": "~1.17.1"
},
"devDependencies": {
"mocha": "~1.17.1",
"chai": "~1.9.0",
"chai-jquery": "~1.2.1",
"sinon": "http://sinonjs.org/releases/sinon-1.8.1.js",
"sinon-chai": "~2.5.0"
}
}
20 changes: 20 additions & 0 deletions bower.travis.json
View file
@@ -0,0 +1,20 @@
{
"name": "morris.js",
"version": "0.5.0",
"main": [
"./morris.js",
"./morris.css"
],
"dependencies": {
"jquery": "JQUERY",
"raphael": "RAPHAEL",
"mocha": "~1.17.1"
},
"devDependencies": {
"mocha": "~1.17.1",
"chai": "~1.9.0",
"chai-jquery": "~1.2.1",
"sinon": "http://sinonjs.org/releases/sinon-1.8.1.js",
"sinon-chai": "~2.5.0"
}
}
9 changes: 0 additions & 9 deletions component.json
View file

This file was deleted.

4 changes: 2 additions & 2 deletions examples/_template.html
View file
@@ -1,7 +1,7 @@
<!doctype html>
<head>
<script src="../third_party/jquery-1.8.2.min.js"></script>
<script src="../third_party/raphael-2.1.0.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.0.3/jquery.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/raphael/2.1.2/raphael-min.js"></script>
<script src="../morris.js"></script>
<script src="lib/prettify.js"></script>
<script src="lib/example.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions examples/area-as-line.html
View file
@@ -1,7 +1,7 @@
<!doctype html>
<head>
<script src="../third_party/jquery-1.8.2.min.js"></script>
<script src="../third_party/raphael-2.1.0.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.0.3/jquery.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/raphael/2.1.2/raphael-min.js"></script>
<script src="../morris.js"></script>
<script src="lib/prettify.js"></script>
<script src="lib/example.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions examples/area.html
View file
@@ -1,7 +1,7 @@
<!doctype html>
<head>
<script src="../third_party/jquery-1.8.2.min.js"></script>
<script src="../third_party/raphael-2.1.0.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.0.3/jquery.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/raphael/2.1.2/raphael-min.js"></script>
<script src="../morris.js"></script>
<script src="lib/prettify.js"></script>
<script src="lib/example.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions examples/bar-colors.html
View file
@@ -1,7 +1,7 @@
<!doctype html>
<head>
<script src="../third_party/jquery-1.8.2.min.js"></script>
<script src="../third_party/raphael-2.1.0.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.0.3/jquery.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/raphael/2.1.2/raphael-min.js"></script>
<script src="../morris.js"></script>
<script src="lib/prettify.js"></script>
<script src="lib/example.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions examples/bar-no-axes.html
View file
@@ -1,7 +1,7 @@
<!doctype html>
<head>
<script src="../third_party/jquery-1.8.2.min.js"></script>
<script src="../third_party/raphael-2.1.0.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.0.3/jquery.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/raphael/2.1.2/raphael-min.js"></script>
<script src="../morris.js"></script>
<script src="lib/prettify.js"></script>
<script src="lib/example.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions examples/bar.html
View file
@@ -1,7 +1,7 @@
<!doctype html>
<head>
<script src="../third_party/jquery-1.8.2.min.js"></script>
<script src="../third_party/raphael-2.1.0.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.0.3/jquery.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/raphael/2.1.2/raphael-min.js"></script>
<script src="../morris.js"></script>
<script src="lib/prettify.js"></script>
<script src="lib/example.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions examples/days.html
View file
@@ -1,7 +1,7 @@
<!doctype html>
<head>
<script src="../third_party/jquery-1.8.2.min.js"></script>
<script src="../third_party/raphael-2.1.0.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.0.3/jquery.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/raphael/2.1.2/raphael-min.js"></script>
<script src="../morris.js"></script>
<script src="lib/prettify.js"></script>
<script src="lib/example.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions examples/decimal-custom-hover.html
View file
@@ -1,7 +1,7 @@
<!doctype html>
<head>
<script src="../third_party/jquery-1.8.2.min.js"></script>
<script src="../third_party/raphael-2.1.0.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.0.3/jquery.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/raphael/2.1.2/raphael-min.js"></script>
<script src="../morris.js"></script>
<script src="lib/prettify.js"></script>
<script src="lib/example.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions examples/diagonal-xlabels-bar.html
View file
@@ -1,7 +1,7 @@
<!doctype html>
<head>
<script src="../third_party/jquery-1.8.2.min.js"></script>
<script src="../third_party/raphael-2.1.0.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.0.3/jquery.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/raphael/2.1.2/raphael-min.js"></script>
<script src="../morris.js"></script>
<script src="lib/prettify.js"></script>
<script src="lib/example.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions examples/diagonal-xlabels.html
View file
@@ -1,7 +1,7 @@
<!doctype html>
<head>
<script src="../third_party/jquery-1.8.2.min.js"></script>
<script src="../third_party/raphael-2.1.0.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.0.3/jquery.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/raphael/2.1.2/raphael-min.js"></script>
<script src="../morris.js"></script>
<script src="lib/prettify.js"></script>
<script src="lib/example.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions examples/donut-colors.html
View file
@@ -1,7 +1,7 @@
<!doctype html>
<head>
<script src="../third_party/jquery-1.8.2.min.js"></script>
<script src="../third_party/raphael-2.1.0.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.0.3/jquery.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/raphael/2.1.2/raphael-min.js"></script>
<script src="../morris.js"></script>
<script src="lib/prettify.js"></script>
<script src="lib/example.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions examples/donut-formatter.html
View file
@@ -1,7 +1,7 @@
<!doctype html>
<head>
<script src="../third_party/jquery-1.8.2.min.js"></script>
<script src="../third_party/raphael-2.1.0.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.0.3/jquery.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/raphael/2.1.2/raphael-min.js"></script>
<script src="../morris.js"></script>
<script src="lib/prettify.js"></script>
<script src="lib/example.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions examples/donut.html
View file
@@ -1,7 +1,7 @@
<!doctype html>
<head>
<script src="../third_party/jquery-1.8.2.min.js"></script>
<script src="../third_party/raphael-2.1.0.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.0.3/jquery.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/raphael/2.1.2/raphael-min.js"></script>
<script src="../morris.js"></script>
<script src="lib/prettify.js"></script>
<script src="lib/example.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions examples/dst.html
View file
@@ -1,7 +1,7 @@
<!doctype html>
<head>
<script src="../third_party/jquery-1.8.2.min.js"></script>
<script src="../third_party/raphael-2.1.0.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.0.3/jquery.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/raphael/2.1.2/raphael-min.js"></script>
<script src="../morris.js"></script>
<script src="lib/prettify.js"></script>
<script src="lib/example.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions examples/events.html
View file
@@ -1,7 +1,7 @@
<!doctype html>
<head>
<script src="../third_party/jquery-1.8.2.min.js"></script>
<script src="../third_party/raphael-2.1.0.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.0.3/jquery.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/raphael/2.1.2/raphael-min.js"></script>
<script src="../morris.js"></script>
<script src="lib/prettify.js"></script>
<script src="lib/example.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions examples/goals.html
View file
@@ -1,7 +1,7 @@
<!doctype html>
<head>
<script src="../third_party/jquery-1.8.2.min.js"></script>
<script src="../third_party/raphael-2.1.0.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.0.3/jquery.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/raphael/2.1.2/raphael-min.js"></script>
<script src="../morris.js"></script>
<script src="lib/prettify.js"></script>
<script src="lib/example.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions examples/months-no-smooth.html
View file
@@ -1,7 +1,7 @@
<!doctype html>
<head>
<script src="../third_party/jquery-1.8.2.min.js"></script>
<script src="../third_party/raphael-2.1.0.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.0.3/jquery.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/raphael/2.1.2/raphael-min.js"></script>
<script src="../morris.js"></script>
<script src="lib/prettify.js"></script>
<script src="lib/example.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions examples/negative.html
View file
@@ -1,7 +1,7 @@
<!doctype html>
<head>
<script src="../third_party/jquery-1.8.2.min.js"></script>
<script src="../third_party/raphael-2.1.0.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.0.3/jquery.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/raphael/2.1.2/raphael-min.js"></script>
<script src="../morris.js"></script>
<script src="lib/prettify.js"></script>
<script src="lib/example.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions examples/no-grid.html
View file
@@ -1,7 +1,7 @@
<!doctype html>
<head>
<script src="../third_party/jquery-1.8.2.min.js"></script>
<script src="../third_party/raphael-2.1.0.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.0.3/jquery.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/raphael/2.1.2/raphael-min.js"></script>
<script src="../morris.js"></script>
<script src="lib/prettify.js"></script>
<script src="lib/example.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions examples/non-continuous.html
View file
@@ -1,7 +1,7 @@
<!doctype html>
<head>
<script src="../third_party/jquery-1.8.2.min.js"></script>
<script src="../third_party/raphael-2.1.0.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.0.3/jquery.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/raphael/2.1.2/raphael-min.js"></script>
<script src="../morris.js"></script>
<script src="lib/prettify.js"></script>
<script src="lib/example.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions examples/non-date.html
View file
@@ -1,7 +1,7 @@
<!doctype html>
<head>
<script src="../third_party/jquery-1.8.2.min.js"></script>
<script src="../third_party/raphael-2.1.0.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.0.3/jquery.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/raphael/2.1.2/raphael-min.js"></script>
<script src="../morris.js"></script>
<script src="lib/prettify.js"></script>
<script src="lib/example.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions examples/quarters.html
View file
@@ -1,7 +1,7 @@
<!doctype html>
<head>
<script src="../third_party/jquery-1.8.2.min.js"></script>
<script src="../third_party/raphael-2.1.0.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.0.3/jquery.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/raphael/2.1.2/raphael-min.js"></script>
<script src="../morris.js"></script>
<script src="lib/prettify.js"></script>
<script src="lib/example.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions examples/resize.html
View file
@@ -1,7 +1,7 @@
<!doctype html>
<head>
<script src="../third_party/jquery-1.8.2.min.js"></script>
<script src="../third_party/raphael-2.1.0.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.0.3/jquery.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/raphael/2.1.2/raphael-min.js"></script>
<script src="../morris.js"></script>
<script src="lib/prettify.js"></script>
<script src="lib/example.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions examples/stacked_bars.html
View file
@@ -1,7 +1,7 @@
<!doctype html>
<head>
<script src="../third_party/jquery-1.8.2.min.js"></script>
<script src="../third_party/raphael-2.1.0.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.0.3/jquery.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/raphael/2.1.2/raphael-min.js"></script>
<script src="../morris.js"></script>
<script src="lib/prettify.js"></script>
<script src="lib/example.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions examples/timestamps.html
View file
@@ -1,7 +1,7 @@
<!doctype html>
<head>
<script src="../third_party/jquery-1.8.2.min.js"></script>
<script src="../third_party/raphael-2.1.0.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.0.3/jquery.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/raphael/2.1.2/raphael-min.js"></script>
<script src="../morris.js"></script>
<script src="lib/prettify.js"></script>
<script src="lib/example.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions examples/updating.html
View file
@@ -1,7 +1,7 @@
<!doctype html>
<head>
<script src="../third_party/jquery-1.8.2.min.js"></script>
<script src="../third_party/raphael-2.1.0.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.0.3/jquery.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/raphael/2.1.2/raphael-min.js"></script>
<script src="../morris.js"></script>
<script src="lib/prettify.js"></script>
<script src="lib/example.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions examples/weeks.html
View file
@@ -1,7 +1,7 @@
<!doctype html>
<head>
<script src="../third_party/jquery-1.8.2.min.js"></script>
<script src="../third_party/raphael-2.1.0.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.0.3/jquery.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/raphael/2.1.2/raphael-min.js"></script>
<script src="../morris.js"></script>
<script src="lib/prettify.js"></script>
<script src="lib/example.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions examples/years.html
View file
@@ -1,7 +1,7 @@
<!doctype html>
<head>
<script src="../third_party/jquery-1.8.2.min.js"></script>
<script src="../third_party/raphael-2.1.0.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.0.3/jquery.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/raphael/2.1.2/raphael-min.js"></script>
<script src="../morris.js"></script>
<script src="lib/prettify.js"></script>
<script src="lib/example.js"></script>
Expand Down
3 changes: 2 additions & 1 deletion package.json
View file
Expand Up @@ -24,7 +24,8 @@
"grunt-contrib-uglify": "~0.2.4",
"grunt-contrib-less": "~0.7.0",
"grunt-contrib-watch": "~0.5.3",
"grunt-shell": "~0.5.0"
"grunt-shell": "~0.5.0",
"bower": "~1.2.8"
},
"scripts": {
"test": "grunt concat coffee mocha"
Expand Down

0 comments on commit 0f602d1

Please sign in to comment.