Bug1088051 - Fix of stuck in image edit window on clicking edit icon …

…immediately after image delete r=djf

Conflicts:
	apps/gallery/js/ImageEditor.js

apps/gallery/js/ImageEditor.js

@@ -346,9 +346,11 @@ function exitEditMode(saved) {
   URL.revokeObjectURL(editedPhotoURL);
   editedPhotoURL = null;
 
-  // close the editor object
-  imageEditor.destroy();
-  imageEditor = null;
+  // Check for imageEditor and close the editor object
+  if (imageEditor) {
+    imageEditor.destroy();
+    imageEditor = null;
+  }
 
   window.removeEventListener('resize', resizeHandler);
 
@@ -395,6 +397,11 @@ function saveEditedImage() {
   // save operations
   $('edit-save-button').disabled = true;
 
+  // Check for imageEditor before continuing with save
+  if (!imageEditor) {
+    return;
+  }
+
   // If we are in crop mode, perform the crop before saving
   if ($('edit-crop-button').classList.contains('selected'))
     imageEditor.cropImage();

apps/gallery/js/frames.js

@@ -137,9 +137,11 @@ function deleteSingleItem() {
     confirmText: navigator.mozL10n.get('delete'),
     danger: true
   }, function() { // onSuccess
-    // disable delete and share button to prevent operations while delete item
+    // disable delete, edit and share button to prevent
+    // operations while delete item
     fullscreenButtons.delete.classList.add('disabled');
     fullscreenButtons.share.classList.add('disabled');
+    fullscreenButtons.edit.classList.add('disabled');
 
     deleteFile(currentFileIndex);
     // Enable NFC sharing when done deleting and returns to fullscreen view