Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(59)

Unified Diff: chrome/browser/resources/file_manager/js/photo/gallery.js

Issue 12316118: Enabled Mosaic view on each volume. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased. Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/resources/file_manager/js/photo/gallery.js
diff --git a/chrome/browser/resources/file_manager/js/photo/gallery.js b/chrome/browser/resources/file_manager/js/photo/gallery.js
index a27e5d43dd666f86443d3fb49485c3b7407e0edb..a330743e0335b06eab4e95191fbb1b2614305024 100644
--- a/chrome/browser/resources/file_manager/js/photo/gallery.js
+++ b/chrome/browser/resources/file_manager/js/photo/gallery.js
@@ -137,7 +137,6 @@ Gallery.openStandalone = function(path, pageState, opt_callback) {
metadataCache: MetadataCache.createFull(),
pageState: pageState,
onClose: onClose,
- allowMosaic: true, /* For debugging purposes */
displayStringFunction: strf
};
Gallery.open(context, urls, selectedUrls);
@@ -148,18 +147,30 @@ Gallery.openStandalone = function(path, pageState, opt_callback) {
/**
* Tools fade-out timeout im milliseconds.
+ * @const
* @type {number}
*/
Gallery.FADE_TIMEOUT = 3000;
/**
* First time tools fade-out timeout im milliseconds.
+ * @const
* @type {number}
*/
Gallery.FIRST_FADE_TIMEOUT = 1000;
/**
+ * Time until mosaic is initialized in the background. Used to make gallery
+ * in the slide mode load faster. In miiliseconds.
+ * @const
+ * @type {number}
+ */
+Gallery.MOSAIC_BACKGROUND_INIT_DELAY = 1000;
+
+/**
* Types of metadata Gallery uses (to query the metadata cache).
+ * @const
+ * @type {string}
*/
Gallery.METADATA_TYPE = 'thumbnail|filesystem|media|streaming';
@@ -167,7 +178,6 @@ Gallery.METADATA_TYPE = 'thumbnail|filesystem|media|streaming';
* Initialize listeners.
* @private
*/
-
Gallery.prototype.initListeners_ = function() {
if (!util.TEST_HARNESS)
this.document_.oncontextmenu = function(e) { e.preventDefault(); };
@@ -259,15 +269,13 @@ Gallery.prototype.initDom_ = function() {
var onThumbnailError = this.context_.onThumbnailError || function() {};
- if (this.context_.allowMosaic) {
- this.modeButton_ = util.createChild(this.toolbar_, 'button mode', 'button');
- this.modeButton_.addEventListener('click',
- this.toggleMode_.bind(this, null));
+ this.modeButton_ = util.createChild(this.toolbar_, 'button mode', 'button');
+ this.modeButton_.addEventListener('click',
+ this.toggleMode_.bind(this, null));
- this.mosaicMode_ = new MosaicMode(content,
- this.dataModel_, this.selectionModel_, this.metadataCache_,
- this.toggleMode_.bind(this, null), onThumbnailError);
- }
+ this.mosaicMode_ = new MosaicMode(content,
+ this.dataModel_, this.selectionModel_, this.metadataCache_,
+ this.toggleMode_.bind(this, null), onThumbnailError);
this.slideMode_ = new SlideMode(this.container_, content,
this.toolbar_, this.prompt_,
@@ -363,7 +371,8 @@ Gallery.prototype.load = function(urls, selectedUrls) {
} else {
this.setCurrentMode_(this.slideMode_);
var maybeLoadMosaic = function() {
- if (mosaic) mosaic.init();
+ if (mosaic)
+ mosaic.init();
cr.dispatchSimpleEvent(this, 'loaded');
}.bind(this);
/* TODO: consider nice blow-up animation for the first image */

Powered by Google App Engine
This is Rietveld 408576698