Merge pull request #30098 from alivedise/bugzilla/1149003/attention-t…

…oaster-animation Bug 1149003 - RAF before doing toaster animation
mozilla-b2g · May 21, 2015 · ed9747b · ed9747b
2 parents 208ec11 + a46c3ff
commit ed9747b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/apps/system/js/attention_toaster.js b/apps/system/js/attention_toaster.js
@@ -76,7 +76,9 @@
           break;
 
         case '_closed':
-          this.processStateChange('init', evt.type);
+          window.requestAnimationFrame(() => {
+            this.processStateChange('init', evt.type);
+          });
           break;
 
         case '_lockscreen-appopened':
@@ -202,4 +204,4 @@
     }
   };
   exports.AttentionToaster = AttentionToaster;
-}(window));
+}(window));
diff --git a/apps/system/test/unit/attention_toaster_test.js b/apps/system/test/unit/attention_toaster_test.js
@@ -13,6 +13,7 @@ suite('system/AttentionToaster', function() {
   var stubById;
   mocksForAttentionToaster.attachTestHelpers();
   setup(function(done) {
+    this.sinon.stub(window, 'requestAnimationFrame');
     this.sinon.useFakeTimers();
     stubById = this.sinon.stub(document, 'getElementById');
     stubById.returns(document.createElement('div'));
@@ -52,6 +53,8 @@ suite('system/AttentionToaster', function() {
       at1.start();
       assert.isTrue(at1._currentToasterState === 'uninit');
       app1.element.dispatchEvent(new CustomEvent('_closed'));
+      assert.notEqual(at1._currentToasterState, 'closed');
+      window.requestAnimationFrame.yield();
       assert.equal(at1._currentToasterState, 'closed');
     });