freifunk/hopglass
8
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

drop chartjs

Browse source
This commit is contained in:
Nils Schneider 2015-03-30 21:02:18 +02:00
parent 1f8cb5203e
commit af3d22e4c2
3 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app.js
View file

@ -7,7 +7,6 @@ require.config({
"moment": "../bower_components/moment/min/moment-with-locales.min", "moment": "../bower_components/moment/min/moment-with-locales.min",
"tablesort": "../bower_components/tablesort/tablesort.min", "tablesort": "../bower_components/tablesort/tablesort.min",
"tablesort.numeric": "../bower_components/tablesort/src/sorts/tablesort.numeric", "tablesort.numeric": "../bower_components/tablesort/src/sorts/tablesort.numeric",
"chartjs": "../bower_components/chartjs/Chart",
"helper": "../helper" "helper": "../helper"
}, },
shim: { shim: {

3
bower.json
View file

@ -19,8 +19,7 @@
"roboto-slab-fontface": "*", "roboto-slab-fontface": "*",
"es6-shim": "~0.27.1", "es6-shim": "~0.27.1",
"almond": "~0.3.1", "almond": "~0.3.1",
"r.js": "~2.1.16", "r.js": "~2.1.16"
"chartjs": "~1.0.2"
}, },
"authors": [ "authors": [
"Nils Schneider <nils@nilsschneider.net>" "Nils Schneider <nils@nilsschneider.net>"

2
lib/proportions.js
View file

@ -1,4 +1,4 @@
define(["chartjs", "chroma-js"], function (ChartJS, Chroma) { define(["chroma-js"], function (Chroma) {
return function () { return function () {
var self = this var self = this
var fwTable, hwTable, autoTable, gwTable var fwTable, hwTable, autoTable, gwTable