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..d3d2e53 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,19 @@ 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.0" + - JQUERY="~> 1.9.0" RAPHAEL="~> 2.0.0" + - JQUERY="~> 2.0.0" RAPHAEL="~> 2.0.0" + - JQUERY="~> 2.1.0" RAPHAEL="~> 2.0.0" + - JQUERY="~> 1.8.0" RAPHAEL="~> 2.1.0" + - JQUERY="~> 1.9.0" RAPHAEL="~> 2.1.0" + - JQUERY="~> 2.0.0" RAPHAEL="~> 2.1.0" + - JQUERY="~> 2.1.0" RAPHAEL="~> 2.1.0" 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..625c45b 100644 --- a/examples/_template.html +++ b/examples/_template.html @@ -1,12 +1,12 @@
- - + + - + - +