Skip to content

Commit fa8b01b

Browse files
authored
Merge pull request #38 from bitovi-components/dev/loosen-deps
Removed unnecessary jQuery dep. Loosened dev deps. Also switched to yarn and updated travis config.
2 parents da0296b + 7b7ef6d commit fa8b01b

File tree

5 files changed

+4682
-10
lines changed

5 files changed

+4682
-10
lines changed

.travis.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,7 @@ script: npm test
33
before_install:
44
- "export DISPLAY=:99.0"
55
- "sh -e /etc/init.d/xvfb start"
6-
node_js:
7-
- "0.10"
6+
node_js: 7.3
7+
cache: yarn
8+
addons:
9+
firefox: "51.0"

package.json

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,16 @@
3636
"can-view-autorender": "^3.0.4",
3737
"can-view-model": "^3.1.3",
3838
"cssify": "0.6.0",
39-
"d3": "^3.5.17",
40-
"jquery": "~2.1.4"
39+
"d3": "^3.5.17"
4140
},
4241
"devDependencies": {
43-
"documentjs": "git://github.com/bitovi/documentjs#master",
4442
"funcunit": "^3.0.0",
4543
"semistandard": "^10.0.0",
46-
"steal": "1.3.2",
44+
"steal": "^1.3.2",
4745
"steal-less": "^1.2.0",
48-
"steal-qunit": "1.0.1",
46+
"steal-qunit": "^1.0.1",
4947
"steal-stache": "^3.0.5",
50-
"steal-tools": "1.2.0",
48+
"steal-tools": "^1.2.0",
5149
"testee": "^0.3.1"
5250
},
5351
"steal": {

src/data/column/column.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ Component.extend({
6060
},
6161
removed: function() {
6262
// check if the chart was not destroyed:
63-
if (canViewModel(this.element.parentElement).chart){
63+
if (this.element.parentElement && canViewModel(this.element.parentElement).chart){
6464
this.viewModel.unloadColumn();
6565
}
6666
},

src/data/data.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import Component from "can-component";
22
import DataVM from './viewmodel';
3-
import $ from 'jquery';
43
import canViewModel from 'can-view-model';
54

65
/**

0 commit comments

Comments
 (0)