Skip to content

GitLab

T
tangled
Commit 5f91a2f8 authored by François Degros's avatar François Degros Committed by Commit Bot
Browse files
Options

[Files app] ES6 class for app_state_controller.js 

Bug: 778674
Change-Id: I59a4674bc7e0675686271308795e07866b3eef96
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1609722
Auto-Submit: François Degros <fdegros@chromium.org>
Commit-Queue: Luciano Pacheco <lucmult@chromium.org>
Reviewed-by: default avatarLuciano Pacheco <lucmult@chromium.org>
Cr-Commit-Position: refs/heads/master@{#659375}
parent dd4bd386
Hide whitespace changes
Inline Side-by-side
Showing with 197 additions and 205 deletions
ui/file_manager/file_manager/foreground/js/app_state_controller.js
View file @ 5f91a2f8
...@@ -2,46 +2,219 @@ ...@@ -2,46 +2,219 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
/**
* @param {DialogType} dialogType class AppStateController {
* @constructor
* @struct
*/
function AppStateController(dialogType) {
/** /**
* @const {string} * @param {DialogType} dialogType
* @private */
constructor(dialogType) {
/** @private @const {string} */
this.viewOptionStorageKey_ = 'file-manager-' + dialogType;
/** @private {?DirectoryModel} */
this.directoryModel_ = null;
/** @private {?FileManagerUI} */
this.ui_ = null;
/** @private {*} */
this.viewOptions_ = null;
/**
* Preferred sort field of file list. This will be ignored in the Recent
* folder, since it always uses descendant order of date-mofidied.
* @private {string}
*/
this.fileListSortField_ = AppStateController.DEFAULT_SORT_FIELD;
/**
* Preferred sort direction of file list. This will be ignored in the Recent
* folder, since it always uses descendant order of date-mofidied.
* @private {string}
*/
this.fileListSortDirection_ = AppStateController.DEFAULT_SORT_DIRECTION;
}
/**
* @return {Promise}
*/ */
this.viewOptionStorageKey_ = 'file-manager-' + dialogType; loadInitialViewOptions() {
// Load initial view option.
return new Promise((fulfill, reject) => {
chrome.storage.local.get(this.viewOptionStorageKey_, values => {
if (chrome.runtime.lastError) {
reject(
'Failed to load view options: ' +
chrome.runtime.lastError.message);
} else {
fulfill(values);
}
});
})
.then(values => {
this.viewOptions_ = {};
const value = values[this.viewOptionStorageKey_];
if (!value) {
return;
}
/** @private {DirectoryModel} */ // Load the global default options.
this.directoryModel_ = null; try {
this.viewOptions_ = JSON.parse(value);
} catch (ignore) {
}
// Override with window-specific options.
if (window.appState && window.appState.viewOptions) {
for (const key in window.appState.viewOptions) {
if (window.appState.viewOptions.hasOwnProperty(key)) {
this.viewOptions_[key] = window.appState.viewOptions[key];
}
}
}
})
.catch(error => {
this.viewOptions_ = {};
console.error(error);
});
}
/** /**
* @type {FileManagerUI} * @param {!FileManagerUI} ui
* @private * @param {!DirectoryModel} directoryModel
*/
initialize(ui, directoryModel) {
assert(this.viewOptions_);
this.ui_ = ui;
this.directoryModel_ = directoryModel;
// Register event listeners.
ui.listContainer.table.addEventListener(
'column-resize-end', this.saveViewOptions.bind(this));
directoryModel.getFileList().addEventListener(
'sorted', this.onFileListSorted_.bind(this));
directoryModel.getFileFilter().addEventListener(
'changed', this.onFileFilterChanged_.bind(this));
directoryModel.addEventListener(
'directory-changed', this.onDirectoryChanged_.bind(this));
// Restore preferences.
this.ui_.setCurrentListType(
this.viewOptions_.listType || ListContainer.ListType.DETAIL);
if (this.viewOptions_.sortField) {
this.fileListSortField_ = this.viewOptions_.sortField;
}
if (this.viewOptions_.sortDirection) {
this.fileListSortDirection_ = this.viewOptions_.sortDirection;
}
this.directoryModel_.getFileList().sort(
this.fileListSortField_, this.fileListSortDirection_);
if (this.viewOptions_.isAllAndroidFoldersVisible) {
this.directoryModel_.getFileFilter().setAllAndroidFoldersVisible(true);
}
if (this.viewOptions_.columnConfig) {
this.ui_.listContainer.table.columnModel.restoreColumnConfig(
this.viewOptions_.columnConfig);
}
}
/**
* Saves current view option.
*/ */
this.ui_ = null; saveViewOptions() {
const prefs = {
sortField: this.fileListSortField_,
sortDirection: this.fileListSortDirection_,
columnConfig: {},
listType: this.ui_.listContainer.currentListType,
isAllAndroidFoldersVisible:
this.directoryModel_.getFileFilter().isAllAndroidFoldersVisible()
};
const cm = this.ui_.listContainer.table.columnModel;
prefs.columnConfig = cm.exportColumnConfig();
// Save the global default.
const items = {};
items[this.viewOptionStorageKey_] = JSON.stringify(prefs);
chrome.storage.local.set(items, () => {
if (chrome.runtime.lastError) {
console.error(
'Failed to save view options: ' + chrome.runtime.lastError.message);
}
});
// Save the window-specific preference.
if (window.appState) {
window.appState.viewOptions = prefs;
appUtil.saveAppState();
}
}
/** /**
* @type {*}
* @private * @private
*/ */
this.viewOptions_ = null; onFileListSorted_() {
const currentDirectory = this.directoryModel_.getCurrentDirEntry();
if (!currentDirectory) {
return;
}
// Update preferred sort field and direction only when the current directory
// is not Recent folder.
if (!util.isRecentRoot(currentDirectory)) {
const currentSortStatus = this.directoryModel_.getFileList().sortStatus;
this.fileListSortField_ = currentSortStatus.field;
this.fileListSortDirection_ = currentSortStatus.direction;
}
this.saveViewOptions();
}
/** /**
* Preferred sort field of file list. This will be ignored in the Recent * @private
* folder, since it always uses descendant order of date-mofidied.
* @private {string}
*/ */
this.fileListSortField_ = AppStateController.DEFAULT_SORT_FIELD; onFileFilterChanged_() {
const isAllAndroidFoldersVisible =
this.directoryModel_.getFileFilter().isAllAndroidFoldersVisible();
if (this.viewOptions_.isAllAndroidFoldersVisible !==
isAllAndroidFoldersVisible) {
this.viewOptions_.isAllAndroidFoldersVisible = isAllAndroidFoldersVisible;
this.saveViewOptions();
}
}
/** /**
* Preferred sort direction of file list. This will be ignored in the Recent * @param {Event} event
* folder, since it always uses descendant order of date-mofidied. * @private
* @private {string}
*/ */
this.fileListSortDirection_ = AppStateController.DEFAULT_SORT_DIRECTION; onDirectoryChanged_(event) {
if (!event.newDirEntry) {
return;
}
// Sort the file list by:
// 1) 'date-mofidied' and 'desc' order on Recent folder.
// 2) preferred field and direction on other folders.
const isOnRecent = util.isRecentRoot(event.newDirEntry);
const isOnRecentBefore =
event.previousDirEntry && util.isRecentRoot(event.previousDirEntry);
if (isOnRecent != isOnRecentBefore) {
if (isOnRecent) {
this.directoryModel_.getFileList().sort(
AppStateController.DEFAULT_SORT_FIELD,
AppStateController.DEFAULT_SORT_DIRECTION);
} else {
this.directoryModel_.getFileList().sort(
this.fileListSortField_, this.fileListSortDirection_);
}
}
// TODO(mtomasz): Consider remembering the selection.
appUtil.updateAppState(
this.directoryModel_.getCurrentDirEntry() ?
this.directoryModel_.getCurrentDirEntry().toURL() :
'',
'' /* selectionURL */, '' /* opt_param */);
}
} }
/** /**
...@@ -55,184 +228,3 @@ AppStateController.DEFAULT_SORT_FIELD = 'modificationTime'; ...@@ -55,184 +228,3 @@ AppStateController.DEFAULT_SORT_FIELD = 'modificationTime';
* @const {string} * @const {string}
*/ */
AppStateController.DEFAULT_SORT_DIRECTION = 'desc'; AppStateController.DEFAULT_SORT_DIRECTION = 'desc';
/**
* @return {Promise}
*/
AppStateController.prototype.loadInitialViewOptions = function() {
// Load initial view option.
return new Promise((fulfill, reject) => {
chrome.storage.local.get(this.viewOptionStorageKey_, values => {
if (chrome.runtime.lastError) {
reject(
'Failed to load view options: ' +
chrome.runtime.lastError.message);
} else {
fulfill(values);
}
});
})
.then(values => {
this.viewOptions_ = {};
const value = values[this.viewOptionStorageKey_];
if (!value) {
return;
}
// Load the global default options.
try {
this.viewOptions_ = JSON.parse(value);
} catch (ignore) {
}
// Override with window-specific options.
if (window.appState && window.appState.viewOptions) {
for (const key in window.appState.viewOptions) {
if (window.appState.viewOptions.hasOwnProperty(key)) {
this.viewOptions_[key] = window.appState.viewOptions[key];
}
}
}
})
.catch(error => {
this.viewOptions_ = {};
console.error(error);
});
};
/**
* @param {!FileManagerUI} ui
* @param {!DirectoryModel} directoryModel
*/
AppStateController.prototype.initialize = function(ui, directoryModel) {
assert(this.viewOptions_);
this.ui_ = ui;
this.directoryModel_ = directoryModel;
// Register event listeners.
ui.listContainer.table.addEventListener(
'column-resize-end', this.saveViewOptions.bind(this));
directoryModel.getFileList().addEventListener(
'sorted', this.onFileListSorted_.bind(this));
directoryModel.getFileFilter().addEventListener(
'changed', this.onFileFilterChanged_.bind(this));
directoryModel.addEventListener(
'directory-changed', this.onDirectoryChanged_.bind(this));
// Restore preferences.
this.ui_.setCurrentListType(
this.viewOptions_.listType || ListContainer.ListType.DETAIL);
if (this.viewOptions_.sortField) {
this.fileListSortField_ = this.viewOptions_.sortField;
}
if (this.viewOptions_.sortDirection) {
this.fileListSortDirection_ = this.viewOptions_.sortDirection;
}
this.directoryModel_.getFileList().sort(
this.fileListSortField_, this.fileListSortDirection_);
if (this.viewOptions_.isAllAndroidFoldersVisible) {
this.directoryModel_.getFileFilter().setAllAndroidFoldersVisible(true);
}
if (this.viewOptions_.columnConfig) {
this.ui_.listContainer.table.columnModel.restoreColumnConfig(
this.viewOptions_.columnConfig);
}
};
/**
* Saves current view option.
*/
AppStateController.prototype.saveViewOptions = function() {
const prefs = {
sortField: this.fileListSortField_,
sortDirection: this.fileListSortDirection_,
columnConfig: {},
listType: this.ui_.listContainer.currentListType,
isAllAndroidFoldersVisible:
this.directoryModel_.getFileFilter().isAllAndroidFoldersVisible()
};
const cm = this.ui_.listContainer.table.columnModel;
prefs.columnConfig = cm.exportColumnConfig();
// Save the global default.
const items = {};
items[this.viewOptionStorageKey_] = JSON.stringify(prefs);
chrome.storage.local.set(items, () => {
if (chrome.runtime.lastError) {
console.error(
'Failed to save view options: ' + chrome.runtime.lastError.message);
}
});
// Save the window-specific preference.
if (window.appState) {
window.appState.viewOptions = prefs;
appUtil.saveAppState();
}
};
/**
* @private
*/
AppStateController.prototype.onFileListSorted_ = function() {
const currentDirectory = this.directoryModel_.getCurrentDirEntry();
if (!currentDirectory) {
return;
}
// Update preferred sort field and direction only when the current directory
// is not Recent folder.
if (!util.isRecentRoot(currentDirectory)) {
const currentSortStatus = this.directoryModel_.getFileList().sortStatus;
this.fileListSortField_ = currentSortStatus.field;
this.fileListSortDirection_ = currentSortStatus.direction;
}
this.saveViewOptions();
};
/**
* @private
*/
AppStateController.prototype.onFileFilterChanged_ = function() {
const isAllAndroidFoldersVisible =
this.directoryModel_.getFileFilter().isAllAndroidFoldersVisible();
if (this.viewOptions_.isAllAndroidFoldersVisible !==
isAllAndroidFoldersVisible) {
this.viewOptions_.isAllAndroidFoldersVisible = isAllAndroidFoldersVisible;
this.saveViewOptions();
}
};
/**
* @param {Event} event
* @private
*/
AppStateController.prototype.onDirectoryChanged_ = function(event) {
if (!event.newDirEntry) {
return;
}
// Sort the file list by:
// 1) 'date-mofidied' and 'desc' order on Recent folder.
// 2) preferred field and direction on other folders.
const isOnRecent = util.isRecentRoot(event.newDirEntry);
const isOnRecentBefore =
event.previousDirEntry && util.isRecentRoot(event.previousDirEntry);
if (isOnRecent != isOnRecentBefore) {
if (isOnRecent) {
this.directoryModel_.getFileList().sort(
AppStateController.DEFAULT_SORT_FIELD,
AppStateController.DEFAULT_SORT_DIRECTION);
} else {
this.directoryModel_.getFileList().sort(
this.fileListSortField_, this.fileListSortDirection_);
}
}
// TODO(mtomasz): Consider remembering the selection.
appUtil.updateAppState(
this.directoryModel_.getCurrentDirEntry() ?
this.directoryModel_.getCurrentDirEntry().toURL() :
'',
'' /* selectionURL */, '' /* opt_param */);
};
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