Merge pull request #23737 from yzen/bug-1063039

Bug 1063039 - update playing icon only if the audio channel actually cha...
mozilla-b2g · Sep 9, 2014 · 3b76462 · 3b76462
2 parents bafd6f5 + c9842bc
commit 3b76462
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/apps/system/js/statusbar.js b/apps/system/js/statusbar.js
@@ -390,7 +390,11 @@ var StatusBar = {
             break;
 
           case 'audio-channel-changed':
-            this.playingActive = (evt.detail.channel === 'content');
+            var active = evt.detail.channel === 'content';
+            if (this.playingActive === active) {
+              break;
+            }
+            this.playingActive = active;
             this.update.playing.call(this);
             break;
         }

diff --git a/apps/system/test/unit/statusbar_test.js b/apps/system/test/unit/statusbar_test.js
@@ -1336,6 +1336,7 @@ suite('system/Statusbar', function() {
 
     teardown(function() {
       StatusBar.recordingCount = 0;
+      StatusBar.playingActive = false;
       fakeClock.restore();
     });
 
@@ -1393,6 +1394,19 @@ suite('system/Statusbar', function() {
       StatusBar.handleEvent(evt);
       assert.equal(StatusBar.icons.playing.hidden, false);
     });
+
+    test('repeat audio-channel-changed event', function() {
+      var evt = new CustomEvent('mozChromeEvent', {
+        detail: {
+          type: 'audio-channel-changed',
+          channel: 'content'
+        }
+      });
+      var updatePlayingSpy = sinon.spy(StatusBar.update, 'playing');
+      StatusBar.handleEvent(evt);
+      StatusBar.handleEvent(evt);
+      assert.equal(updatePlayingSpy.callCount, 1);
+    });
   });
 
   suite('fullscreen mode >', function() {