Skip to content
This repository was archived by the owner on Sep 8, 2020. It is now read-only.

Commit 63b2ba7

Browse files
author
Dean Sofer
committed
Corrected jQuery dependency version
1 parent 737ed24 commit 63b2ba7

File tree

5 files changed

+7
-12
lines changed

5 files changed

+7
-12
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
node_modules
2-
.idea
32
components

.travis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
before_install:
66
- export DISPLAY=:99.0
77
- sh -e /etc/init.d/xvfb start
8-
- npm install -g testacular@0.4.x
9-
- npm install -g bower
8+
- npm install -g testacular@0.4.x bower
109
- bower install
1110

1211
script: "testacular start test/test.conf.js --browsers=Firefox,PhantomJS"

component.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@
88
"angularui",
99
"select2"
1010
],
11-
"main": "./ui-select2.js",
11+
"main": "./src/select2.js",
1212
"dependencies": {
1313
"angular": ">= 1.0.2",
14-
"select2": "~3.3.1"
14+
"select2": "~3.3.1",
15+
"jquery": ">=1.6.4"
1516
},
1617
"devDependencies": {
1718
"angular-mocks": ">= 1.0.2"
File renamed without changes.

test/test.conf.js

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,12 @@ files = [
55
JASMINE_ADAPTER,
66
'components/jquery/jquery.js',
77
'components/angular/angular.js',
8-
'components/*/*.js',
9-
'*.js',
8+
'components/angular-mocks/angular-mocks.js',
9+
'components/select2/select2.js',
10+
'src/select2.js',
1011
'test/*Spec.js'
1112
];
1213

13-
// Avoid including minified version of angular and other libs again
14-
exclude = [
15-
'components/*/*.min.js'
16-
];
17-
1814
singleRun = true;
1915

2016
reporters = [

0 commit comments

Comments
 (0)