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

Remove registered event listeners more completely

Browse Source
This commit is contained in:
Piro / YUKI Hiroshi 2015-11-10 01:44:39 +09:00
parent 991390d88f
commit 4b32a22531
2 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
modules/browser.js
View File

@ -1654,13 +1654,7 @@ TreeStyleTabBrowser.prototype = inherit(TreeStyleTabWindow.prototype, {
// We always have to re-create splitter, because its "collapse"
// behavior becomes broken by repositioning of the tab bar.
if (splitter) {
try {
splitter.removeEventListener('mousedown', this.windowService, false);
splitter.removeEventListener('mouseup', this.windowService, false);
splitter.removeEventListener('dblclick', this.windowService, false);
}
catch(e) {
}
this._destroyOldSplitter();
let oldSplitter = splitter;
splitter = oldSplitter.cloneNode(true);
oldSplitter.parentNode.removeChild(oldSplitter);
@ -1689,13 +1683,14 @@ TreeStyleTabBrowser.prototype = inherit(TreeStyleTabWindow.prototype, {
// So, we have to turn the actual tab bar visible manually
// when the grippy is clicked.
let tabContainer = this.mTabBrowser.tabContainer;
grippy.addEventListener('click', function() {
let grippyOnClick = function() {
tabContainer.ownerDocument.defaultView.setTimeout(function() {
var visible = grippy.getAttribute('state') != 'collapsed';
if (visible != tabContainer.visible)
tabContainer.visible = visible;
}, 0);
}, true);
};
grippy.addEventListener('click', grippy.grippyOnClick, true);
splitter.appendChild(grippy);
}
@ -1711,9 +1706,26 @@ TreeStyleTabBrowser.prototype = inherit(TreeStyleTabWindow.prototype, {
var ref = this.mTabBrowser.mPanelContainer;
ref.parentNode.insertBefore(splitter, ref);
this.splitter = splitter;
return splitter;
},
_destroyOldSplitter : function TSTBrowser_destroyOldSplitter(aChanging, aOldPosition, aNewPosition)
{
var d = this.document;
var splitter = this.splitter;
try {
splitter.removeEventListener('mousedown', this.windowService, false);
splitter.removeEventListener('mouseup', this.windowService, false);
splitter.removeEventListener('dblclick', this.windowService, false);
var grippy = splitter.firstChild;
grippy.removeEventListener('click', grippy.grippyOnClick, true);
delete grippy.grippyOnClick;
}
catch(e) {
}
},
fireTabbarPositionEvent : function TSTBrowser_fireTabbarPositionEvent(aChanging, aOldPosition, aNewPosition)
{
if (aOldPosition == aNewPosition)
@ -2209,9 +2221,6 @@ TreeStyleTabBrowser.prototype = inherit(TreeStyleTabWindow.prototype, {
delete this.timers[key];
}, this);
this.autoHide.destroy();
delete this._autoHide;
this._initDNDObservers(); // ensure initialized
this.tabbarDNDObserver.destroy();
delete this._tabbarDNDObserver;
@ -2228,6 +2237,8 @@ TreeStyleTabBrowser.prototype = inherit(TreeStyleTabWindow.prototype, {
delete this.tabStripPlaceHolderBoxObserver;
}
this._destroyOldSplitter();
var w = this.window;
var d = this.document;
var b = this.mTabBrowser;
@ -2244,6 +2255,9 @@ TreeStyleTabBrowser.prototype = inherit(TreeStyleTabWindow.prototype, {
this._endListenTabbarEvents();
this.autoHide.destroy();
this._autoHide = undefined; // block to be re-initialized by property accesses
w.removeEventListener('resize', this, true);
w.removeEventListener('beforecustomization', this, true);
w.removeEventListener('aftercustomization', this, false);
@ -6922,7 +6936,7 @@ TreeStyleTabBrowser.prototype = inherit(TreeStyleTabWindow.prototype, {
/* show/hide tab bar */
get autoHide()
{
if (!this._autoHide) {
if (!('_autoHide' in this)) {
this._autoHide = new AutoHideBrowser(this.mTabBrowser);
}
return this._autoHide;

8
modules/window.js
View File

@ -316,7 +316,7 @@ TreeStyleTabWindow.prototype = inherit(TreeStyleTabBase, {
get autoHideWindow()
{
if (!this._autoHideWindow) {
if (!('_autoHideWindow' in this)) {
this._autoHideWindow = new AutoHideWindow(this.window);
}
return this._autoHideWindow;
@ -324,7 +324,7 @@ TreeStyleTabWindow.prototype = inherit(TreeStyleTabBase, {
get themeManager()
{
if (!this._themeManager) {
if (!('_themeManager' in this)) {
this._themeManager = new TreeStyleTabThemeManager(this.window);
}
return this._themeManager;
@ -544,10 +544,10 @@ TreeStyleTabWindow.prototype = inherit(TreeStyleTabBase, {
w.removeEventListener('unload', this, false);
this.autoHideWindow.destroy();
delete this._autoHideWindow;
this._autoHideWindow = undefined;
this.themeManager.destroy();
delete this._themeManager;
this._themeManager = undefined;
this.browser.treeStyleTab.saveCurrentState();
this.destroyTabBrowser(this.browser);