Permalink
Browse files

Bug 816647 - mozFullScreen meets inline activity, r=djf+timdream,

    a=blocking-basecamp
  • Loading branch information...
1 parent 5d150b2 commit e7a1a2d0ab1c5416d26b63d92f7227f8c7b1592c @alivedise alivedise committed Dec 4, 2012
Showing with 10 additions and 3 deletions.
  1. +1 −1 apps/system/js/statusbar.js
  2. +8 −2 apps/system/js/window_manager.js
  3. +1 −0 apps/system/style/zindex.css
@@ -55,7 +55,7 @@ var StatusBar = {
/* For other modules to acquire */
get height() {
if (this.screen.classList.contains('fullscreen-app') ||
- document.querySelector('#screen:-moz-full-screen-ancestor')) {
+ document.mozFullScreen) {
return 0;
} else if (this.screen.classList.contains('active-statusbar')) {
return this.attentionBar.offsetHeight;
@@ -230,8 +230,14 @@ var WindowManager = (function() {
var frame = inlineActivityFrame;
frame.style.width = appFrame.style.width;
- frame.style.height = appFrame.style.height;
- frame.style.top = appFrame.offsetTop + 'px';
+
+ if (document.mozFullScreen) {
+ frame.style.height = window.innerHeight + 'px';
+ frame.style.top = '0px';
+ } else {
+ frame.style.height = appFrame.style.height;
+ frame.style.top = appFrame.offsetTop + 'px';
+ }
}
function setFrameBackgroundBlob(frame, blob, transparent) {
@@ -182,6 +182,7 @@
/* We promotes the following overlays on top of the fullscreen web content. */
+#screen:-moz-full-screen-ancestor > [data-z-index-level="app"] > iframe.appWindow.inlineActivity,
#screen:-moz-full-screen-ancestor > [data-z-index-level="sleep-menu"],
#screen:-moz-full-screen-ancestor > [data-z-index-level="list-menu"],
#screen.locked:-moz-full-screen-ancestor > [data-z-index-level="statusbar"],

0 comments on commit e7a1a2d

Please sign in to comment.