Merge pull request #31856 from aosmond/bug1194476

Bug 1194476 - Leave camera background as black instead of transparent… r=jdarcangelo
mozilla-b2g · Sep 18, 2015 · dcf00cb · dcf00cb
2 parents 93bc4fb + 6b8ca9e
commit dcf00cb
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 6 deletions.
diff --git a/apps/camera/js/views/viewfinder.js b/apps/camera/js/views/viewfinder.js
@@ -155,7 +155,6 @@ module.exports = View.extend({
     debug('fade-out');
     var self = this;
     this.hide();
-    document.body.classList.remove('no-background');
     clearTimeout(this.fadeTimeout);
     this.fadeTimeout = setTimeout(function() {
       self.emit('fadedout');
@@ -172,7 +171,6 @@ module.exports = View.extend({
     this.show();
     clearTimeout(this.fadeTimeout);
     this.fadeTimeout = setTimeout(function() {
-      document.body.classList.add('no-background');
       self.el.style.transitionDuration = '';
       self.emit('fadedin');
       if (done) { done(); }

diff --git a/apps/camera/style/app.css b/apps/camera/style/app.css
@@ -22,10 +22,6 @@ body {
   -moz-user-select: none; /* 1 */
 }
 
-body.no-background {
-  background-color: transparent;
-}
-
 /** Mini reset
  ---------------------------------------------------------*/