bugfix

이슈 #1942 수정과 겹침
entrylabs · Feb 5, 2016 · 7631b2a · 7631b2a
1 parent ee77e1c
commit 7631b2a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 12 deletions.
diff --git a/dist/entry.js b/dist/entry.js
@@ -9313,14 +9313,13 @@ Entry.Playground.prototype.clonePicture = function(a) {
   this.addPicture(a, !0);
 };
 Entry.Playground.prototype.selectPicture = function(a) {
-  if (a) {
-    for (var b = this.object.pictures, c = 0, d = b.length;c < d;c++) {
-      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);
+  for (var b = this.object.pictures, c = 0, d = b.length;c < d;c++) {
+    var e = b[c];
+    e.id === a.id ? e.view.addClass("entryPictureSelected") : e.view.removeClass("entryPictureSelected");
   }
+  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
@@ -987,9 +987,6 @@ Entry.Playground.prototype.clonePicture = function(pictureId) {
  * @param {picture}
  */
 Entry.Playground.prototype.selectPicture = function(picture) {
-    if(!picture) {
-        return;
-    }
     var pictures = this.object.pictures;
     for (var i = 0, len=pictures.length; i<len; i++) {
         var target = pictures[i];
@@ -999,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);