Show "cancel" button in the confirmation dialog for bookmark groups

This commit is contained in:
YUKI Hiroshi 2016-09-08 12:29:32 +09:00
parent dc098d3067
commit 6718a1affa

View File

@ -325,11 +325,12 @@ var TreeStyleTabBase = inherit(TreeStyleTabConstants, {
var button = Services.prompt.confirmEx(this.browserWindow, var button = Services.prompt.confirmEx(this.browserWindow,
utils.treeBundle.getString('openGroupBookmarkBehavior.title'), utils.treeBundle.getString('openGroupBookmarkBehavior.title'),
utils.treeBundle.getString('openGroupBookmarkBehavior.text'), utils.treeBundle.getString('openGroupBookmarkBehavior.text'),
(Services.prompt.BUTTON_TITLE_IS_STRING * Services.prompt.BUTTON_POS_0) + (Services.prompt.BUTTON_TITLE_IS_STRING * Services.prompt.BUTTON_POS_0) |
(Services.prompt.BUTTON_TITLE_IS_STRING * Services.prompt.BUTTON_POS_1), (Services.prompt.BUTTON_TITLE_IS_STRING * Services.prompt.BUTTON_POS_1) |
(Services.prompt.BUTTON_TITLE_CACNEL * Services.prompt.BUTTON_POS_2),
utils.treeBundle.getString('openGroupBookmarkBehavior.subTree'), utils.treeBundle.getString('openGroupBookmarkBehavior.subTree'),
utils.treeBundle.getString('openGroupBookmarkBehavior.separate'), utils.treeBundle.getString('openGroupBookmarkBehavior.separate'),
null, '',
utils.treeBundle.getString('openGroupBookmarkBehavior.never'), utils.treeBundle.getString('openGroupBookmarkBehavior.never'),
checked checked
); );
@ -339,11 +340,12 @@ var TreeStyleTabBase = inherit(TreeStyleTabConstants, {
var behaviors = [ var behaviors = [
this.kGROUP_BOOKMARK_SUBTREE | dummyTabFlag, this.kGROUP_BOOKMARK_SUBTREE | dummyTabFlag,
this.kGROUP_BOOKMARK_SEPARATE this.kGROUP_BOOKMARK_SEPARATE,
this.kGROUP_BOOKMARK_CANCEL
]; ];
behavior = behaviors[button]; behavior = behaviors[button];
if (checked.value) { if (checked.value && button != this.kGROUP_BOOKMARK_CANCEL) {
utils.setTreePref('openGroupBookmark.behavior', behavior); utils.setTreePref('openGroupBookmark.behavior', behavior);
} }
return behavior; return behavior;