Skip to content

Commit f1f6c7b

Browse files
committed
Commit formatting changes
1 parent 8ba64a2 commit f1f6c7b

File tree

6 files changed

+14
-28
lines changed

6 files changed

+14
-28
lines changed

package.json

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,12 @@
1717
"@angular/router": "^5.0.1",
1818
"@angular/upgrade": "^5.0.1",
1919
"angular-in-memory-web-api": "~0.3.0",
20-
2120
"core-js": "^2.4.1",
2221
"systemjs": "0.19.40",
2322
"es6-shim": "^0.35.0",
2423
"reflect-metadata": "^0.1.3",
2524
"rxjs": "^5.5.0",
2625
"zone.js": "^0.8.4",
27-
2826
"bootstrap": "^3.3.6"
2927
},
3028
"devDependencies": {
@@ -44,31 +42,27 @@
4442
"traceur": "^0.0.111",
4543
"@types/node": "^6.0.46",
4644
"@types/jasmine": "^2.5.36",
47-
"@types/reflect-metadata": "^0.0.5",
48-
"@types/ignite-ui": "^0.0.4",
49-
"@types/jquery": "2.0.47",
50-
"rollup": "^0.52.1",
51-
"rollup-plugin-node-resolve": "^3.0.0",
52-
"rollup-plugin-commonjs": "^8.2.6",
53-
"rollup-plugin-angular": "^0.5.3",
45+
"@types/reflect-metadata": "^0.0.5",
46+
"@types/ignite-ui": "^0.0.4",
47+
"@types/jquery": "2.0.47",
48+
"rollup": "^0.52.1",
49+
"rollup-plugin-node-resolve": "^3.0.0",
50+
"rollup-plugin-commonjs": "^8.2.6",
51+
"rollup-plugin-angular": "^0.5.3",
5452
"rollup-plugin-typescript": "^0.8.1"
5553
},
5654
"scripts": {
5755
"postinstall": "npm prune",
58-
5956
"start": "npm run lite",
6057
"lite": "lite-server",
61-
6258
"watch": "node node_modules/typescript/bin/tsc -w",
6359
"build": "node node_modules/typescript/bin/tsc -p tsconfig.json",
6460
"build-aot": "ngc -p tsconfig-aot.json",
6561
"build-aot-samples": "ngc -p tsconfig-aot-samples.json",
6662
"bundle": "npm run build-aot && npm run prepare-dist",
67-
"prepare-dist": "rollup -c rollup.config.umd.js",
68-
63+
"prepare-dist": "rollup -c rollup.config.umd.js",
6964
"pretest": "npm run bundle && npm run build",
7065
"test": "karma start tests/karma.conf.js && npm run remap-istanbul",
71-
7266
"remap-istanbul": "npm run copy-coverage-report && npm run remap-istanbul-html && npm run remap-istanbul-lcov",
7367
"remap-istanbul-html": "remap-istanbul -i coverage/karma-tmp/coverage.json -o coverage/html-report -t html",
7468
"remap-istanbul-lcov": "remap-istanbul -i coverage/karma-tmp/coverage.json -o coverage/lcov.info -t lcovonly",

tests/unit/igcombo/combo.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ export function main() {
181181
});
182182

183183
it('should initialize correctly when datasource is remote', (done) => {
184-
$.mockjax({
184+
$['mockjax']({
185185
url: "myURL/Northwind",
186186
contentType: 'application/json',
187187
dataType: 'json',

tests/unit/iggrid/grid.spec.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -706,11 +706,8 @@ export function main() {
706706
done();
707707
});
708708
});
709-
});
710-
}
711-
});
712709
it('should initialize correctly when datasource is remote', (done) => {
713-
$.mockjax({
710+
$['mockjax']({
714711
url: "myURL/employees",
715712
contentType: 'application/json',
716713
dataType: 'json',

tests/unit/ighierarchicalgrid/hierarchicalgrid.spec.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ export function main() {
211211
});
212212

213213
it('should initialize correctly when datasource is remote', (done) => {
214-
$.mockjax({
214+
$['mockjax']({
215215
url: "myURL/Categories",
216216
contentType: 'application/json',
217217
dataType: 'json',
@@ -233,10 +233,6 @@ export function main() {
233233
}, 500);
234234
});
235235
});
236-
});
237-
});
238-
});
239-
240236
it("should detect changes when original data source is changed but the data source length is the same.", (done) => {
241237
var template = '<ig-hierarchical-grid [(widgetId)]="gridID" [(options)]="optsNew"></ig-hierarchical-grid>';
242238
TestBed.overrideComponent(TestComponent, {

tests/unit/igtree/igtree.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ export function main() {
8181
});
8282

8383
it('should initialize correctly when datasource is remote', (done) => {
84-
$.mockjax({
84+
$['mockjax']({
8585
url: "myURL/ProductCategories",
8686
contentType: 'application/json',
8787
dataType: 'json',

tests/unit/igtreegrid/treegrid.spec.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ export function main() {
140140
});
141141

142142
it('should initialize correctly when datasource is remote', (done) => {
143-
$.mockjax({
143+
$['mockjax']({
144144
url: "myURL/Categories",
145145
contentType: 'application/json',
146146
dataType: 'json',
@@ -160,7 +160,7 @@ export function main() {
160160
done();
161161
});
162162
});
163-
});
163+
164164

165165
it("should detect changes when original data source is changed but the data source length is the same.", (done) => {
166166
var template = '<ig-tree-grid [(widgetId)]="gridID" [(options)]="optsNew"></ig-tree-grid>';
@@ -182,7 +182,6 @@ export function main() {
182182
});
183183
});
184184
}
185-
186185
@Component({
187186
selector: 'test-cmp',
188187
template: '<div></div>' //"Component 'TestComponent' must have either 'template' or 'templateUrl' set."

0 commit comments

Comments
 (0)