fix overfetching issue

Author: jjeffryes

js/views/userListVw.js

@@ -31,13 +31,20 @@ module.exports = Backbone.View.extend({
     this.fetchedUsers = this.usersShort.length;
     this.totalUsers = this.options.followerCount;
     this.$container = $('#obContainer');
+    this.fetching = false;
 
     //listen to scrolling on container
     this.scrollHandler = __.bind(
         __.throttle(this.onScroll, 100), this
     );
     this.$container.on('scroll', this.scrollHandler);
 
+    this.listenTo(this.usersShort, 'add', (data)=>{
+      this.fetchedUsers = this.usersShort.length;
+      this.fetching = false;
+      this.renderUserSet(this.nextUserToShow, this.nextUserToShow + this.showPerScroll);
+    });
+
     this.render();
   },
 
@@ -60,8 +67,6 @@ module.exports = Backbone.View.extend({
           return (index >= start) && (index < end);
         });
 
-    this.fetchedUsers = this.usersShort.length;
-
     __.each(renderSet, function(user) {
       user.set('avatarURL', self.options.serverUrl+"get_image?hash="+user.get('avatar_hash')+"&guid="+user.get('guid'));
       if(self.options.ownFollowing.indexOf(user.get('guid')) != -1){
@@ -77,14 +82,11 @@ module.exports = Backbone.View.extend({
     }
 
     this.nextUserToShow = this.nextUserToShow >= this.fetchedUsers ? this.nextUserToShow : this.nextUserToShow + this.showPerScroll;
-    console.log("f: " + this.fetchedUsers)
-    console.log("t: " + this.totalUsers)
-    console.log("e: " + end)
-    console.log("fm: " + this.fetchMoreAfter)
-    if(this.fetchMoreAfter && end == this.fetchMoreAfter && this.fetchedUsers != this.totalUsers){
+
+    if(this.fetchMoreAfter && end == this.fetchMoreAfter && this.fetchedUsers < this.totalUsers && !this.fetching){
       this.fetchMoreAfter = this.fetchMoreAfter + this.options.perFetch;
       this.trigger('fetchMoreUsers');
-      console.log("fetch more from userlistvw")
+      this.fetching = true;
     }
   },
 
@@ -105,9 +107,7 @@ module.exports = Backbone.View.extend({
 
   addUsers: function(model) {
     //add more users to the collection
-    console.log("add users")
     this.usersShort.add(model);
-    this.renderUserSet(this.nextUserToShow, this.nextUserToShow + this.showPerScroll);
   },
 
   renderNoneFound: function(){

js/views/userPageVw.js

@@ -184,6 +184,8 @@ module.exports = baseVw.extend({
     this.userID = options.userModel.get('guid');
     this.userProfileFetchParameters = {};
     this.followerFetchStart = 0;
+    this.followersFetchPer = 30;
+    this.followerFetchTotal = 0;
     this.itemFetchParameters = {};
     this.model = new Backbone.Model();
     this.globalUserProfile = options.userProfile;
@@ -690,30 +692,33 @@ module.exports = baseVw.extend({
     });
   },
 
-  fetchFollowers: function(){
+  fetchFollowers: function(ignoreTotal){
     var self = this,
         fetchFollowersParameters;
 
+    if(!ignoreTotal && this.followerFetchStart > 0 && this.followerFetchStart >= this.followerFetchTotal){
+      return;
+    }
+
     if(this.options.ownPage){
       fetchFollowersParameters = $.param({'start': this.followerFetchStart});
     } else {
       fetchFollowersParameters = $.param({'guid': this.pageID, 'start': this.followerFetchStart});
     }
-
-    console.log("fetchFollowers")
-
+    
     this.followers.fetch({
       data: fetchFollowersParameters,
       //timeout: 5000,
       success: (model)=> {
-        var followerArray = model.get('followers'),
-            followerCount = model.get('count') || followerArray.length;
-        this.$('.js-userFollowerCount').html(followerCount);
-        this.followerFetchStart += followerArray.length;
+        var followerArray = model.get('followers');
+        this.followerFetchTotal = model.get('count') || followerArray.length;
+        this.$('.js-userFollowerCount').html(this.followerFetchTotal);
 
         if (self.isRemoved()) return;
-
-        this.renderFollowers(followerArray, followerCount);
+        
+        if(followerArray.length){
+          this.renderFollowers(followerArray, this.followerFetchTotal);
+        }
       },
       error: function(model, response){
         if (self.isRemoved()) return;
@@ -726,6 +731,7 @@ module.exports = baseVw.extend({
         }
       }
     });
+    this.followerFetchStart += this.followersFetchPer;
   },
 
   getIsModerator: function () {
@@ -814,7 +820,7 @@ module.exports = baseVw.extend({
         followerCount: followerCount
       });
       this.registerChild(this.followerList);
-    }else{
+    }else if(model.length) {
       this.followerList.addUsers(model);
     }
 
@@ -832,7 +838,6 @@ module.exports = baseVw.extend({
     });
 
     this.listenTo(this.followerList, 'fetchMoreUsers', ()=>{
-      console.log("trigger fetch");
       this.fetchFollowers();
     });
   },