From 37317e6885dbd563cf319d4f4b085e1765ff9ede Mon Sep 17 00:00:00 2001 From: piro Date: Fri, 10 Sep 2010 13:06:43 +0000 Subject: [PATCH] =?UTF-8?q?=E3=83=9D=E3=83=83=E3=83=97=E3=82=A2=E3=83=83?= =?UTF-8?q?=E3=83=97=E3=81=AE=E9=96=8B=E9=96=89=E7=8A=B6=E6=85=8B=E3=82=92?= =?UTF-8?q?=E6=AD=A3=E3=81=97=E3=81=8F=E5=88=A4=E5=AE=9A=E3=81=A7=E3=81=8D?= =?UTF-8?q?=E3=81=A6=E3=81=84=E3=81=AA=E3=81=8B=E3=81=A3=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://www.cozmixng.org/repos/piro/treestyletab/trunk@7174 599a83e7-65a4-db11-8015-0010dcdd6dc2 --- content/treestyletab/treestyletab.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/content/treestyletab/treestyletab.js b/content/treestyletab/treestyletab.js index 21fbfa6c..cca4a8f2 100644 --- a/content/treestyletab/treestyletab.js +++ b/content/treestyletab/treestyletab.js @@ -1832,7 +1832,8 @@ catch(e) { return; window.setTimeout(function(aSelf) { - if (!aPopup.boxObject.width && !aPopup.boxObject.height) + if ((!aPopup.boxObject.width && !aPopup.boxObject.height) || + aPopup.boxObject.popupState == 'closed') return; var id = aPopup.id; @@ -1846,7 +1847,7 @@ catch(e) { onPopupHidden : function TSTService_onPopupHidden(aPopup) { var id = aPopup.id; - aPopup = document.getElementById(id) || aPopup; + aPopup = document.getElementById(id) ? id : aPopup ; var index = TreeStyleTabService._shownPopups.indexOf(aPopup); if (index > -1) TreeStyleTabService._shownPopups.splice(index, 1); @@ -1857,7 +1858,7 @@ catch(e) { TreeStyleTabService._shownPopups = TreeStyleTabService._shownPopups.filter(function(aItem) { if (typeof aItem == 'string') aItem = document.getElementById(aItem); - return aItem && aItem.boxObject && aItem.boxObject.width && aItem.boxObject.height; + return aItem && aItem.boxObject && ((!aItem.boxObject.width && !aItem.boxObject.height) || aItem.boxObject.popupState == 'closed'); }); return TreeStyleTabService._shownPopups.length > 0; },