(js) Use $window instead of window when possible
This commit is contained in:
parent
37a419a7ae
commit
94b6213ba9
|
@ -6,8 +6,8 @@
|
||||||
/**
|
/**
|
||||||
* @ngInject
|
* @ngInject
|
||||||
*/
|
*/
|
||||||
AddressBookController.$inject = ['$scope', '$q', '$state', '$timeout', '$mdDialog', 'Account', 'Card', 'AddressBook', 'Dialog', 'sgSettings', 'stateAddressbooks', 'stateAddressbook'];
|
AddressBookController.$inject = ['$scope', '$q', '$window', '$state', '$timeout', '$mdDialog', 'Account', 'Card', 'AddressBook', 'Dialog', 'sgSettings', 'stateAddressbooks', 'stateAddressbook'];
|
||||||
function AddressBookController($scope, $q, $state, $timeout, $mdDialog, Account, Card, AddressBook, Dialog, Settings, stateAddressbooks, stateAddressbook) {
|
function AddressBookController($scope, $q, $window, $state, $timeout, $mdDialog, Account, Card, AddressBook, Dialog, Settings, stateAddressbooks, stateAddressbook) {
|
||||||
var vm = this;
|
var vm = this;
|
||||||
|
|
||||||
AddressBook.selectedFolder = stateAddressbook;
|
AddressBook.selectedFolder = stateAddressbook;
|
||||||
|
@ -103,7 +103,7 @@
|
||||||
function saveSelectedCards() {
|
function saveSelectedCards() {
|
||||||
var selectedCards = _.filter(vm.selectedFolder.cards, function(card) { return card.selected; });
|
var selectedCards = _.filter(vm.selectedFolder.cards, function(card) { return card.selected; });
|
||||||
var selectedUIDs = _.pluck(selectedCards, 'id');
|
var selectedUIDs = _.pluck(selectedCards, 'id');
|
||||||
window.location.href = ApplicationBaseURL + '/' + vm.selectedFolder.id + '/export?uid=' + selectedUIDs.join('&uid=');
|
$window.location.href = ApplicationBaseURL + '/' + vm.selectedFolder.id + '/export?uid=' + selectedUIDs.join('&uid=');
|
||||||
}
|
}
|
||||||
|
|
||||||
function copySelectedCards(folder) {
|
function copySelectedCards(folder) {
|
||||||
|
@ -179,7 +179,7 @@
|
||||||
if (card.c_component == 'vcard' && card.c_mail.length) {
|
if (card.c_component == 'vcard' && card.c_mail.length) {
|
||||||
recipients.push({full: card.c_cn + ' <' + card.c_mail + '>'});
|
recipients.push({full: card.c_cn + ' <' + card.c_mail + '>'});
|
||||||
}
|
}
|
||||||
else if (card.c_component == 'vlist') {
|
else if (card.$isList()) {
|
||||||
// If the list's members were already fetch, use them
|
// If the list's members were already fetch, use them
|
||||||
if (angular.isDefined(card.refs) && card.refs.length) {
|
if (angular.isDefined(card.refs) && card.refs.length) {
|
||||||
_.each(card.refs, function(ref) {
|
_.each(card.refs, function(ref) {
|
||||||
|
|
|
@ -6,8 +6,8 @@
|
||||||
/**
|
/**
|
||||||
* @ngInject
|
* @ngInject
|
||||||
*/
|
*/
|
||||||
AddressBooksController.$inject = ['$state', '$scope', '$rootScope', '$stateParams', '$timeout', '$mdDialog', '$mdToast', '$mdMedia', '$mdSidenav', 'FileUploader', 'sgFocus', 'Card', 'AddressBook', 'Dialog', 'sgSettings', 'User', 'stateAddressbooks'];
|
AddressBooksController.$inject = ['$state', '$scope', '$rootScope', '$stateParams', '$timeout', '$window', '$mdDialog', '$mdToast', '$mdMedia', '$mdSidenav', 'FileUploader', 'sgFocus', 'Card', 'AddressBook', 'Dialog', 'sgSettings', 'User', 'stateAddressbooks'];
|
||||||
function AddressBooksController($state, $scope, $rootScope, $stateParams, $timeout, $mdDialog, $mdToast, $mdMedia, $mdSidenav, FileUploader, focus, Card, AddressBook, Dialog, Settings, User, stateAddressbooks) {
|
function AddressBooksController($state, $scope, $rootScope, $stateParams, $timeout, $window, $mdDialog, $mdToast, $mdMedia, $mdSidenav, FileUploader, focus, Card, AddressBook, Dialog, Settings, User, stateAddressbooks) {
|
||||||
var vm = this;
|
var vm = this;
|
||||||
|
|
||||||
vm.activeUser = Settings.activeUser;
|
vm.activeUser = Settings.activeUser;
|
||||||
|
@ -203,7 +203,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
function exportCards() {
|
function exportCards() {
|
||||||
window.location.href = ApplicationBaseURL + '/' + vm.service.selectedFolder.id + '/exportFolder';
|
$window.location.href = ApplicationBaseURL + '/' + vm.service.selectedFolder.id + '/exportFolder';
|
||||||
}
|
}
|
||||||
|
|
||||||
function showLinks(addressbook) {
|
function showLinks(addressbook) {
|
||||||
|
|
|
@ -7,8 +7,8 @@
|
||||||
* Controller to view and edit a card
|
* Controller to view and edit a card
|
||||||
* @ngInject
|
* @ngInject
|
||||||
*/
|
*/
|
||||||
CardController.$inject = ['$scope', '$timeout', '$mdDialog', 'AddressBook', 'Card', 'Dialog', 'sgFocus', '$state', '$stateParams', 'stateCard'];
|
CardController.$inject = ['$scope', '$timeout', '$window', '$mdDialog', 'AddressBook', 'Card', 'Dialog', 'sgFocus', '$state', '$stateParams', 'stateCard'];
|
||||||
function CardController($scope, $timeout, $mdDialog, AddressBook, Card, Dialog, focus, $state, $stateParams, stateCard) {
|
function CardController($scope, $timeout, $window, $mdDialog, AddressBook, Card, Dialog, focus, $state, $stateParams, stateCard) {
|
||||||
var vm = this;
|
var vm = this;
|
||||||
|
|
||||||
vm.card = stateCard;
|
vm.card = stateCard;
|
||||||
|
@ -86,9 +86,6 @@
|
||||||
AddressBook.selectedFolder.cards[i] = angular.copy(vm.card);
|
AddressBook.selectedFolder.cards[i] = angular.copy(vm.card);
|
||||||
}
|
}
|
||||||
$state.go('app.addressbook.card.view', { cardId: vm.card.id });
|
$state.go('app.addressbook.card.view', { cardId: vm.card.id });
|
||||||
})
|
|
||||||
.catch(function(err) {
|
|
||||||
console.log(err);
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -135,7 +132,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
function exportCard() {
|
function exportCard() {
|
||||||
window.location.href = ApplicationBaseURL + '/' + vm.currentFolder.id + '/export?uid=' + vm.card.id;
|
$window.location.href = ApplicationBaseURL + '/' + vm.currentFolder.id + '/export?uid=' + vm.card.id;
|
||||||
}
|
}
|
||||||
|
|
||||||
function toggleRawSource($event) {
|
function toggleRawSource($event) {
|
||||||
|
|
Loading…
Reference in a new issue