Skip to content

Commit 4098aff

Browse files
committed
chore(dep) Keep in step with forms-angular version numbers
1 parent 36fb69b commit 4098aff

5 files changed

Lines changed: 41 additions & 40 deletions

File tree

bower.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "fng-reports",
3-
"version": "0.7.0",
3+
"version": "0.8.1",
44
"author": "Mark Chapman <support@forms-angular.org>",
55
"description": "Angular UI reporting plugin for forms-angular",
66
"main": [
@@ -12,13 +12,13 @@
1212
"license": "MIT",
1313
"homepage": "www.forms-angular.org",
1414
"dependencies": {
15-
"jquery": ">=1.8",
16-
"ng-grid": "2.0.7",
17-
"jspdf": "1.0.272"
15+
"jquery": "3.1.1",
16+
"ng-grid": "4.0.2",
17+
"jspdf": "1.3.2"
1818
},
1919
"devDependencies": {
20-
"angular-mocks": "~1.5",
21-
"forms-angular": "^0.7.0"
20+
"angular-mocks": "1.6.1",
21+
"forms-angular": "*"
2222
},
2323
"ignore": [
2424
"**/.*",

dist/fng-reports.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! forms-angular 2016-05-18 */
1+
/*! forms-angular 2017-02-06 */
22
'use strict';
33

44
formsAngular.controller('AnalysisCtrl', ['$filter', '$scope', '$http', '$location', 'cssFrameworkService', 'routingService',
@@ -160,7 +160,8 @@ formsAngular.controller('AnalysisCtrl', ['$filter', '$scope', '$http', '$locatio
160160
apiCall += connector + query[0].slice(1);
161161
}
162162
}
163-
$http.get(apiCall).success(function (data) {
163+
$http.get(apiCall).then(function (response) {
164+
var data = response.data;
164165
if (data.success) {
165166
$scope.report = data.report;
166167
$scope.reportSchema = data.schema;
@@ -238,8 +239,8 @@ formsAngular.controller('AnalysisCtrl', ['$filter', '$scope', '$http', '$locatio
238239
console.log(JSON.stringify(data));
239240
$scope.reportSchema.title = 'Error - see console log';
240241
}
241-
}).error(function (err) {
242-
console.log(JSON.stringify(err));
242+
}, function (response) {
243+
console.log(JSON.stringify(response));
243244
$location.path('/404');
244245
});
245246
};

dist/fng-reports.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"name": "fng-reports",
3-
"version": "0.7.0",
4-
"private": "true",
3+
"version": "0.8.1",
54
"description": "Reporting plugin for forms-angular",
65
"repository": {
76
"type": "git",
@@ -19,30 +18,30 @@
1918
"url": "https://github.com/forms-angular/fng-reports/issues"
2019
},
2120
"peerDependencies": {
22-
"forms-angular": "0.7.0"
21+
"forms-angular": "*"
2322
},
2423
"devDependencies": {
25-
"grunt": "~0.4.5",
26-
"grunt-autoprefixer": "~0.4.0",
27-
"grunt-bower-task": "^0.3.4",
28-
"grunt-concurrent": "~0.5",
29-
"grunt-contrib-clean": "0.5.0",
30-
"grunt-contrib-concat": "~0.3.0",
31-
"grunt-contrib-copy": "~0.5",
32-
"grunt-contrib-jshint": "~0.9",
33-
"grunt-contrib-uglify": "~0.4",
34-
"grunt-contrib-watch": "*",
35-
"grunt-karma": "^0.8.3",
36-
"grunt-newer": "^0.7.0",
37-
"grunt-ng-annotate": "*",
38-
"grunt-rev": "~0.1.0",
39-
"grunt-usemin": "^2.1.0",
40-
"jasmine-core": "^2.3.4",
41-
"karma": "^0.12.17",
42-
"karma-jasmine": "^0.3.6",
43-
"karma-junit-reporter": "^0.3.7",
44-
"karma-phantomjs-launcher": "^0.2.1",
45-
"matchdep": "~0.3",
46-
"phantomjs": "^1.9.18"
24+
"grunt": "1.0.1",
25+
"grunt-autoprefixer": "3.0.4",
26+
"grunt-bower-task": "0.4.0",
27+
"grunt-concurrent": "2.3.1",
28+
"grunt-contrib-clean": "1.0.0",
29+
"grunt-contrib-concat": "1.0.1",
30+
"grunt-contrib-copy": "1.0.0",
31+
"grunt-contrib-jshint": "1.1.0",
32+
"grunt-contrib-uglify": "2.0.0",
33+
"grunt-contrib-watch": "1.0.0",
34+
"grunt-karma": "2.0.0",
35+
"grunt-newer": "1.2.0",
36+
"grunt-ng-annotate": "3.0.0",
37+
"grunt-rev": "0.1.0",
38+
"grunt-usemin": "3.1.1",
39+
"jasmine-core": "2.5.2",
40+
"karma": "1.4.1",
41+
"karma-jasmine": "1.1.0",
42+
"karma-junit-reporter": "1.2.0",
43+
"karma-phantomjs-launcher": "1.0.2",
44+
"matchdep": "1.0.1",
45+
"phantomjs-prebuilt": "2.1.14"
4746
}
4847
}

src/fng-reports.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,8 @@ formsAngular.controller('AnalysisCtrl', ['$filter', '$scope', '$http', '$locatio
159159
apiCall += connector + query[0].slice(1);
160160
}
161161
}
162-
$http.get(apiCall).success(function (data) {
162+
$http.get(apiCall).then(function (response) {
163+
var data = response.data;
163164
if (data.success) {
164165
$scope.report = data.report;
165166
$scope.reportSchema = data.schema;
@@ -237,8 +238,8 @@ formsAngular.controller('AnalysisCtrl', ['$filter', '$scope', '$http', '$locatio
237238
console.log(JSON.stringify(data));
238239
$scope.reportSchema.title = 'Error - see console log';
239240
}
240-
}).error(function (err) {
241-
console.log(JSON.stringify(err));
241+
}, function (response) {
242+
console.log(JSON.stringify(response));
242243
$location.path('/404');
243244
});
244245
};

0 commit comments

Comments
 (0)