From af3d22e4c2e19da5820d818d242ad2435bd266a4 Mon Sep 17 00:00:00 2001
From: Nils Schneider <nils@nilsschneider.net>
Date: Mon, 30 Mar 2015 21:02:18 +0200
Subject: [PATCH] drop chartjs
---
app.js | 1 -
bower.json | 3 +--
lib/proportions.js | 2 +-
3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/app.js b/app.js
index b60fa0b..88f666b 100644
--- a/app.js
+++ b/app.js
@@ -7,7 +7,6 @@ require.config({
"moment": "../bower_components/moment/min/moment-with-locales.min",
"tablesort": "../bower_components/tablesort/tablesort.min",
"tablesort.numeric": "../bower_components/tablesort/src/sorts/tablesort.numeric",
- "chartjs": "../bower_components/chartjs/Chart",
"helper": "../helper"
},
shim: {
diff --git a/bower.json b/bower.json
index 238b124..0c3b47e 100644
--- a/bower.json
+++ b/bower.json
@@ -19,8 +19,7 @@
"roboto-slab-fontface": "*",
"es6-shim": "~0.27.1",
"almond": "~0.3.1",
- "r.js": "~2.1.16",
- "chartjs": "~1.0.2"
+ "r.js": "~2.1.16"
},
"authors": [
"Nils Schneider <nils@nilsschneider.net>"
diff --git a/lib/proportions.js b/lib/proportions.js
index 38258cf..569f2f6 100644
--- a/lib/proportions.js
+++ b/lib/proportions.js
@@ -1,4 +1,4 @@
-define(["chartjs", "chroma-js"], function (ChartJS, Chroma) {
+define(["chroma-js"], function (Chroma) {
return function () {
var self = this
var fwTable, hwTable, autoTable, gwTable
--
GitLab