Merge pull request #172 from entrylabs/hotfix/select_picture_bug

Hotfix/select picture bug
entrylabs · Feb 5, 2016 · da34afe · da34afe
2 parents 2b8f8fc + 7631b2a
commit da34afe
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/dist/entry.js b/dist/entry.js
@@ -9306,8 +9306,9 @@ Entry.Playground.prototype.selectPicture = function(a) {
     var e = b[c];
     e.id === a.id ? e.view.addClass("entryPictureSelected") : e.view.removeClass("entryPictureSelected");
   }
-  b = Entry.container.selectPicture(a.id);
-  this.object.id === b && Entry.dispatchEvent("pictureSelected", a);
+  var f;
+  a && a.id && (f = Entry.container.selectPicture(a.id));
+  this.object.id === f && Entry.dispatchEvent("pictureSelected", a);
 };
 Entry.Playground.prototype.movePicture = function(a, b) {
   this.object.pictures.splice(b, 0, this.object.pictures.splice(a, 1)[0]);

diff --git a/dist/entry.min.js b/dist/entry.min.js
diff --git a/src/playground.js b/src/playground.js
@@ -996,7 +996,10 @@ Entry.Playground.prototype.selectPicture = function(picture) {
             target.view.removeClass('entryPictureSelected');
     }
 
-    var objectId_ = Entry.container.selectPicture(picture.id);
+    var objectId_;
+    if(picture && picture.id) {
+        objectId_ = Entry.container.selectPicture(picture.id);
+    }
 
     if( this.object.id === objectId_) {
         Entry.dispatchEvent('pictureSelected', picture);