forked from MirrorHub/synapse
Added extra nesting .data and rename callback to be response not data
This commit is contained in:
parent
db3e1d73c6
commit
24bd133d9d
2 changed files with 31 additions and 31 deletions
|
@ -68,7 +68,7 @@ angular.module('LoginController', ['matrixService'])
|
|||
// try to login
|
||||
matrixService.login($scope.account.user_id, $scope.account.password).then(
|
||||
function(response) {
|
||||
if ("access_token" in response) {
|
||||
if ("access_token" in response.data) {
|
||||
$scope.feedback = "Login successful.";
|
||||
matrixService.setConfig({
|
||||
homeserver: $scope.account.homeserver,
|
||||
|
@ -79,7 +79,7 @@ angular.module('LoginController', ['matrixService'])
|
|||
$location.path("rooms");
|
||||
}
|
||||
else {
|
||||
$scope.feedback = "Failed to login: " + JSON.stringify(response);
|
||||
$scope.feedback = "Failed to login: " + JSON.stringify(response.data);
|
||||
}
|
||||
},
|
||||
function(error) {
|
||||
|
|
|
@ -75,18 +75,18 @@ angular.module('RoomsController', ['matrixService', 'mFileInput'])
|
|||
// List all rooms joined or been invited to
|
||||
$scope.rooms = matrixService.rooms();
|
||||
matrixService.rooms().then(
|
||||
function(data) {
|
||||
data = assignRoomAliases(data);
|
||||
function(response) {
|
||||
var data = assignRoomAliases(response.data);
|
||||
$scope.feedback = "Success";
|
||||
$scope.rooms = data;
|
||||
},
|
||||
function(reason) {
|
||||
$scope.feedback = "Failure: " + reason;
|
||||
function(error) {
|
||||
$scope.feedback = "Failure: " + error.data;
|
||||
});
|
||||
|
||||
matrixService.publicRooms().then(
|
||||
function(data) {
|
||||
$scope.public_rooms = assignRoomAliases(data.chunk);
|
||||
function(response) {
|
||||
$scope.public_rooms = assignRoomAliases(response.data.chunk);
|
||||
}
|
||||
);
|
||||
};
|
||||
|
@ -101,14 +101,14 @@ angular.module('RoomsController', ['matrixService', 'mFileInput'])
|
|||
matrixService.create(room_id, visibility).then(
|
||||
function(response) {
|
||||
// This room has been created. Refresh the rooms list
|
||||
console.log("Created room " + response.room_alias + " with id: "+
|
||||
response.room_id);
|
||||
console.log("Created room " + response.data.room_alias + " with id: "+
|
||||
response.data.room_id);
|
||||
matrixService.createRoomIdToAliasMapping(
|
||||
response.room_id, response.room_alias);
|
||||
response.data.room_id, response.data.room_alias);
|
||||
$scope.refresh();
|
||||
},
|
||||
function(reason) {
|
||||
$scope.feedback = "Failure: " + reason;
|
||||
function(error) {
|
||||
$scope.feedback = "Failure: " + error.data;
|
||||
});
|
||||
};
|
||||
|
||||
|
@ -118,17 +118,17 @@ angular.module('RoomsController', ['matrixService', 'mFileInput'])
|
|||
//$location.path("room/" + room_id);
|
||||
matrixService.join(room_id).then(
|
||||
function(response) {
|
||||
if (response.hasOwnProperty("room_id")) {
|
||||
if (response.room_id != room_id) {
|
||||
$location.path("room/" + response.room_id);
|
||||
if (response.data.hasOwnProperty("room_id")) {
|
||||
if (response.data.room_id != room_id) {
|
||||
$location.path("room/" + response.data.room_id);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
$location.path("room/" + room_id);
|
||||
},
|
||||
function(reason) {
|
||||
$scope.feedback = "Can't join room: " + reason;
|
||||
function(error) {
|
||||
$scope.feedback = "Can't join room: " + error.data;
|
||||
}
|
||||
);
|
||||
};
|
||||
|
@ -136,15 +136,15 @@ angular.module('RoomsController', ['matrixService', 'mFileInput'])
|
|||
$scope.joinAlias = function(room_alias) {
|
||||
matrixService.joinAlias(room_alias).then(
|
||||
function(response) {
|
||||
if (response.hasOwnProperty("room_id")) {
|
||||
$location.path("room/" + response.room_id);
|
||||
if (response.data.hasOwnProperty("room_id")) {
|
||||
$location.path("room/" + response.data.room_id);
|
||||
return;
|
||||
} else {
|
||||
// TODO (erikj): Do something here?
|
||||
}
|
||||
},
|
||||
function(reason) {
|
||||
$scope.feedback = "Can't join room: " + reason;
|
||||
function(error) {
|
||||
$scope.feedback = "Can't join room: " + error.data;
|
||||
}
|
||||
);
|
||||
};
|
||||
|
@ -158,8 +158,8 @@ angular.module('RoomsController', ['matrixService', 'mFileInput'])
|
|||
matrixService.setConfig(config);
|
||||
matrixService.saveConfig();
|
||||
},
|
||||
function(reason) {
|
||||
$scope.feedback = "Can't update display name: " + reason;
|
||||
function(error) {
|
||||
$scope.feedback = "Can't update display name: " + error.data;
|
||||
}
|
||||
);
|
||||
};
|
||||
|
@ -182,8 +182,8 @@ angular.module('RoomsController', ['matrixService', 'mFileInput'])
|
|||
matrixService.setConfig(config);
|
||||
matrixService.saveConfig();
|
||||
},
|
||||
function(reason) {
|
||||
$scope.feedback = "Can't update avatar: " + reason;
|
||||
function(error) {
|
||||
$scope.feedback = "Can't update avatar: " + error.data;
|
||||
}
|
||||
);
|
||||
};
|
||||
|
@ -191,8 +191,8 @@ angular.module('RoomsController', ['matrixService', 'mFileInput'])
|
|||
$scope.linkEmail = function(email) {
|
||||
matrixService.linkEmail(email).then(
|
||||
function(response) {
|
||||
if (response.success === true) {
|
||||
$scope.linkedEmails.authTokenId = response.tokenId;
|
||||
if (response.data.success === true) {
|
||||
$scope.linkedEmails.authTokenId = response.data.tokenId;
|
||||
$scope.emailFeedback = "You have been sent an email.";
|
||||
$scope.linkedEmails.emailBeingAuthed = email;
|
||||
}
|
||||
|
@ -200,8 +200,8 @@ angular.module('RoomsController', ['matrixService', 'mFileInput'])
|
|||
$scope.emailFeedback = "Failed to send email.";
|
||||
}
|
||||
},
|
||||
function(reason) {
|
||||
$scope.emailFeedback = "Can't send email: " + reason;
|
||||
function(error) {
|
||||
$scope.emailFeedback = "Can't send email: " + error.data;
|
||||
}
|
||||
);
|
||||
};
|
||||
|
@ -214,7 +214,7 @@ angular.module('RoomsController', ['matrixService', 'mFileInput'])
|
|||
}
|
||||
matrixService.authEmail(matrixService.config().user_id, tokenId, code).then(
|
||||
function(response) {
|
||||
if ("success" in response && response.success === false) {
|
||||
if ("success" in response.data && response.data.success === false) {
|
||||
$scope.emailFeedback = "Failed to authenticate email.";
|
||||
return;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue