LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

(fix) Respect order in list of cards

pull/91/head
Francis Lachapelle 2015-07-15 15:20:08 -04:00
parent 25f364991e
commit f09f1a4282
1 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
UI/WebServerResources/js/Contacts/AddressBook.service.js
View File

@ -216,17 +216,6 @@
results = response.cards,
cards = _this.cards;
// Add new cards
angular.forEach(results, function(data) {
if (!_.find(cards, function(card) {
return card.id == data.id;
})) {
var card = new AddressBook.$Card(data),
index = _.sortedIndex(cards, card, '$$fullname');
cards.splice(index, 0, card);
}
});
// Remove cards that no longer exist
for (index = cards.length - 1; index >= 0; index--) {
card = cards[index];
@ -237,6 +226,16 @@
}
}
// Add new cards
_.each(results, function(data, index) {
if (!_.find(cards, function(card) {
return card.id == data.id;
})) {
var card = new AddressBook.$Card(data);
cards.splice(index, 0, card);
}
});
return cards;
});
};
@ -298,16 +297,6 @@
else {
results = response.cards;
}
// Add new cards matching the search query
angular.forEach(results, function(data) {
if (!_.find(cards, function(card) {
return card.id == data.id;
})) {
var card = new AddressBook.$Card(data, search),
index = _.sortedIndex(cards, card, '$$fullname');
cards.splice(index, 0, card);
}
});
// Remove cards that no longer match the search query
for (index = cards.length - 1; index >= 0; index--) {
card = cards[index];
@ -317,6 +306,15 @@
cards.splice(index, 1);
}
}
// Add new cards matching the search query
_.each(results, function(data, index) {
if (!_.find(cards, function(card) {
return card.id == data.id;
})) {
var card = new AddressBook.$Card(data, search);
cards.splice(index, 0, card);
}
});
return cards;
});
};