Merge pull request #18799 from justindarc/bug988670-v1.4

Bug 988670 - [Camera][Madai] Behavior when leaving camera while in previ...
mozilla-b2g · Apr 29, 2014 · e66d30c · e66d30c
2 parents 82915bc + c5091c6
commit e66d30c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/apps/camera/js/controllers/preview-gallery.js b/apps/camera/js/controllers/preview-gallery.js
@@ -77,6 +77,7 @@ PreviewGalleryController.prototype.openPreview = function() {
 
   this.app.set('previewGalleryOpen', true);
   this.previewItem();
+  this.app.emit('previewgallery:opened');
 };
 
 PreviewGalleryController.prototype.closePreview = function() {
@@ -223,8 +224,8 @@ PreviewGalleryController.prototype.updatePreviewGallery = function(index) {
       this.currentItemIndex = this.items.length - 1;
     }
 
-    var isPreviewOpened = this.view.isPreviewOpened();
-    if (isPreviewOpened) {
+    var isOpened = this.view ? true : false;
+    if (isOpened) {
       this.previewItem();
     }
   }
@@ -292,8 +293,6 @@ PreviewGalleryController.prototype.previewItem = function() {
   } else {
     this.view.showImage(item);
   }
-
-  this.app.emit('previewgallery:opened');
 };
 
 /**
@@ -330,10 +329,10 @@ PreviewGalleryController.prototype.onItemDeleted = function(data) {
  */
 PreviewGalleryController.prototype.onBlur = function() {
   if (this.app.inSecureMode) {
-    this.closePreview();
     this.configure();          // Forget all stored images
     this.updateThumbnail();    // Get rid of any thumbnail
   }
+  this.closePreview();
 };
 
 PreviewGalleryController.prototype.updateThumbnail = function() {

diff --git a/apps/camera/js/views/preview-gallery.js b/apps/camera/js/views/preview-gallery.js
@@ -233,10 +233,6 @@ return View.extend({
     this.frame.clear();
   },
 
-  isPreviewOpened: function() {
-    return !this.el.classList.contains('offscreen');
-  },
-
   updateCountText: function(current, total) {
     this.currentIndex = current;
     this.lastIndex = total;

diff --git a/apps/camera/test/unit/controllers/preview-gallery_test.js b/apps/camera/test/unit/controllers/preview-gallery_test.js
@@ -252,12 +252,20 @@ suite('controllers/preview-gallery', function() {
     });
 
     test('Should close the preview on blur', function() {
+      this.previewGalleryController.closePreview = sinon.spy();
+      this.previewGalleryController.onBlur();
+      assert.ok(this.previewGalleryController.closePreview.called);
+    });
+
+     test('Should close the preview on blur if in \'secureMode\'', function() {
       this.app.inSecureMode = true;
       this.previewGalleryController.closePreview = sinon.spy();
       this.previewGalleryController.configure = sinon.spy();
+      this.previewGalleryController.updateThumbnail = sinon.spy();
       this.previewGalleryController.onBlur();
-      assert.ok(this.previewGalleryController.closePreview.called);
       assert.ok(this.previewGalleryController.configure.called);
+      assert.ok(this.previewGalleryController.updateThumbnail.called);
+      assert.ok(this.previewGalleryController.closePreview.calledAfter(this.previewGalleryController.updateThumbnail));
     });
 
     // XXX: this is really a view test, but we don't have tests for the view yet