Bug 1162384 - [NFC] Cannot share image which is opened from notificat…

…ion, r=alive
mozilla-b2g · May 26, 2015 · e6107c7 · e6107c7
1 parent 922131e
commit e6107c7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/apps/system/js/app_window.js b/apps/system/js/app_window.js
@@ -1242,12 +1242,11 @@
   AppWindow.prototype._showScreenshotOverlay =
     function aw__showScreenshotOverlay() {
       if (this.frontWindow && this.frontWindow.isActive()) {
-        this.frontWindow._showScreenshotOverlay();
-        return;
+        return this.frontWindow._showScreenshotOverlay();
       }
       if (!this.screenshotOverlay ||
           this.screenshotOverlay.classList.contains('visible')) {
-        return;
+        return Promise.resolve();
       }
       if (this.identificationOverlay) {
         this.element.classList.add('overlay');

diff --git a/apps/system/test/unit/app_window_test.js b/apps/system/test/unit/app_window_test.js
@@ -730,6 +730,16 @@ suite('system/AppWindow', function() {
       assert.isFalse(app2.screenshotOverlay.classList.contains('visible'));
     });
 
+    test('should return promise and resolve directly if the frontest app is' +
+         ' active and its screenshot is visible', function(done) {
+      app1.frontWindow = app2;
+      this.sinon.stub(app2, 'isActive').returns(true);
+      app2.screenshotOverlay.classList.add('visible');
+      app1._showScreenshotOverlay().then(() => {
+        done();
+      });
+    });
+
     test('hideScreenshotOverlay', function() {
       app1.screenshotOverlay.classList.add('visible');
       app1.element.classList.add('overlay');