Merge pull request #1791 from OpenBazaar/severalFixes

Fix various bugs.

Author: jjeffryes

js/templates/itemShort.html

@@ -9,9 +9,7 @@
 <div class="gridItem clearfix custCol-border <% if(ob.hidden){ %>div-fadeExtra<% } %>">
 
   <div class="itemImg row10 color-secondary custCol-secondary overflowHidden js-item" data-id="<%= ob.contract_hash %>">
-    <div class="itemImg <% if(ob.cloak){ %> nsfw <% } %>" style="background-image: url(imgs/defaultItem.png);">
-      <object height="230" width="250" type="image/jpg" data="<%= ob.imageURL %>" ></object>
-    </div>
+    <div class="itemImg <% if(ob.cloak){ %> nsfw <% } %>" style="background-image: url(<%= ob.imageURL %>), url(imgs/defaultItem.png);"></div>
   </div>
   <div class="table">
     <div>

js/utils/sanitizeModel.js

@@ -30,7 +30,9 @@ module.exports = function(modelObject) {
       if (typeof obj[key] === 'object') {
         return sanitizeModelData(obj[key]);
       }
-      obj[key] = sanitize(obj[key]);
+      if (typeof obj[key] === 'string') {
+        obj[key] = sanitize(obj[key]);
+      }
     });
   }
   sanitizeModelData(modelObject);

js/views/settingsVw.js

@@ -313,10 +313,12 @@ module.exports = pageVw.extend({
       editor.subscribe('blur', self.validateDescription);
 
       self.sortableAddresses && self.sortableAddresses.destroy();
-      self.sortableAddresses = Sortable.create(self.$('.js-sortableAddresses')[0], {
-        chosenClass: "addressBoxDragging",
-        ghostClass: "addressBoxGhost"
-      });
+      if(self.$('.js-sortableAddresses').length) {
+        self.sortableAddresses = Sortable.create(self.$('.js-sortableAddresses')[0], {
+          chosenClass: "addressBoxDragging",
+          ghostClass: "addressBoxGhost"
+        });
+      }
     });
     return this;
   },

js/views/storeWizardVw.js

@@ -19,6 +19,7 @@ module.exports = baseModal.extend({
     'click .js-storeWizardModal': 'blockClicks',
     'click .js-storeWizardSave': 'saveWizard',
     'click .js-accordionNext': 'validateDescription',
+    'click .js-closeStoreWizardModal': 'cancelClick',
     'blur input': 'validateInput',
     'blur textarea': 'validateInput'
   },
@@ -104,7 +105,7 @@ module.exports = baseModal.extend({
         self.setValues();
         self.$el.find('#storeNameInput').focus();
         self.socketView.getModerators(self.socketModeratorID);
-        
+
         var editor = new MediumEditor('#aboutInput', {
           placeholder: {
             text: ''
@@ -159,7 +160,7 @@ module.exports = baseModal.extend({
     this.$el.find('.js-storeWizardModeratorList').append(modShort.el);
     this.moderatorCount++;
   },
-  
+
   blockClicks: function(e) {
     if (!$(e.target).hasClass('js-externalLink')){
       e.stopPropagation();
@@ -171,6 +172,10 @@ module.exports = baseModal.extend({
     $(e.target).closest('.flexRow').addClass('formChecked');
   },
 
+  cancelClick: function() {
+    this.close();
+  },
+
   saveWizard: function() {
     var self = this,
         profileForm = this.$el.find('#storeWizardForm'),
@@ -206,4 +211,4 @@ module.exports = baseModal.extend({
       }, '', modData);
     }, '', wizData);
   }
-});
+});

js/views/userListVw.js

@@ -95,6 +95,7 @@ module.exports = Backbone.View.extend({
   },
 
   onScroll: function(){
+    if (!this.listWrapper) return; //if no users have been added, do nothing
     if (!this.userShortHeight) this.userShortHeight = this.listWrapper[0].firstElementChild.offsetHeight;
     if (this.listWrapper.is(":visible")){