Merge pull request #18134 from justindarc/bug993043

Bug 993043 - [Camera][Buri] viewfinder stays zoomed in and doesn't resto...

apps/camera/js/controllers/camera.js

@@ -64,6 +64,7 @@ CameraController.prototype.bindEvents = function() {
   app.on('blur', this.onBlur);
   app.on('settings:configured', this.onSettingsConfigured);
   app.on('change:batteryStatus', this.onBatteryStatusChange);
+  app.on('previewgallery:opened', this.onPreviewGalleryOpened);
 
   // Settings
   settings.recorderProfiles.on('change:selected', this.onRecorderProfileChange);
@@ -335,4 +336,12 @@ CameraController.prototype.onStorageStateChange = function(value) {
   }
 };
 
+/**
+ * Resets the camera zoom when the preview gallery
+ * is opened.
+ */
+CameraController.prototype.onPreviewGalleryOpened = function() {
+  this.camera.configureZoom(this.camera.previewSize());
+};
+
 });

apps/camera/js/controllers/zoom-bar.js

@@ -32,6 +32,7 @@ function ZoomBarController(app) {
 
 ZoomBarController.prototype.bindEvents = function() {
   this.zoomBar.on('change', this.onChange);
+  this.camera.on('zoomconfigured', this.onZoomConfigured);
   this.camera.on('zoomchanged', this.onZoomChanged);
   this.viewfinder.on('pinchStart', this.onPinchStart);
   this.viewfinder.on('pinchEnd', this.onPinchEnd);
@@ -45,6 +46,10 @@ ZoomBarController.prototype.onChange = function(value) {
   this.camera.setZoom(zoom);
 };
 
+ZoomBarController.prototype.onZoomConfigured = function() {
+  this.zoomBar.hide();
+};
+
 ZoomBarController.prototype.onZoomChanged = function(zoom) {
   var minimumZoom = this.camera.getMinimumZoom();
   var maximumZoom = this.camera.getMaximumZoom();

apps/camera/js/lib/camera.js

@@ -870,6 +870,9 @@ Camera.prototype.configureZoom = function(previewSize) {
       }
     }
   };
+
+  this.setZoom(this.getMinimumZoom());
+  this.emit('zoomconfigured');
 };
 
 Camera.prototype.getMinimumZoom = function() {

apps/camera/js/views/zoom-bar.js

@@ -192,12 +192,20 @@ module.exports = View.extend({
   resetInactivityTimeout: function() {
     window.clearTimeout(this._inactivityTimeout);
 
-    this.el.classList.add('zooming');
+    this.show();
 
     var self = this;
     this._inactivityTimeout = window.setTimeout(function() {
-      self.el.classList.remove('zooming');
+      self.hide();
     }, constants.ZOOM_BAR_INACTIVITY_TIMEOUT);
+  },
+
+  show: function() {
+    this.el.classList.add('zooming');
+  },
+
+  hide: function() {
+    this.el.classList.remove('zooming');
   }
 });