Skip to content

Commit 5d91ff2

Browse files
committed
Use npm graphael in analytics
this depends on the the commit that makes it so plugins can have their own package.json (g/111765). and once this is submitted, we can also submit (g/111712) which deletes deletes graphael from canvas's public/javascripts/vendor. refs: CNVS-36895 test plan: * http://c.dev/courses/1/analytics should still work Change-Id: I33647c905534564d9ec9adecb64d4dbedb1963af Reviewed-on: https://gerrit.instructure.com/108509 Tested-by: Jenkins Reviewed-by: Brent Burgoyne <bburgoyne@instructure.com> Product-Review: Ryan Shaw <ryan@instructure.com> QA-Review: Ryan Shaw <ryan@instructure.com>
1 parent f70ab5c commit 5d91ff2

File tree

4 files changed

+27
-10
lines changed

4 files changed

+27
-10
lines changed

.gitignore

+1-9
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,2 @@
1-
tmp/**/*
2-
tmp/*
3-
public/javascripts/jst/*
4-
public/javascripts/compiled/*
5-
public/stylesheets/compiled/*
6-
public/stylesheets/compiled/**/*
7-
public/optimized/
8-
.sass-cache
9-
spec_canvas/javascripts/
101
.DS_Store
2+
node_modules

app/coffeescripts/graphs/base.coffee

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
define [
2-
'vendor/graphael'
2+
'graphael'
33
'jquery.disableWhileLoading'
44
], (graphael) ->
55

package.json

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"name": "analytics",
3+
"dependencies": {
4+
"graphael": "https://github.com/ryankshaw/graphael.git"
5+
}
6+
}

yarn.lock

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
2+
# yarn lockfile v1
3+
4+
5+
eve-raphael@0.5.0:
6+
version "0.5.0"
7+
resolved "https://registry.yarnpkg.com/eve-raphael/-/eve-raphael-0.5.0.tgz#17c754b792beef3fa6684d79cf5a47c63c4cda30"
8+
9+
"graphael@https://github.com/ryankshaw/graphael.git":
10+
version "1.2.0"
11+
resolved "https://github.com/ryankshaw/graphael.git#067542642fa240925e4e3dd13153333ae1d3ad60"
12+
dependencies:
13+
raphael "^2.1.4"
14+
15+
raphael@^2.1.4:
16+
version "2.2.7"
17+
resolved "https://registry.yarnpkg.com/raphael/-/raphael-2.2.7.tgz#231b19141f8d086986d8faceb66f8b562ee2c810"
18+
dependencies:
19+
eve-raphael "0.5.0"

0 commit comments

Comments
 (0)