stonewareslord/treestyletab
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

"askUndoClosedTabSet" always show the confirmation.

Browse Source
This commit is contained in:
SHIMODA Hiroshi 2010-11-12 11:09:05 +09:00
parent c9a8975664
commit 1d586818ba
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/utils.js
View File

@ -44,7 +44,6 @@ Components.utils.import('resource://treestyletab-modules/stringBundle.js');
Components.utils.import('resource://treestyletab-modules/extensions.js'); Components.utils.import('resource://treestyletab-modules/extensions.js');
Components.utils.import('resource://treestyletab-modules/animationManager.js'); Components.utils.import('resource://treestyletab-modules/animationManager.js');
Components.utils.import('resource://treestyletab-modules/autoScroll.js'); Components.utils.import('resource://treestyletab-modules/autoScroll.js');
Components.utils.import('resource://treestyletab-modules/jsdeferred.js');
Components.utils.import('resource://treestyletab-modules/confirmWithTab.js'); Components.utils.import('resource://treestyletab-modules/confirmWithTab.js');
Components.utils.import('resource://treestyletab-modules/namespace.jsm'); Components.utils.import('resource://treestyletab-modules/namespace.jsm');
@ -436,17 +435,13 @@ var TreeStyleTabUtils = {
askUndoCloseTabSetBehavior : function TSTUtils_askUndoCloseTabSetBehavior(aRestoredTab, aCount) askUndoCloseTabSetBehavior : function TSTUtils_askUndoCloseTabSetBehavior(aRestoredTab, aCount)
{ {
var behavior = this.undoCloseTabSetBehavior; var behavior = this.undoCloseTabSetBehavior;
if (!(behavior & this.kUNDO_ASK))
return Deferred.next(function() {
return behavior;
});
if (behavior & this.kUNDO_CLOSE_SET) behavior ^= this.kUNDO_CLOSE_SET; if (behavior & this.kUNDO_CLOSE_SET) behavior ^= this.kUNDO_CLOSE_SET;
var self = this; var self = this;
var neverAskState = (behavior & this.kUNDO_ASK) ? false : true ;
var checkbox = { var checkbox = {
label : this.treeBundle.getString('undoCloseTabSetBehavior.never'), label : this.treeBundle.getString('undoCloseTabSetBehavior.never'),
checked : false checked : neverAskState
}; };
return confirmWithTab({ return confirmWithTab({
tab : aRestoredTab, tab : aRestoredTab,
@ -463,7 +458,7 @@ var TreeStyleTabUtils = {
if (aButtonIndex == 0) { if (aButtonIndex == 0) {
behavior |= self.kUNDO_CLOSE_SET; behavior |= self.kUNDO_CLOSE_SET;
} }
if (checkbox.checked) { if (checkbox.checked != neverAskState) {
behavior ^= self.kUNDO_ASK; behavior ^= self.kUNDO_ASK;
self.setTreePref('undoCloseTabSet.behavior', behavior); self.setTreePref('undoCloseTabSet.behavior', behavior);
} }