Bug 1152718 - merge pull request #29546 from gmarty:Bug-1152718-The-T…

…ime-battery-signal-icon-display-on-the-top-left-in-video-view to mozilla-b2g:master
mozilla-b2g · Apr 17, 2015 · 3b38ebb · 3b38ebb
2 parents ae7527a + c0d0a75
commit 3b38ebb
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 4 deletions.
diff --git a/apps/system/js/statusbar.js b/apps/system/js/statusbar.js
@@ -219,6 +219,7 @@ var StatusBar = {
 
   handleEvent: function sb_handleEvent(evt) {
     var icon;
+    var app;
     switch (evt.type) {
       case 'ftudone':
       case 'ftuskip':
@@ -310,6 +311,14 @@ var StatusBar = {
 
       case 'stackchanged':
       case 'rocketbar-deactivated':
+        app = Service.currentApp;
+
+        if (app) {
+          this.element.classList.toggle('fullscreen',
+            app.isFullScreen());
+          this.element.classList.toggle('fullscreen-layout',
+            app.isFullScreenLayout());
+        }
         this.setAppearance();
         this.element.classList.remove('hidden');
         break;
@@ -322,7 +331,7 @@ var StatusBar = {
       case 'appopened':
       case 'hierarchytopmostwindowchanged':
       case 'appchromeexpanded':
-        var app = evt.detail.getTopMostWindow();
+        app = evt.detail.getTopMostWindow();
 
         if (app) {
           this.element.classList.toggle('fullscreen',
@@ -388,8 +397,8 @@ var StatusBar = {
       );
     }
 
-    this.element.classList.toggle('maximized', app.isHomescreen ||
-      !!(app.appChrome && app.appChrome.isMaximized()));
+    this.element.classList.toggle('maximized',
+      app.isHomescreen || !!(app.appChrome && app.appChrome.isMaximized()));
   },
 
   _getMaximizedStatusBarWidth: function sb_getMaximizedStatusBarWidth() {

diff --git a/apps/system/test/unit/statusbar_test.js b/apps/system/test/unit/statusbar_test.js
@@ -227,6 +227,24 @@ suite('system/Statusbar', function() {
       assert.isFalse(StatusBar.element.classList.contains('fullscreen'));
       assert.isFalse(StatusBar.element.classList.contains('fullscreen-layout'));
     });
+
+    test('stackchanged', function() {
+      this.sinon.stub(app, 'isFullScreen').returns(true);
+      this.sinon.stub(app, 'isFullScreenLayout').returns(true);
+      var event = new CustomEvent('stackchanged');
+      StatusBar.handleEvent(event);
+      assert.isTrue(StatusBar.element.classList.contains('fullscreen'));
+      assert.isTrue(StatusBar.element.classList.contains('fullscreen-layout'));
+    });
+
+    test('rocketbar-deactivated', function() {
+      this.sinon.stub(app, 'isFullScreen').returns(true);
+      this.sinon.stub(app, 'isFullScreenLayout').returns(true);
+      var event = new CustomEvent('rocketbar-deactivated');
+      StatusBar.handleEvent(event);
+      assert.isTrue(StatusBar.element.classList.contains('fullscreen'));
+      assert.isTrue(StatusBar.element.classList.contains('fullscreen-layout'));
+    });
   });
 
   suite('setAppearance on lock/unlock', function() {
@@ -801,7 +819,10 @@ suite('system/Statusbar', function() {
     }
 
     setup(function() {
-      app = {};
+      app = {
+        isFullScreen: function() {},
+        isFullScreenLayout: function() {}
+      };
       MockService.currentApp = app;
       setAppearanceStub = this.sinon.stub(StatusBar, 'setAppearance');
       pauseUpdateStub = this.sinon.stub(StatusBar, 'pauseUpdate');
@@ -810,18 +831,26 @@ suite('system/Statusbar', function() {
     });
 
     test('stackchanged', function() {
+      this.sinon.stub(app, 'isFullScreen').returns(false);
+      this.sinon.stub(app, 'isFullScreenLayout').returns(false);
       StatusBar.element.classList.add('hidden');
       var event = new CustomEvent('stackchanged');
       StatusBar.handleEvent(event);
       assert.isFalse(StatusBar.element.classList.contains('hidden'));
+      assert.isFalse(StatusBar.element.classList.contains('fullscreen'));
+      assert.isFalse(StatusBar.element.classList.contains('fullscreen-layout'));
       assert.isTrue(setAppearanceStub.called);
     });
 
     test('rocketbar-deactivated', function() {
+      this.sinon.stub(app, 'isFullScreen').returns(false);
+      this.sinon.stub(app, 'isFullScreenLayout').returns(false);
       StatusBar.element.classList.add('hidden');
       var event = new CustomEvent('rocketbar-deactivated');
       StatusBar.handleEvent(event);
       assert.isFalse(StatusBar.element.classList.contains('hidden'));
+      assert.isFalse(StatusBar.element.classList.contains('fullscreen'));
+      assert.isFalse(StatusBar.element.classList.contains('fullscreen-layout'));
       assert.isTrue(setAppearanceStub.called);
     });