Skip to content

Commit f9c7de4

Browse files
committed
feature/character-list — very light refactoring
1 parent e7e4062 commit f9c7de4

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

app/character/list/character-list.controller.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
vm.characters = [];
1616
vm.searching = false;
1717
vm.offset = 0;
18-
vm.hasMoreData = false;
18+
vm.hasMore = false;
1919
vm.toggleFave = toggleFave;
2020
vm.search = search;
21-
vm.loadMore = loadMore;
21+
vm.showMore = showMore;
2222

2323
var listeners = [];
2424
var faves = favouriteService.faves;
@@ -39,7 +39,7 @@
3939
showSpinner();
4040
var promise = characterService.findByName(vm.filter);
4141
vm.characters = [];
42-
vm.hasMoreData = false;
42+
vm.hasMore = false;
4343
vm.offset = 0;
4444
$cordovaKeyboard.close();
4545
return promise
@@ -63,7 +63,7 @@
6363
vm.searching = false;
6464
}
6565

66-
function loadMore() {
66+
function showMore() {
6767
showSpinner();
6868
vm.offset += defaultOffset;
6969
return characterService.findByName(vm.filter, vm.offset)
@@ -81,7 +81,7 @@
8181
// Update meta
8282
meta = vm.characters.meta = results.meta;
8383
// Update boolean to know instantly if there is more
84-
vm.hasMoreData = meta && (meta.count + meta.offset) < meta.total;
84+
vm.hasMore = meta && (meta.count + meta.offset) < meta.total;
8585
}
8686

8787
// Event handler called when clicking the fave button (heart).

app/character/list/character-list.jade

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ ion-view.characters(view-title='Characters')
1717
| {{::character.name}}
1818
.characters__footer
1919
ion-spinner(ng-if='vm.searching')
20-
button.button.button-block.button-assertive.characters__show-more(ng-click='vm.loadMore()' ng-show='vm.hasMoreData')
20+
button.button.button-block.button-assertive.characters__show-more(ng-click='vm.showMore()' ng-show='vm.hasMore')
2121
| Show more

0 commit comments

Comments
 (0)