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

Don't apply obsolete "extensions.treestyletab.allowSubtreeCollapseExpand.*" preferences #1070

Browse Source
This commit is contained in:
YUKI Hiroshi 2016-02-17 16:05:23 +09:00
parent 0099d7fd46
commit 3a2c801f5d
1 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
modules/browser.js
View File

@ -1881,11 +1881,6 @@ TreeStyleTabBrowser.prototype = inherit(TreeStyleTabWindow.prototype, {
delete this.timers['updateTabbarState']; delete this.timers['updateTabbarState'];
}).bind(this), 0); }).bind(this), 0);
var allowToCollapse = utils.getTreePref('allowSubtreeCollapseExpand.'+orient);
if (this.allowSubtreeCollapseExpand != allowToCollapse)
this.collapseExpandAllSubtree(false, false);
this.allowSubtreeCollapseExpand = allowToCollapse;
this.maxTreeLevel = utils.getTreePref('maxTreeLevel.'+orient); this.maxTreeLevel = utils.getTreePref('maxTreeLevel.'+orient);
this.setTabbrowserAttribute(this.kALLOW_STACK, this.canStackTabs ? 'true' : null); this.setTabbrowserAttribute(this.kALLOW_STACK, this.canStackTabs ? 'true' : null);
@ -1904,20 +1899,17 @@ TreeStyleTabBrowser.prototype = inherit(TreeStyleTabWindow.prototype, {
var oldState = { var oldState = {
fixed : this.fixed, fixed : this.fixed,
maxTreeLevel : this.maxTreeLevel, maxTreeLevel : this.maxTreeLevel,
indented : this.maxTreeLevel != 0, indented : this.maxTreeLevel != 0
canCollapse : b.getAttribute(this.kALLOW_COLLAPSE) == 'true'
}; };
var newState = { var newState = {
fixed : utils.getTreePref('tabbar.fixed.'+orient), fixed : utils.getTreePref('tabbar.fixed.'+orient),
maxTreeLevel : utils.getTreePref('maxTreeLevel.'+orient), maxTreeLevel : utils.getTreePref('maxTreeLevel.'+orient),
indented : utils.getTreePref('maxTreeLevel.'+orient) != 0, indented : utils.getTreePref('maxTreeLevel.'+orient) != 0
canCollapse : utils.getTreePref('allowSubtreeCollapseExpand.'+orient)
}; };
if (oldState.fixed == newState.fixed && if (oldState.fixed == newState.fixed &&
oldState.maxTreeLevel == newState.maxTreeLevel && oldState.maxTreeLevel == newState.maxTreeLevel &&
oldState.indented == newState.indented && oldState.indented == newState.indented)
oldState.canCollapse == newState.canCollapse)
return false; return false;
var data = { var data = {
@ -1939,8 +1931,7 @@ TreeStyleTabBrowser.prototype = inherit(TreeStyleTabWindow.prototype, {
var state = { var state = {
fixed : this.fixed, fixed : this.fixed,
maxTreeLevel : this.maxTreeLevel, maxTreeLevel : this.maxTreeLevel,
indented : this.maxTreeLevel != 0, indented : this.maxTreeLevel != 0
canCollapse : b.getAttribute(this.kALLOW_COLLAPSE) == 'true'
}; };
var data = { var data = {
@ -2737,7 +2728,6 @@ TreeStyleTabBrowser.prototype = inherit(TreeStyleTabWindow.prototype, {
return; return;
this.setTabbrowserAttribute(this.kFIXED+'-horizontal', value ? 'true' : null, b); this.setTabbrowserAttribute(this.kFIXED+'-horizontal', value ? 'true' : null, b);
case 'extensions.treestyletab.maxTreeLevel.horizontal': case 'extensions.treestyletab.maxTreeLevel.horizontal':
case 'extensions.treestyletab.allowSubtreeCollapseExpand.horizontal':
if (!this.isVertical) if (!this.isVertical)
this.updateTabbarState(true); this.updateTabbarState(true);
return; return;
@ -2747,7 +2737,6 @@ TreeStyleTabBrowser.prototype = inherit(TreeStyleTabWindow.prototype, {
return; return;
this.setTabbrowserAttribute(this.kFIXED+'-vertical', value ? 'true' : null, b); this.setTabbrowserAttribute(this.kFIXED+'-vertical', value ? 'true' : null, b);
case 'extensions.treestyletab.maxTreeLevel.vertical': case 'extensions.treestyletab.maxTreeLevel.vertical':
case 'extensions.treestyletab.allowSubtreeCollapseExpand.vertical':
if (this.isVertical) if (this.isVertical)
this.updateTabbarState(true); this.updateTabbarState(true);
return; return;
@ -5470,9 +5459,7 @@ TreeStyleTabBrowser.prototype = inherit(TreeStyleTabWindow.prototype, {
this._treeViewEnabled = newValue; this._treeViewEnabled = newValue;
if (this._treeViewEnabled) { if (this._treeViewEnabled) {
if (this._lastAllowSubtreeCollapseExpand) this.allowSubtreeCollapseExpand = true;
this.allowSubtreeCollapseExpand = true;
delete this._lastAllowSubtreeCollapseExpand;
let tabs = this.getAllTabs(this.browser); let tabs = this.getAllTabs(this.browser);
for (let i = 0, maxi = tabs.length; i < maxi; i++) for (let i = 0, maxi = tabs.length; i < maxi; i++)
@ -5499,7 +5486,6 @@ TreeStyleTabBrowser.prototype = inherit(TreeStyleTabWindow.prototype, {
this.collapseExpandSubtree(tab, false, true); this.collapseExpandSubtree(tab, false, true);
} }
this._lastAllowSubtreeCollapseExpand = this.allowSubtreeCollapseExpand;
this.allowSubtreeCollapseExpand = false; this.allowSubtreeCollapseExpand = false;
} }
return aValue; return aValue;