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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/resources/bookmark_manager/main.html

Issue 2097011: Bookmarks: Reorganize the HTML a bit to reduce loading flicker. (Closed) Base URL: git://codf21.jail/chromium.git
Patch Set: Created 10 years, 7 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/bookmark_manager/main.html
diff --git a/chrome/browser/resources/bookmark_manager/main.html b/chrome/browser/resources/bookmark_manager/main.html
index 485b95c20e5b456810fd0eb9b99f3f2fd2f47ab7..fa205a0d16ea8901d91607395b351b24ef298f13 100644
--- a/chrome/browser/resources/bookmark_manager/main.html
+++ b/chrome/browser/resources/bookmark_manager/main.html
@@ -43,18 +43,6 @@ found in the LICENSE file.
<script src="js/bmm.js"></script>
<script src="js/bmm/bookmark_list.js"></script>
<script src="js/bmm/bookmark_tree.js"></script>
-
-<script>
-
-// Sometimes the extension API is not initialized.
-if (!chrome.bookmarks)
- console.error('Bookmarks extension API is not avaiable');
-
-// Allow platform specific CSS rules.
-if (cr.isMac)
- document.documentElement.setAttribute('os', 'mac');
-
-</script>
</head>
<body i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize">
@@ -68,7 +56,7 @@ if (cr.isMac)
</div>
<div class="summary">
- <h3 i18n-content="title">Bookmark Manager</h3>
+ <h3 i18n-content="title"></h3>
<button menu="#organize-menu" tabindex="-1" i18n-content="organize_menu"></button>
</div>
@@ -80,6 +68,71 @@ if (cr.isMac)
<list id=list tabindex=2></list>
</div>
+<!-- Organize menu -->
+<command i18n-values=".label:rename_folder" id="rename-folder-command"></command>
+<command i18n-values=".label:edit" id="edit-command"></command>
+<command i18n-values=".label:show_in_folder" id="show-in-folder-command"></command>
+<command i18n-values=".label:cut" id="cut-command"></command>
+<command i18n-values=".label:copy" id="copy-command"></command>
+<command i18n-values=".label:paste" id="paste-command"></command>
+<command i18n-values=".label:delete" id="delete-command"></command>
+<command i18n-values=".label:sort" id="sort-command"></command>
+<command i18n-values=".label:add_new_bookmark" id="add-new-bookmark-command"></command>
+<command i18n-values=".label:new_folder" id="new-folder-command"></command>
+
+<!-- Tools menu -->
+<command i18n-values=".label:import_menu" id="import-menu-command"></command>
+<command i18n-values=".label:export_menu" id="export-menu-command"></command>
+
+<!-- open * are handled in canExecute handler -->
+<command id="open-in-new-tab-command"></command>
+<command id="open-in-background-tab-command"></command>
+<command id="open-in-new-window-command"></command>
+<command id="open-incognito-window-command"></command>
+<command id="open-in-same-window-command"></command>
+
+<!-- TODO(arv): I think the commands might be better created in code? -->
+
+<menu id="organize-menu">
+ <button command="#add-new-bookmark-command"></button>
+ <button command="#new-folder-command"></button>
+ <hr>
+ <button command="#rename-folder-command"></button>
+ <button command="#edit-command"></button>
+ <button command="#show-in-folder-command"></button>
+ <hr>
+ <button command="#cut-command"></button>
+ <button command="#copy-command"></button>
+ <button command="#paste-command"></button>
+ <hr>
+ <button command="#delete-command"></button>
+ <hr>
+ <button command="#sort-command"></button>
+ <hr>
+ <button command="#import-menu-command"></button>
+ <button command="#export-menu-command"></button>
+</menu>
+
+<menu id="context-menu">
+ <button command="#open-in-new-tab-command"></button>
+ <button command="#open-in-new-window-command"></button>
+ <button command="#open-incognito-window-command"></button>
+ <hr>
+ <button command="#rename-folder-command"></button>
+ <button command="#edit-command"></button>
+ <button command="#show-in-folder-command"></button>
+ <hr>
+ <button command="#cut-command"></button>
+ <button command="#copy-command"></button>
+ <button command="#paste-command"></button>
+ <hr>
+ <button command="#delete-command"></button>
+ <hr>
+ <button command="#add-new-bookmark-command"></button>
+ <button command="#new-folder-command"></button>
+</menu>
+
+<div id="drop-overlay"></div>
<script>
@@ -88,6 +141,39 @@ const BookmarkTree = bmm.BookmarkTree;
const ListItem = cr.ui.ListItem;
const TreeItem = cr.ui.TreeItem;
const LinkKind = cr.LinkKind;
+const Command = cr.ui.Command;
+const CommandBinding = cr.ui.CommandBinding;
+const Menu = cr.ui.Menu;
+const MenuButton = cr.ui.MenuButton;
+const Promise = cr.Promise;
+
+// Sometimes the extension API is not initialized.
+if (!chrome.bookmarks)
+ console.error('Bookmarks extension API is not avaiable');
+
+// Allow platform specific CSS rules.
+if (cr.isMac)
+ document.documentElement.setAttribute('os', 'mac');
+
+/**
+ * The local strings object which is used to do the translation.
+ * @type {!LocalStrings}
+ */
+var localStrings = new LocalStrings;
+
+// Get the localized strings from the backend.
+chrome.experimental.bookmarkManager.getStrings(function(data) {
+ // The strings may contain & which we need to strip.
+ for (var key in data) {
+ data[key] = data[key].replace(/&/, '');
+ }
+
+ localStrings.templateData = data;
+ i18nTemplate.process(document, data);
+
+ recentTreeItem.label = localStrings.getString('recent');
+ searchTreeItem.label = localStrings.getString('search');
+});
/**
* The id of the bookmark root.
@@ -934,82 +1020,8 @@ var dnd = {
dnd.init();
-</script>
-
-<!-- Organize menu -->
-<command i18n-values=".label:rename_folder" id="rename-folder-command"></command>
-<command i18n-values=".label:edit" id="edit-command"></command>
-<command i18n-values=".label:show_in_folder" id="show-in-folder-command"></command>
-<command i18n-values=".label:cut" id="cut-command"></command>
-<command i18n-values=".label:copy" id="copy-command"></command>
-<command i18n-values=".label:paste" id="paste-command"></command>
-<command i18n-values=".label:delete" id="delete-command"></command>
-<command i18n-values=".label:sort" id="sort-command"></command>
-<command i18n-values=".label:add_new_bookmark" id="add-new-bookmark-command"></command>
-<command i18n-values=".label:new_folder" id="new-folder-command"></command>
-
-<!-- Tools menu -->
-<command i18n-values=".label:import_menu" id="import-menu-command"></command>
-<command i18n-values=".label:export_menu" id="export-menu-command"></command>
-
-<!-- open * are handled in canExecute handler -->
-<command id="open-in-new-tab-command"></command>
-<command id="open-in-background-tab-command"></command>
-<command id="open-in-new-window-command"></command>
-<command id="open-incognito-window-command"></command>
-<command id="open-in-same-window-command"></command>
-
-<!-- TODO(arv): I think the commands might be better created in code? -->
-
-<menu id="organize-menu">
- <button command="#add-new-bookmark-command"></button>
- <button command="#new-folder-command"></button>
- <hr>
- <button command="#rename-folder-command"></button>
- <button command="#edit-command"></button>
- <button command="#show-in-folder-command"></button>
- <hr>
- <button command="#cut-command"></button>
- <button command="#copy-command"></button>
- <button command="#paste-command"></button>
- <hr>
- <button command="#delete-command"></button>
- <hr>
- <button command="#sort-command"></button>
- <hr>
- <button command="#import-menu-command"></button>
- <button command="#export-menu-command"></button>
-</menu>
-
-<menu id="context-menu">
- <button command="#open-in-new-tab-command"></button>
- <button command="#open-in-new-window-command"></button>
- <button command="#open-incognito-window-command"></button>
- <hr>
- <button command="#rename-folder-command"></button>
- <button command="#edit-command"></button>
- <button command="#show-in-folder-command"></button>
- <hr>
- <button command="#cut-command"></button>
- <button command="#copy-command"></button>
- <button command="#paste-command"></button>
- <hr>
- <button command="#delete-command"></button>
- <hr>
- <button command="#add-new-bookmark-command"></button>
- <button command="#new-folder-command"></button>
-</menu>
-
-<script>
-
// Commands
-const Command = cr.ui.Command;
-const CommandBinding = cr.ui.CommandBinding;
-const Menu = cr.ui.Menu;
-const MenuButton = cr.ui.MenuButton;
-const Promise = cr.Promise;
-
cr.ui.decorate('menu', Menu);
cr.ui.decorate('button[menu]', MenuButton);
cr.ui.decorate('command', Command);
@@ -1592,29 +1604,7 @@ tree.addEventListener('command', handleCommand);
});
})();
-/**
- * The local strings object which is used to do the translation.
- * @type {!LocalStrings}
- */
-var localStrings = new LocalStrings;
-
-// Get the localized strings from the backend.
-chrome.experimental.bookmarkManager.getStrings(function(data) {
- // The strings may contain & which we need to strip.
- for (var key in data) {
- data[key] = data[key].replace(/&/, '');
- }
-
- localStrings.templateData = data;
- i18nTemplate.process(document, data);
-
- recentTreeItem.label = localStrings.getString('recent');
- searchTreeItem.label = localStrings.getString('search');
-});
-
</script>
-<div id="drop-overlay"></div>
-
</body>
</html>
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698