mirror of
https://github.com/moparisthebest/mail
synced 2025-03-03 10:11:47 -05:00
Fix mail-list filtering and iScroll refresh together with ngAnimate
This commit is contained in:
parent
af6f44177b
commit
6bb1bd2239
@ -401,7 +401,8 @@ define(function(require) {
|
||||
//
|
||||
|
||||
var ngModule = angular.module('mail-list', []);
|
||||
ngModule.directive('ngIscroll', function() {
|
||||
|
||||
ngModule.directive('ngIscroll', function($timeout) {
|
||||
return {
|
||||
link: function(scope, elm, attrs) {
|
||||
var model = attrs.ngIscroll,
|
||||
@ -451,11 +452,14 @@ define(function(require) {
|
||||
myScroll.on('scrollEnd', scope.loadVisibleBodies);
|
||||
|
||||
// refresh iScroll when model length changes
|
||||
scope.$watch(model, function() {
|
||||
scope.$watchCollection(model, function() {
|
||||
$timeout(function() {
|
||||
myScroll.refresh();
|
||||
scope.$apply();
|
||||
});
|
||||
// load the visible message bodies, when the list is re-initialized and when scrolling stopped
|
||||
scope.loadVisibleBodies();
|
||||
}, true);
|
||||
});
|
||||
}
|
||||
};
|
||||
});
|
||||
|
@ -19,6 +19,10 @@
|
||||
cursor: pointer;
|
||||
transition: background-color $time-li-fade, color $time-li-fade;
|
||||
|
||||
&.ng-animate {
|
||||
transition: none;
|
||||
}
|
||||
|
||||
h3 {
|
||||
@include text-overflow;
|
||||
|
||||
|
@ -8,7 +8,7 @@
|
||||
<input class="input-text input-search" type="search" results="5" ng-model="searchText" placeholder=" Filter..." focus-me="state.mailList.searching">
|
||||
</div>
|
||||
|
||||
<div class="list-wrapper" ng-iscroll="filteredMessages.length">
|
||||
<div class="list-wrapper" ng-iscroll="filteredMessages">
|
||||
<ul class="mail-list">
|
||||
<li ng-class="{'mail-list-active': email === state.mailList.selected, 'mail-list-attachment': email.attachments !== undefined && email.attachments.length > 0, 'mail-list-unread': email.unread, 'mail-list-replied': !email.unread && email.answered}" ng-click="select(email)" ng-repeat="email in (filteredMessages = (state.nav.currentFolder.messages | filter:searchText | orderBy:'uid':true | limitTo:100))">
|
||||
<h3>{{email.from[0].name || email.from[0].address}}</h3>
|
||||
|
Loading…
x
Reference in New Issue
Block a user