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

Unified Diff: chrome/browser/resources/md_bookmarks/toolbar.js

Issue 2973783002: [MD Bookmarks] Prevent sorting of empty folders. (Closed)
Patch Set: remove flushes Created 3 years, 5 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/md_bookmarks/toolbar.js
diff --git a/chrome/browser/resources/md_bookmarks/toolbar.js b/chrome/browser/resources/md_bookmarks/toolbar.js
index 6a2d98ea5fdde23e1083f595dcf8ee1704e9e925..09b35444442b2f2c1239c6a6bb36f9219017c7c9 100644
--- a/chrome/browser/resources/md_bookmarks/toolbar.js
+++ b/chrome/browser/resources/md_bookmarks/toolbar.js
@@ -43,6 +43,12 @@ Polymer({
/** @private */
selectedFolder_: String,
+ /** @private */
+ canSortFolder_: {
+ type: Boolean,
+ computed: 'computeCanSortFolder_(canChangeList_, selectedFolder_)',
+ },
+
/** @private */
canChangeList_: {
type: Boolean,
@@ -84,8 +90,7 @@ Polymer({
/** @private */
onSortTap_: function() {
- chrome.bookmarkManagerPrivate.sortChildren(
- assert(this.getState().selectedFolder));
+ chrome.bookmarkManagerPrivate.sortChildren(assert(this.selectedFolder_));
bookmarks.ToastManager.getInstance().show(
loadTimeData.getString('toastFolderSorted'), true);
this.closeDropdownMenu_();
@@ -95,7 +100,7 @@ Polymer({
onAddBookmarkTap_: function() {
var dialog =
/** @type {BookmarksEditDialogElement} */ (this.$.addDialog.get());
- dialog.showAddDialog(false, assert(this.getState().selectedFolder));
+ dialog.showAddDialog(false, assert(this.selectedFolder_));
this.closeDropdownMenu_();
},
@@ -103,7 +108,7 @@ Polymer({
onAddFolderTap_: function() {
var dialog =
/** @type {BookmarksEditDialogElement} */ (this.$.addDialog.get());
- dialog.showAddDialog(true, assert(this.getState().selectedFolder));
+ dialog.showAddDialog(true, assert(this.selectedFolder_));
this.closeDropdownMenu_();
},
@@ -121,7 +126,7 @@ Polymer({
/** @private */
onDeleteSelectionTap_: function() {
- var selection = this.getState().selection.items;
+ var selection = this.selectedItems_;
var commandManager = bookmarks.CommandManager.getInstance();
assert(commandManager.canExecute(Command.DELETE, selection));
commandManager.handle(Command.DELETE, selection);
@@ -158,6 +163,15 @@ Polymer({
this.searchField.setValue(this.searchTerm_ || '');
},
+ /**
+ * @return {boolean}
+ * @private
+ */
+ computeCanSortFolder_: function() {
+ return this.canChangeList_ &&
+ this.getState().nodes[this.selectedFolder_].children.length > 0;
+ },
+
/**
* @return {boolean}
* @private
« no previous file with comments | « chrome/browser/resources/md_bookmarks/toolbar.html ('k') | chrome/test/data/webui/md_bookmarks/toolbar_test.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698