Commit 0e0cf41c authored by Jérémie Boulic's avatar Jérémie Boulic Committed by Chromium LUCI CQ

Files app: Generate more JS modules in the foreground page

In //ui/file_manager/file_manager/foreground/js/:
- drop_effect_and_label.js
- empty_folder_controller.js

In //ui/file_manager/file_manager/foreground/js/ui/:
- empty_folder.js
- files_alert_dialog.js

Bug: 1133186
Change-Id: I140cc96d9721eb37747216546a5f59fc442342e9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2620920Reviewed-by: default avatarLuciano Pacheco <lucmult@chromium.org>
Commit-Queue: Jeremie Boulic <jboulic@chromium.org>
Cr-Commit-Position: refs/heads/master@{#841954}
parent 60eac7bd
...@@ -33,6 +33,8 @@ js_type_check("closure_compile_jsmodules") { ...@@ -33,6 +33,8 @@ js_type_check("closure_compile_jsmodules") {
":crossover_search_utils.m", ":crossover_search_utils.m",
":directory_contents.m", ":directory_contents.m",
":directory_model.m", ":directory_model.m",
":drop_effect_and_label.m",
":empty_folder_controller.m",
":fake_android_app_list_model.m", ":fake_android_app_list_model.m",
":file_list_model.m", ":file_list_model.m",
":file_watcher.m", ":file_watcher.m",
...@@ -451,6 +453,12 @@ js_library("directory_tree_naming_controller") { ...@@ -451,6 +453,12 @@ js_library("directory_tree_naming_controller") {
js_library("drop_effect_and_label") { js_library("drop_effect_and_label") {
} }
js_library("drop_effect_and_label.m") {
sources = [ "$root_gen_dir/ui/file_manager/file_manager/foreground/js/drop_effect_and_label.m.js" ]
extra_deps = [ ":modulize" ]
}
js_library("elements_importer") { js_library("elements_importer") {
} }
...@@ -462,6 +470,21 @@ js_library("empty_folder_controller") { ...@@ -462,6 +470,21 @@ js_library("empty_folder_controller") {
] ]
} }
js_library("empty_folder_controller.m") {
sources = [ "$root_gen_dir/ui/file_manager/file_manager/foreground/js/empty_folder_controller.m.js" ]
deps = [
":constants.m",
":directory_model.m",
":file_list_model.m",
"ui:empty_folder.m",
"ui:files_alert_dialog.m",
"//ui/file_manager/file_manager/common/js:util.m",
"//ui/webui/resources/js:assert.m",
]
extra_deps = [ ":modulize" ]
}
js_library("file_list_model") { js_library("file_list_model") {
deps = [ deps = [
"metadata:metadata_model", "metadata:metadata_model",
...@@ -1123,6 +1146,8 @@ js_modulizer("modulize") { ...@@ -1123,6 +1146,8 @@ js_modulizer("modulize") {
"mock_directory_model.js", "mock_directory_model.js",
"fake_android_app_list_model.js", "fake_android_app_list_model.js",
"mock_folder_shortcut_data_model.js", "mock_folder_shortcut_data_model.js",
"drop_effect_and_label.js",
"empty_folder_controller.js",
] ]
namespace_rewrites = cr_namespace_rewrites namespace_rewrites = cr_namespace_rewrites
......
...@@ -6,17 +6,13 @@ ...@@ -6,17 +6,13 @@
* Drop effect names supported as a value of DataTransfer.dropEffect. * Drop effect names supported as a value of DataTransfer.dropEffect.
* @enum {string} * @enum {string}
*/ */
const DropEffectType = { /* #export */ const DropEffectType =
NONE: 'none', {NONE: 'none', COPY: 'copy', MOVE: 'move', LINK: 'link'};
COPY: 'copy',
MOVE: 'move',
LINK: 'link'
};
/** /**
* Represents a drop effect and a label to describe it. * Represents a drop effect and a label to describe it.
*/ */
class DropEffectAndLabel { /* #export */ class DropEffectAndLabel {
/** /**
* @param {!DropEffectType} dropEffect * @param {!DropEffectType} dropEffect
* @param {?string} label * @param {?string} label
......
...@@ -2,10 +2,18 @@ ...@@ -2,10 +2,18 @@
// 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.
// #import {FilesAlertDialog} from './ui/files_alert_dialog.m.js';
// #import {EmptyFolder} from './ui/empty_folder.m.js';
// #import {FileListModel} from './file_list_model.m.js';
// #import {DirectoryModel} from './directory_model.m.js';
// #import {str, strf, util} from '../../common/js/util.m.js';
// #import {constants} from './constants.m.js';
// #import {assert} from 'chrome://resources/js/assert.m.js';
/** /**
* Empty folder controller. * Empty folder controller.
*/ */
class EmptyFolderController { /* #export */ class EmptyFolderController {
/** /**
* @param {!EmptyFolder} emptyFolder Empty folder ui. * @param {!EmptyFolder} emptyFolder Empty folder ui.
* @param {!DirectoryModel} directoryModel Directory model. * @param {!DirectoryModel} directoryModel Directory model.
......
...@@ -23,7 +23,11 @@ group("closure_compile") { ...@@ -23,7 +23,11 @@ group("closure_compile") {
js_type_check("closure_compile_jsmodules") { js_type_check("closure_compile_jsmodules") {
uses_js_modules = true uses_js_modules = true
deps = [ ":file_list_selection_model.m" ] deps = [
":empty_folder.m",
":file_list_selection_model.m",
":files_alert_dialog.m",
]
} }
js_type_check("closure_compile_module") { js_type_check("closure_compile_module") {
...@@ -220,6 +224,13 @@ js_library("empty_folder") { ...@@ -220,6 +224,13 @@ js_library("empty_folder") {
deps = [ "//ui/webui/resources/js:util" ] deps = [ "//ui/webui/resources/js:util" ]
} }
js_library("empty_folder.m") {
sources = [ "$root_gen_dir/ui/file_manager/file_manager/foreground/js/ui/empty_folder.m.js" ]
deps = [ "//ui/webui/resources/js:util.m" ]
extra_deps = [ ":modulize" ]
}
js_library("file_grid") { js_library("file_grid") {
deps = [ deps = [
":drag_selector", ":drag_selector",
...@@ -394,6 +405,16 @@ js_library("files_alert_dialog") { ...@@ -394,6 +405,16 @@ js_library("files_alert_dialog") {
deps = [ "//ui/webui/resources/js/cr/ui:dialogs" ] deps = [ "//ui/webui/resources/js/cr/ui:dialogs" ]
} }
js_library("files_alert_dialog.m") {
sources = [ "$root_gen_dir/ui/file_manager/file_manager/foreground/js/ui/files_alert_dialog.m.js" ]
deps = [
"//ui/file_manager/file_manager/common/js:util.m",
"//ui/webui/resources/js/cr/ui:dialogs.m",
]
extra_deps = [ ":modulize" ]
}
# TODO(tapted): Move this into //ui/file_manager/base. # TODO(tapted): Move this into //ui/file_manager/base.
js_library("files_confirm_dialog") { js_library("files_confirm_dialog") {
visibility += [ "//ui/file_manager/gallery/*" ] visibility += [ "//ui/file_manager/gallery/*" ]
...@@ -577,7 +598,11 @@ js_test_gen_html("js_test_gen_html") { ...@@ -577,7 +598,11 @@ js_test_gen_html("js_test_gen_html") {
} }
js_modulizer("modulize") { js_modulizer("modulize") {
input_files = [ "file_list_selection_model.js" ] input_files = [
"empty_folder.js",
"file_list_selection_model.js",
"files_alert_dialog.js",
]
namespace_rewrites = cr_namespace_rewrites namespace_rewrites = cr_namespace_rewrites
} }
...@@ -2,7 +2,9 @@ ...@@ -2,7 +2,9 @@
// 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.
class EmptyFolder { // #import {queryRequiredElement} from 'chrome://resources/js/util.m.js';
/* #export */ class EmptyFolder {
/** /**
* Empty folder UI. * Empty folder UI.
* @param {!HTMLElement} emptyFolder DOM element of empty folder. * @param {!HTMLElement} emptyFolder DOM element of empty folder.
......
...@@ -2,10 +2,13 @@ ...@@ -2,10 +2,13 @@
// 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.
// #import {util} from '../../../common/js/util.m.js';
// #import {AlertDialog} from 'chrome://resources/js/cr/ui/dialogs.m.js';
/** /**
* Alert dialog. * Alert dialog.
*/ */
class FilesAlertDialog extends cr.ui.dialogs.AlertDialog { /* #export */ class FilesAlertDialog extends cr.ui.dialogs.AlertDialog {
/** /**
* @param {!HTMLElement} parentNode * @param {!HTMLElement} parentNode
*/ */
......
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