Merge pull request #16636 from wilsonpage/bug/975192

Bug 975192 - [B2G][Camera] No option to cancel out of taking a new photo...

apps/camera/js/controllers/controls.js

@@ -59,6 +59,11 @@ ControlsController.prototype.configure = function() {
   this.controls.set('cancel', isCancellable);
   this.controls.set('switchable', isSwitchable);
   this.controls.set('mode', initialMode);
+
+  debug('cancelable: %s', isCancellable);
+  debug('switchable: %s', isSwitchable);
+  debug('gallery: %s', showGallery);
+  debug('mode: %s', initialMode);
 };
 
 ControlsController.prototype.disableButtons = function() {

apps/camera/js/lib/setting.js

@@ -14,12 +14,6 @@ var model = require('vendor/model');
 
 module.exports = Setting;
 
-/**
- * Locals
- */
-
-var noop = function() {};
-
 // Mixin Model methods
 model(Setting.prototype);
 
@@ -230,14 +224,12 @@ Setting.prototype.save = function() {
  * @param  {Function} done
  * @public
  */
-Setting.prototype.fetch = function(done) {
-  done = done || noop;
-  if (!this.get('persistent')) { return done(); }
+Setting.prototype.fetch = function() {
+  if (!this.get('persistent')) { return; }
   debug('fetch value key: %s', this.key);
   var value = localStorage.getItem('setting:' + this.key);
   debug('fetched %s value: %s', this.key, value);
   if (value) { this.select(value, { silent: true }); }
-  done();
 };
 
 /**

apps/camera/js/main.js

@@ -21,7 +21,6 @@ require(['config/require', 'config'], function() {
     var settings = new Settings(config.get());
     var GeoLocation = require('lib/geo-location');
     var Activity = require('lib/activity');
-    var allDone = require('lib/all-done');
     var Storage = require('lib/storage');
     var controllers = {
       hud: require('controllers/hud'),
@@ -67,9 +66,8 @@ require(['config/require', 'config'], function() {
 
     // Async jobs to be
     // done before boot...
-    var done = allDone()(app.boot);
-    app.activity.check(done());
-    app.settings.fetch(done());
+    app.settings.fetch();
+    app.activity.check(app.boot);
   });
 
   require(['boot']);

apps/camera/js/views/controls.js

@@ -74,9 +74,7 @@ module.exports = View.extend({
       '<a class="gallery-button test-gallery js-btn" name="gallery">' +
         '<span class="icon-gallery rotates"></span>' +
       '</a>' +
-      '<a class="cancel-pick test-cancel-pick js-btn" name="cancel">' +
-        '<span></span>' +
-      '</a>' +
+      '<a class="cancel-pick test-cancel-pick js-btn" name="cancel"></a>' +
       '<span class="video-timer test-video-timer js-video-timer">00:00</span>' +
     '</div>';
   },

apps/camera/style/controls.css

@@ -66,24 +66,19 @@
  * @recording=true
  */
 
+.controls[cancel=true] .gallery-button,
 .controls[recording=true] .gallery-button {
   display: none;
 }
 
-/** Gallery Button Icon
- ---------------------------------------------------------*/
-
-.gallery-button span {
-  /*background-image: url(images/grid.png);*/
-}
-
 /** Cancel Pick Button
  ---------------------------------------------------------*/
 
 .cancel-pick {
   display: none;
   width: 100%;
   height: 100%;
+  background: url(images/actionicon_cancel.png) center no-repeat;
 }
 
 /**
@@ -98,7 +93,7 @@
  ---------------------------------------------------------*/
 
 .cancel-pick span {
-  background-image: url(images/actionicon_cancel.png);
+
 }
 
 /** Video Timer