Skip to content

Commit c34032f

Browse files
kdinevkdinev
committed
Updating the repo to use latest version of deps.
1 parent 5854615 commit c34032f

File tree

6 files changed

+1976
-104
lines changed

6 files changed

+1976
-104
lines changed

‎bower.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"name": "igniteui-angular",
33
"description": "IgniteUI controls for AngularJS",
4-
"version": "0.0.0",
4+
"version": "1.0.0",
55
"homepage": "http://igniteui.com",
66
"dependencies": {
7-
"angular": "1.4.x",
8-
"angular-route": "1.2.x",
9-
"angular-loader": "1.2.x",
10-
"angular-mocks": "~1.2.x",
11-
"html5-boilerplate": "~4.3.0"
7+
"angular": "",
8+
"angular-route": "",
9+
"angular-loader": "",
10+
"angular-mocks": "",
11+
"html5-boilerplate": ""
1212
}
1313
}

‎package.json‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22
"name": "igniteui-angular",
33
"dependencies": {},
44
"devDependencies": {
5-
"grunt": "~0.4.1",
6-
"grunt-contrib-jshint": "~0.6.4",
7-
"grunt-contrib-concat": "~0.1.2",
8-
"grunt-contrib-uglify": "~0.2.4",
9-
"grunt-contrib-watch": "~0.5.3",
10-
"grunt-contrib-requirejs": "~0.4.1",
11-
"jshint-stylish": "~0.1.5",
12-
"karma": "~0.10",
13-
"protractor": "~0.20.1",
14-
"http-server": "^0.6.1",
15-
"bower": "^1.3.1",
16-
"shelljs": "^0.2.6",
17-
"karma-junit-reporter": "^0.2.2"
5+
"grunt": "",
6+
"grunt-contrib-jshint": "",
7+
"grunt-contrib-concat": "",
8+
"grunt-contrib-uglify": "",
9+
"grunt-contrib-watch": "",
10+
"grunt-contrib-requirejs": "",
11+
"jshint-stylish": "",
12+
"karma": "",
13+
"protractor": "",
14+
"http-server": "",
15+
"bower": "",
16+
"shelljs": "",
17+
"karma-junit-reporter": ""
1818
},
1919
"scripts": {
2020
"postinstall": "bower install",

‎samples/igGrid.html‎

Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,11 @@
44
<title>igGrid: The Basics - Ignite UI integration with AngularJS</title>
55
<meta charset="utf-8">
66
<meta name="viewport" content="width=device-width, initial-scale=1">
7-
<link type="text/css" href="http://cdn-na.infragistics.com/igniteui/latest/css/themes/infragistics/infragistics.theme.css" rel="stylesheet" />
8-
<link type="text/css" href="http://cdn-na.infragistics.com/igniteui/latest/css/structure/modules/infragistics.ui.shared.css" rel="stylesheet" />
97
<link rel="stylesheet" href="http://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" type="text/css" />
108
<link rel="stylesheet" href="http://netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.min.css" type="text/css" />
9+
<link href="http://cdn-na.infragistics.com/igniteui/latest/css/themes/bootstrap/infragistics.theme.css" rel="stylesheet" type="text/css" />
10+
<link href="http://cdn-na.infragistics.com/igniteui/latest/css/structure/infragistics.css" rel="stylesheet" type="text/css" />
1111
<link rel="stylesheet" href="/igniteui-angular/samples/sample.css" />
12-
13-
<link type="text/css" href="//cdn-na.infragistics.com/igniteui/latest/css/structure/modules/infragistics.ui.grid.css" rel="stylesheet" />
14-
<link type="text/css" href="//cdn-na.infragistics.com/igniteui/latest/css/structure/modules/infragistics.ui.editors.css" rel="stylesheet" />
1512

1613
</head>
1714
<body class="container">
@@ -147,21 +144,11 @@ <h3>Add Product</h3>
147144
<script src="http://netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
148145
<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.2.3/angular.min.js"></script>
149146

150-
<script src="//cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.util.js"></script>
151-
<script src="//cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.datasource.js"></script>
152-
<script src="//cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.ui.shared.js"></script>
153-
<script src="//cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.ui.grid.framework.js"></script>
154-
<script src="//cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.ui.editors.js"></script>
155-
<script src="//cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.ui.grid.updating.js"></script>
156-
<script src="//cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.ui.grid.sorting.js"></script>
157-
<script src="//cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.ui.grid.paging.js"></script>
158-
<script src="//cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.ui.popover.js"></script>
159-
<script src="//cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.ui.grid.featurechooser.js"></script>
160-
<script src="//cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.ui.grid.filtering.js"></script>
161-
<script src="//cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.templating.js"></script>
162-
<script src="../src/igniteui-angular.js"></script>
163-
<script src="js/igniteui-sample.js"></script>
164-
<script src="js/data/northwind.js"></script>
147+
<script src="http://cdn-na.infragistics.com/igniteui/latest/js/infragistics.core.js"></script>
148+
<script src="http://cdn-na.infragistics.com/igniteui/latest/js/infragistics.lob.js"></script>
149+
<script src="../src/igniteui-angular.js"></script>
150+
<script src="js/igniteui-sample.js"></script>
151+
<script src="js/data/northwind.js"></script>
165152

166153
</body>
167154
</html>

‎test/app/index.html‎

Lines changed: 4 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,8 @@
55
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
66
<title>Jasmine Spec Runner v2.0.0</title>
77

8-
<link type="text/css" href="//cdn-na.infragistics.com/igniteui/latest/css/themes/infragistics/infragistics.theme.css" rel="stylesheet" />
9-
<link type="text/css" href="//cdn-na.infragistics.com/igniteui/latest/css/structure/modules/infragistics.ui.shared.css" rel="stylesheet" />
10-
<link type="text/css" href="//cdn-na.infragistics.com/igniteui/latest/css/structure/modules/infragistics.ui.grid.css" rel="stylesheet" />
11-
<link type="text/css" href="//cdn-na.infragistics.com/igniteui/latest/css/structure/modules/infragistics.ui.editors.css" rel="stylesheet" />
12-
<link type="text/css" href="//cdn-na.infragistics.com/igniteui/latest/css/structure/modules/infragistics.ui.tree.css" rel="stylesheet" />
13-
<link type="text/css" href="//cdn-na.infragistics.com/igniteui/latest/css/structure/modules/infragistics.ui.popover.css" rel="stylesheet" />
14-
<link type="text/css" href="//cdn-na.infragistics.com/igniteui/latest/css/structure/modules/infragistics.ui.validator.css" rel="stylesheet" />
15-
<link type="text/css" href="//cdn-na.infragistics.com/igniteui/latest/css/structure/modules/infragistics.ui.combo.css" rel="stylesheet" />
16-
<link type="text/css" href="//cdn-na.infragistics.com/igniteui/latest/css/structure/modules/infragistics.ui.htmleditor.css" rel="stylesheet" />
17-
<link type="text/css" href="//cdn-na.infragistics.com/igniteui/latest/css/structure/modules/infragistics.ui.toolbar.css" rel="stylesheet" />
18-
<link type="text/css" href="//cdn-na.infragistics.com/igniteui/latest/css/structure/modules/infragistics.ui.toolbarbutton.css" rel="stylesheet" />
19-
<link type="text/css" href="//cdn-na.infragistics.com/igniteui/latest/css/structure/modules/infragistics.ui.splitbutton.css" rel="stylesheet" />
20-
<link type="text/css" href="//cdn-na.infragistics.com/igniteui/latest/css/structure/modules/infragistics.ui.colorpicker.css" rel="stylesheet" />
8+
<link href="http://cdn-na.infragistics.com/igniteui/latest/css/themes/bootstrap/infragistics.theme.css” rel="stylesheet" type="text/css" />
9+
<link href="http://cdn-na.infragistics.com/igniteui/latest/css/structure/infragistics.css" rel="stylesheet" type="text/css" />
2110

2211
</head>
2312

@@ -150,33 +139,8 @@ <h1>igEditors</h1>
150139
<script src="../../bower_components/angular/angular.js"></script>
151140
<script src="../../bower_components/angular-route/angular-route.js"></script>
152141

153-
<script type="text/javascript" src="//cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.util.js"></script>
154-
<script type="text/javascript" src="//cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.datasource.js"></script>
155-
<script type="text/javascript" src="//cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.ui.shared.js"></script>
156-
<script type="text/javascript" src="//cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.ui.grid.framework.js"></script>
157-
<script type="text/javascript" src="//cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.ui.grid.shared.js"></script>
158-
<script type="text/javascript" src="//cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.ui.editors.js"></script>
159-
<script type="text/javascript" src="//cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.ui.grid.updating.js"></script>
160-
<script type="text/javascript" src="//cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.ui.grid.sorting.js"></script>
161-
<script type="text/javascript" src="//cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.ui.grid.selection.js"></script>
162-
<script type="text/javascript" src="//cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.ui.grid.rowselectors.js"></script>
163-
<script type="text/javascript" src="//cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.ui.popover.js"></script>
164-
<script type="text/javascript" src="//cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.ui.grid.featurechooser.js"></script>
165-
<script type="text/javascript" src="//cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.ui.grid.filtering.js"></script>
166-
<script type="text/javascript" src="//cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.ui.grid.groupby.js"></script>
167-
<script type="text/javascript" src="//cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.ui.grid.columnmoving.js"></script>
168-
<script type="text/javascript" src="//cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.ui.grid.hiding.js"></script>
169-
<script type="text/javascript" src="//cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.ui.grid.paging.js"></script>
170-
<script type="text/javascript" src="//cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.templating.js"></script>
171-
<script type="text/javascript" src="//cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.ui.tree.js"></script>
172-
<script type="text/javascript" src="//cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.ui.combo.js"></script>
173-
<script type="text/javascript" src="//cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.ui.validator.js"></script>
174-
<script type="text/javascript" src="//cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.ui.toolbarbutton.js"></script>
175-
<script type="text/javascript" src="//cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.ui.toolbar.js"></script>
176-
<script type="text/javascript" src="//cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.ui.splitbutton.js"></script>
177-
<script type="text/javascript" src="//cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.ui.colorpicker.js"></script>
178-
<script type="text/javascript" src="//cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.ui.colorpickersplitbutton.js"></script>
179-
<script type="text/javascript" src="//cdn-na.infragistics.com/igniteui/latest/js/modules/infragistics.ui.htmleditor.js"></script>
142+
<script src="http://cdn-na.infragistics.com/igniteui/latest/js/infragistics.core.js"></script>
143+
<script src="http://cdn-na.infragistics.com/igniteui/latest/js/infragistics.lob.js"></script>
180144
<script type="text/javascript" src="../../src/igniteui-angular.js"></script>
181145
<script type="text/javascript" src="js/my-app-utils.js"></script>
182146
<script type="text/javascript" src="js/my-app.js"></script>

‎test/app/js/my-app.js‎

Lines changed: 1942 additions & 16 deletions
Large diffs are not rendered by default.

‎test/karma.conf.js‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ module.exports = function(config){
44
basePath : '../',
55

66
files : [
7-
'http://code.jquery.com/jquery-1.10.2.min.js',
7+
'http://code.jquery.com/jquery-1.10.2.min.js',
88
'http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.4/jquery-ui.min.js',
99
'bower_components/angular/angular.js',
1010
'bower_components/angular-route/angular-route.js',
1111
'bower_components/angular-mocks/angular-mocks.js',
12-
'http://cdn-na.infragistics.com/igniteui/latest/js/infragistics.core.js',
12+
'http://cdn-na.infragistics.com/igniteui/latest/js/infragistics.core.js',
1313
'http://cdn-na.infragistics.com/igniteui/latest/js/infragistics.dv.js',
1414
'http://cdn-na.infragistics.com/igniteui/latest/js/infragistics.lob.js',
1515
'src/igniteui-angular.js',
16-
'test/app/js/my-app.js',
16+
'test/app/js/my-app.js',
1717
'test/unit/**/*.js'
1818
],
1919

@@ -23,12 +23,7 @@ module.exports = function(config){
2323

2424
browsers : ['Chrome'],
2525

26-
plugins : [
27-
'karma-chrome-launcher',
28-
'karma-firefox-launcher',
29-
'karma-jasmine',
30-
'karma-junit-reporter'
31-
],
26+
plugins : [ 'karma-chrome-launcher', 'karma-firefox-launcher', 'karma-jasmine', 'karma-junit-reporter' ],
3227

3328
junitReporter : {
3429
outputFile: 'test_out/unit.xml',

0 commit comments

Comments
 (0)