From d66e4a0c0f97e2574d21fb408052629df55c0b1a Mon Sep 17 00:00:00 2001 From: YUKI Hiroshi Date: Thu, 8 Sep 2016 12:57:41 +0900 Subject: [PATCH] Rearrange buttons in the confirmation dialog to choose how to open bookmark folder. Due to the https://bugzilla.mozilla.org/show_bug.cgi?id=345067 now we must put "cancel" as tne index 1. --- modules/base.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/base.js b/modules/base.js index 65a1576a..2259760a 100644 --- a/modules/base.js +++ b/modules/base.js @@ -326,11 +326,11 @@ var TreeStyleTabBase = inherit(TreeStyleTabConstants, { utils.treeBundle.getString('openGroupBookmarkBehavior.title'), 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_1) | - (Services.prompt.BUTTON_TITLE_CANCEL * Services.prompt.BUTTON_POS_2), + (Services.prompt.BUTTON_TITLE_CANCEL * Services.prompt.BUTTON_POS_1) | + (Services.prompt.BUTTON_TITLE_IS_STRING * Services.prompt.BUTTON_POS_2), utils.treeBundle.getString('openGroupBookmarkBehavior.subTree'), - utils.treeBundle.getString('openGroupBookmarkBehavior.separate'), '', + utils.treeBundle.getString('openGroupBookmarkBehavior.separate'), utils.treeBundle.getString('openGroupBookmarkBehavior.never'), checked ); @@ -340,8 +340,8 @@ var TreeStyleTabBase = inherit(TreeStyleTabConstants, { var behaviors = [ this.kGROUP_BOOKMARK_SUBTREE | dummyTabFlag, - this.kGROUP_BOOKMARK_SEPARATE, - this.kGROUP_BOOKMARK_CANCEL + this.kGROUP_BOOKMARK_CANCEL, + this.kGROUP_BOOKMARK_SEPARATE ]; behavior = behaviors[button];