diff --git a/.gitignore b/.gitignore index 8b65304..7f83be5 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ build/ node_modules/ spec/viz/output/ spec/viz/diff/ +bower_components +.idea diff --git a/.travis.yml b/.travis.yml index d00185a..e1384da 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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" diff --git a/bower.json b/bower.json new file mode 100644 index 0000000..a2dbfea --- /dev/null +++ b/bower.json @@ -0,0 +1,20 @@ +{ + "name": "morris.js", + "version": "0.5.0", + "main": [ + "./morris.js", + "./morris.css" + ], + "dependencies": { + "jquery": ">= 2.1.0", + "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" + } +} diff --git a/bower.travis.json b/bower.travis.json new file mode 100644 index 0000000..2a86ece --- /dev/null +++ b/bower.travis.json @@ -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" + } +} diff --git a/component.json b/component.json deleted file mode 100644 index 32a3008..0000000 --- a/component.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name": "morris.js", - "version": "0.5.0", - "main": ["./morris.js", "./morris.css"], - "dependencies": { - "jquery": ">= 1.7.2", - "raphael": ">= 2.0" - } -} diff --git a/examples/_template.html b/examples/_template.html index 564ce40..a214540 100644 --- a/examples/_template.html +++ b/examples/_template.html @@ -1,7 +1,7 @@ - - + + diff --git a/examples/area-as-line.html b/examples/area-as-line.html index 7b9e61b..eae6336 100644 --- a/examples/area-as-line.html +++ b/examples/area-as-line.html @@ -1,7 +1,7 @@ - - + + diff --git a/examples/area.html b/examples/area.html index 21987be..20f48d4 100644 --- a/examples/area.html +++ b/examples/area.html @@ -1,7 +1,7 @@ - - + + diff --git a/examples/bar-colors.html b/examples/bar-colors.html index dd4218b..d10f0a0 100644 --- a/examples/bar-colors.html +++ b/examples/bar-colors.html @@ -1,7 +1,7 @@ - - + + diff --git a/examples/bar-no-axes.html b/examples/bar-no-axes.html index 738ff41..aa597cb 100644 --- a/examples/bar-no-axes.html +++ b/examples/bar-no-axes.html @@ -1,7 +1,7 @@ - - + + diff --git a/examples/bar.html b/examples/bar.html index f331dc8..a46a004 100644 --- a/examples/bar.html +++ b/examples/bar.html @@ -1,7 +1,7 @@ - - + + diff --git a/examples/days.html b/examples/days.html index 2df15b9..91a139a 100644 --- a/examples/days.html +++ b/examples/days.html @@ -1,7 +1,7 @@ - - + + diff --git a/examples/decimal-custom-hover.html b/examples/decimal-custom-hover.html index 31521c4..c8af4a8 100644 --- a/examples/decimal-custom-hover.html +++ b/examples/decimal-custom-hover.html @@ -1,7 +1,7 @@ - - + + diff --git a/examples/diagonal-xlabels-bar.html b/examples/diagonal-xlabels-bar.html index 7f62f0f..cf2393a 100644 --- a/examples/diagonal-xlabels-bar.html +++ b/examples/diagonal-xlabels-bar.html @@ -1,7 +1,7 @@ - - + + diff --git a/examples/diagonal-xlabels.html b/examples/diagonal-xlabels.html index 3354cc0..c23d910 100644 --- a/examples/diagonal-xlabels.html +++ b/examples/diagonal-xlabels.html @@ -1,7 +1,7 @@ - - + + diff --git a/examples/donut-colors.html b/examples/donut-colors.html index 349d654..aad99f2 100644 --- a/examples/donut-colors.html +++ b/examples/donut-colors.html @@ -1,7 +1,7 @@ - - + + diff --git a/examples/donut-formatter.html b/examples/donut-formatter.html index 652eb07..0ea4010 100644 --- a/examples/donut-formatter.html +++ b/examples/donut-formatter.html @@ -1,7 +1,7 @@ - - + + diff --git a/examples/donut.html b/examples/donut.html index 92cd13d..00eed7b 100644 --- a/examples/donut.html +++ b/examples/donut.html @@ -1,7 +1,7 @@ - - + + diff --git a/examples/dst.html b/examples/dst.html index 29db175..501e9de 100644 --- a/examples/dst.html +++ b/examples/dst.html @@ -1,7 +1,7 @@ - - + + diff --git a/examples/events.html b/examples/events.html index 352a900..1d3d180 100644 --- a/examples/events.html +++ b/examples/events.html @@ -1,7 +1,7 @@ - - + + diff --git a/examples/goals.html b/examples/goals.html index 5d7685c..d9a6fc7 100644 --- a/examples/goals.html +++ b/examples/goals.html @@ -1,7 +1,7 @@ - - + + diff --git a/examples/months-no-smooth.html b/examples/months-no-smooth.html index e78fada..05ea5c1 100644 --- a/examples/months-no-smooth.html +++ b/examples/months-no-smooth.html @@ -1,7 +1,7 @@ - - + + diff --git a/examples/negative.html b/examples/negative.html index d6a22ae..87c6ecd 100644 --- a/examples/negative.html +++ b/examples/negative.html @@ -1,7 +1,7 @@ - - + + diff --git a/examples/no-grid.html b/examples/no-grid.html index 4b139df..f208ccf 100644 --- a/examples/no-grid.html +++ b/examples/no-grid.html @@ -1,7 +1,7 @@ - - + + diff --git a/examples/non-continuous.html b/examples/non-continuous.html index 23285d5..67a06fd 100644 --- a/examples/non-continuous.html +++ b/examples/non-continuous.html @@ -1,7 +1,7 @@ - - + + diff --git a/examples/non-date.html b/examples/non-date.html index 1886142..8a00f6b 100644 --- a/examples/non-date.html +++ b/examples/non-date.html @@ -1,7 +1,7 @@ - - + + diff --git a/examples/quarters.html b/examples/quarters.html index a708a87..e51d9b1 100644 --- a/examples/quarters.html +++ b/examples/quarters.html @@ -1,7 +1,7 @@ - - + + diff --git a/examples/resize.html b/examples/resize.html index 711304d..8109ffd 100644 --- a/examples/resize.html +++ b/examples/resize.html @@ -1,7 +1,7 @@ - - + + diff --git a/examples/stacked_bars.html b/examples/stacked_bars.html index a8bafd0..591d874 100644 --- a/examples/stacked_bars.html +++ b/examples/stacked_bars.html @@ -1,7 +1,7 @@ - - + + diff --git a/examples/timestamps.html b/examples/timestamps.html index ceeea51..de14d5c 100644 --- a/examples/timestamps.html +++ b/examples/timestamps.html @@ -1,7 +1,7 @@ - - + + diff --git a/examples/updating.html b/examples/updating.html index e19147b..41ddef5 100644 --- a/examples/updating.html +++ b/examples/updating.html @@ -1,7 +1,7 @@ - - + + diff --git a/examples/weeks.html b/examples/weeks.html index c5a7ec0..7e9ea32 100644 --- a/examples/weeks.html +++ b/examples/weeks.html @@ -1,7 +1,7 @@ - - + + diff --git a/examples/years.html b/examples/years.html index 6d69022..7dffdaa 100644 --- a/examples/years.html +++ b/examples/years.html @@ -1,7 +1,7 @@ - - + + diff --git a/package.json b/package.json index 5ecaa11..e383f71 100644 --- a/package.json +++ b/package.json @@ -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" diff --git a/spec/specs.html b/spec/specs.html index bfc4f61..83957ec 100644 --- a/spec/specs.html +++ b/spec/specs.html @@ -2,24 +2,21 @@ morris.js tests - + - - + +
- + + + + + - - - - - - diff --git a/spec/viz/test.html b/spec/viz/test.html index d0e6483..1eafbff 100644 --- a/spec/viz/test.html +++ b/spec/viz/test.html @@ -1,7 +1,7 @@ - - + +