Skip to content

Commit

Permalink
Merge pull request #180 from jboron/master
Browse files Browse the repository at this point in the history
Promise - Replace the deprecated $http.success by $http.then
  • Loading branch information
Johannes Skov Frandsen committed Jan 20, 2017
2 parents e08ff31 + 467bb46 commit a9f0c24
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 16 deletions.
10 changes: 5 additions & 5 deletions app/scripts/controllers/archives.js
Expand Up @@ -12,9 +12,9 @@ angular.module('VisualPHPUnit').controller('ArchivesCtrl',
url : Vpu.getBackend() + '/archives'
};
var responsePromise = $http(config);
responsePromise.success(function(data) {
responsePromise.then(function(response) {
$('#archives').treeview({
data : data,
data : response.data,
levels : 1,
showTags : false,
multiSelect : false,
Expand All @@ -31,9 +31,9 @@ angular.module('VisualPHPUnit').controller('ArchivesCtrl',
url : Vpu.getBackend() + '/suite/' + id
};
var responsePromise = $http(config);
responsePromise.success(function(data) {
if (data !== 'nosuite') {
Vpu.renderSuite("#suite", data);
responsePromise.then(function(response) {
if (response.data !== 'nosuite') {
Vpu.renderSuite("#suite", response.data);
}
Vpu.applyStatusFilter();
});
Expand Down
4 changes: 2 additions & 2 deletions app/scripts/controllers/graph.js
Expand Up @@ -70,9 +70,9 @@ angular.module('VisualPHPUnit').controller('GraphCtrl', function($scope, $http)
url : Vpu.getBackend() +'/graph/' + timeframe + '/' + start + '/' + end
};
var responsePromise = $http(config);
responsePromise.success(function(data) {
responsePromise.then(function(response) {

var forgraph = prepareData(data);
var forgraph = prepareData(response.data);

var graphdata = {
labels : forgraph['label'],
Expand Down
17 changes: 8 additions & 9 deletions app/scripts/controllers/main.js
Expand Up @@ -11,9 +11,9 @@ angular.module('VisualPHPUnit').controller('MainCtrl', function($scope, $http) {
url : Vpu.getBackend() + '/tests'
};
var responsePromise = $http(config);
responsePromise.success(function(data) {
responsePromise.then(function(response) {
$('#tree').treeview({
data : data,
data : response.data,
levels : 1,
showTags : true,
multiSelect : true,
Expand Down Expand Up @@ -41,20 +41,19 @@ angular.module('VisualPHPUnit').controller('MainCtrl', function($scope, $http) {
data : request
};
var responsePromise = $http(config);
responsePromise.success(function(data) {
var result = data[0];
if (data != 'nofiles') {
responsePromise.then(function(response) {
var result = response.data[0];
if (response.data != 'nofiles') {
Vpu.renderSuite("#result", result);
}
});
});

});

responsePromise.error(function(data) {
},function(response) {
console.log('failur');
console.log(data);
console.log(response.data);
});


Vpu.addFilterEvents();
});

0 comments on commit a9f0c24

Please sign in to comment.