Commit 3d69f33e authored by mtomasz@chromium.org's avatar mtomasz@chromium.org

Fixed slide show in Files.app's gallery.

Because of typo, gallery wasn't showing up. This patch fixes the typo and also converts every instance of toggleFullscreen to toggleFullScreen for consistency.

TEST=Enter Files.app, go to gallery, fire the slide show.
BUG=232087

Review URL: https://codereview.chromium.org/14316003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194764 0039d316-1c4b-4281-b951-d872f2087c98
parent c3371c23
...@@ -51,7 +51,7 @@ function FullWindowVideoControls( ...@@ -51,7 +51,7 @@ function FullWindowVideoControls(
VideoControls.call(this, VideoControls.call(this,
controlsContainer, controlsContainer,
onPlaybackError, onPlaybackError,
this.toggleFullscreen_.bind(this), this.toggleFullScreen_.bind(this),
videoContainer); videoContainer);
this.playerContainer_ = playerContainer; this.playerContainer_ = playerContainer;
...@@ -109,7 +109,7 @@ FullWindowVideoControls.prototype.restorePlayState = function() { ...@@ -109,7 +109,7 @@ FullWindowVideoControls.prototype.restorePlayState = function() {
* Toggles the full screen mode. * Toggles the full screen mode.
* @private * @private
*/ */
FullWindowVideoControls.prototype.toggleFullscreen_ = function() { FullWindowVideoControls.prototype.toggleFullScreen_ = function() {
util.toggleFullScreen(this.playerContainer_.ownerDocument, util.toggleFullScreen(this.playerContainer_.ownerDocument,
!util.isFullScreen()); !util.isFullScreen());
}; };
......
...@@ -1052,7 +1052,7 @@ SlideMode.prototype.startSlideshow = function(opt_interval, opt_event) { ...@@ -1052,7 +1052,7 @@ SlideMode.prototype.startSlideshow = function(opt_interval, opt_event) {
this.fullscreenBeforeSlideshow_ = util.isFullScreen(); this.fullscreenBeforeSlideshow_ = util.isFullScreen();
if (!this.fullscreenBeforeSlideshow_) { if (!this.fullscreenBeforeSlideshow_) {
// Wait until the zoom animation from the mosaic mode is done. // Wait until the zoom animation from the mosaic mode is done.
setTimeout(this.toggleFullscreen_.bind(this), setTimeout(this.toggleFullScreen_.bind(this),
ImageView.ZOOM_ANIMATION_DURATION); ImageView.ZOOM_ANIMATION_DURATION);
opt_interval = (opt_interval || SlideMode.SLIDESHOW_INTERVAL) + opt_interval = (opt_interval || SlideMode.SLIDESHOW_INTERVAL) +
SlideMode.FULLSCREEN_TOGGLE_DELAY; SlideMode.FULLSCREEN_TOGGLE_DELAY;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment