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

Minefieldでフラグ指定付きのウィンドウを開いた時に、初期化処理が途中でエラーによって停止してしまうせいで、開かれたウィンドウの内容が表示されない問題を修正（ http://twitter.com/piro_or/status/24478427114 ）

Browse Source 
git-svn-id: http://www.cozmixng.org/repos/piro/treestyletab/trunk@7208 599a83e7-65a4-db11-8015-0010dcdd6dc2
This commit is contained in:
piro 2010-09-15 04:51:50 +00:00
parent d06b7900f9
commit 92abac3776
2 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
content/treestyletab/treestyletabbrowser.js
View File

@ -810,20 +810,17 @@ TreeStyleTabBrowser.prototype = {
initTabContents : function TSTBrowser_initTabContents(aTab)
{
var icon = document.getAnonymousElementByAttribute(aTab, 'class', 'tab-icon');
var label = this.getTabLabel(aTab);
var close = this.getTabClosebox(aTab);
var counter = document.getAnonymousElementByAttribute(aTab, 'class', this.kCOUNTER_CONTAINER);
if (!document.getAnonymousElementByAttribute(aTab, 'class', this.kTWISTY)) {
var twisty = document.createElement('image');
var twisty = document.getAnonymousElementByAttribute(aTab, 'class', this.kTWISTY);
if (icon && !twisty) {
twisty = document.createElement('image');
twisty.setAttribute('class', this.kTWISTY);
var container = document.createElement('hbox');
let container = document.createElement('hbox');
container.setAttribute('class', this.kTWISTY_CONTAINER);
container.appendChild(twisty);
icon.appendChild(container);
var marker = document.createElement('image');
let marker = document.createElement('image');
marker.setAttribute('class', this.kDROP_MARKER);
container = document.createElement('hbox');
container.setAttribute('class', this.kDROP_MARKER_CONTAINER);
@ -832,26 +829,27 @@ TreeStyleTabBrowser.prototype = {
icon.appendChild(container);
}
if (!counter) {
var counter = document.createElement('hbox');
var label = this.getTabLabel(aTab);
var counter = document.getAnonymousElementByAttribute(aTab, 'class', this.kCOUNTER_CONTAINER);
if (label && label.parentNode != aTab && !counter) {
counter = document.createElement('hbox');
counter.setAttribute('class', this.kCOUNTER_CONTAINER);
counter.appendChild(document.createElement('label'));
counter.lastChild.setAttribute('class', this.kCOUNTER_PAREN);
counter.lastChild.setAttribute('value', '(');
let startParen = counter.appendChild(document.createElement('label'));
startParen.setAttribute('class', this.kCOUNTER_PAREN);
startParen.setAttribute('value', '(');
counter.appendChild(document.createElement('label'));
counter.lastChild.setAttribute('class', this.kCOUNTER);
counter.lastChild.setAttribute('value', '0');
let counterLabel = counter.appendChild(document.createElement('label'));
counterLabel.setAttribute('class', this.kCOUNTER);
counterLabel.setAttribute('value', '0');
counter.appendChild(document.createElement('label'));
counter.lastChild.setAttribute('class', this.kCOUNTER_PAREN);
counter.lastChild.setAttribute('value', ')');
let endParen = counter.appendChild(document.createElement('label'));
endParen.setAttribute('class', this.kCOUNTER_PAREN);
endParen.setAttribute('value', ')');
if (label) {
label.parentNode.insertBefore(counter, label.nextSibling);
}
}
this.initTabContentsOrder(aTab);
},
@ -859,7 +857,6 @@ TreeStyleTabBrowser.prototype = {
{
var label = this.getTabLabel(aTab);
var close = this.getTabClosebox(aTab);
var counter = document.getAnonymousElementByAttribute(aTab, 'class', this.kCOUNTER_CONTAINER);
var inverted = this.mTabBrowser.getAttribute(this.kTAB_CONTENTS_INVERTED) == 'true';
var nodes = Array.slice(document.getAnonymousNodes(aTab));
@ -891,9 +888,16 @@ TreeStyleTabBrowser.prototype = {
// rearrange contents in "tab-image-middle"
nodes = Array.slice(label.parentNode.childNodes);
if (inverted)
nodes.reverse();
var counter = document.getAnonymousElementByAttribute(aTab, 'class', this.kCOUNTER_CONTAINER);
if (counter) {
nodes.splice(nodes.indexOf(counter), 1);
if (inverted) nodes.reverse();
nodes.splice(nodes.indexOf(label)+1, 0, counter);
}
count = nodes.length;
nodes.reverse().forEach(function(aNode, aIndex) {
if (aNode.getAttribute('class') == 'informationaltab-thumbnail-container')

2
content/treestyletab/treestyletabbrowser_autoHide.js
View File

@ -415,6 +415,8 @@ TreeStyleTabBrowserAutoHide.prototype = {
updateMenuItem : function TSTAutoHide_updateMenuItem(aNode)
{
if (!aNode) return;
if (this.mode != this.kMODE_DISABLED)
aNode.setAttribute('checked', true);
else