eslint related tweaks

Author: rmisio

js/router.js

@@ -74,9 +74,12 @@ module.exports = Backbone.Router.extend({
       var cached;
 
       for (var key in this.viewCache) {
-        cached = this.viewCache[key];
-        if (Date.now() - cached.cachedAt >= cached.view.cacheExpires) {
-          delete this.viewCache[key];
+        if (this.viewCache.hasOwnProperty(key)) {
+          cached = this.viewCache[key];
+
+          if (Date.now() - cached.cachedAt >= cached.view.cacheExpires) {
+            delete this.viewCache[key];
+          }
         }
       }      
     }, this.cleanCacheInterval);
@@ -227,13 +230,15 @@ module.exports = Backbone.Router.extend({
     // cachedAt is updated and the user has up until the view's 'cacheExpires' amount of
     // time to come back to it in it's current state.
     for (var key in this.viewCache) {
-      let cached = this.viewCache[key];
-
-      if (
-          cached.view === this.view &&
-          (Date.now() - cached.cachedAt < cached.view.cacheExpires)
-        ) {
-        cached.cachedAt = Date.now();
+      if (this.viewCache.hasOwnProperty(key)) {
+        let cached = this.viewCache[key];
+
+        if (
+            cached.view === this.view &&
+            (Date.now() - cached.cachedAt < cached.view.cacheExpires)
+          ) {
+          cached.cachedAt = Date.now();
+        }
       }
     }
 

js/views/homeVw.js

@@ -85,15 +85,12 @@ module.exports = pageVw.extend({
     if (e.view !== this) return;
     state = state || this.state;
 
-    if (this.cachedScrollPositions[state])
+    if (this.cachedScrollPositions[state]) {
       this.obContainer[0].scrollTop = this.cachedScrollPositions[state];
-    this.setState(state);
-
-    if (!searchTerm && this.searchItemsText) {
-      this.searchItemsClear(state);
-      if (state === 'products') this.obContainer[0].scrollTop = 0;
     }
 
+    this.setState(state);
+
     if (searchTerm && searchTerm !== this.searchItemsText) {
       this.searchItems(searchTerm);
       this.obContainer[0].scrollTop = 0;
@@ -192,7 +189,6 @@ module.exports = pageVw.extend({
 
   render: function(){
     var self = this;
-    $('#content').html(this.$el);
 
     loadTemplate('./js/templates/backToTop.html', function(backToTopTmpl) {
       loadTemplate('./js/templates/home.html', function(loadedTemplate) {
@@ -520,7 +516,7 @@ module.exports = pageVw.extend({
     }
   },
 
-  onSearchItemsClear: function(e) {
+  onSearchItemsClear: function() {
     this.searchItemsClear();
   },
 

js/views/itemListVw.js

@@ -1,7 +1,6 @@
 'use strict';
 
 var __ = require('underscore'),
-    Backbone = require('backbone'),
     baseVw = require('./baseVw'),
     itemsShortCollection = require('../collections/itemsShortCl'),
     itemShortView = require('./itemShortVw'),

js/views/userPageVw.js

@@ -368,9 +368,6 @@ UserPageVw = pageVw.extend({
 
     this.model.set('isBlocked', isBlocked); //add blocked status to model
 
-    //make sure container is cleared
-    $('#content').html(this.$el);
-
     loadTemplate('./js/templates/backToTop.html', function(backToTopTmpl) {
       loadTemplate('./js/templates/userPage.html', function(loadedTemplate) {
         self.setCustomStyles();