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

don't show "replace current tab" item for bookmark groups on Firefox 8 or later (fix for https://bugzilla.mozilla.org/show_bug.cgi?id=440093 )

Browse Source
This commit is contained in:
SHIMODA Hiroshi 2011-08-24 10:20:31 +09:00
parent 85ef4d852f
commit 68e156bd12
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
content/treestyletab/bookmarksOverlay.js
View File

@ -277,10 +277,14 @@ var TreeStyleTabBookmarksService = {
else { else {
sv.readyToOpenNewTabGroup(null, treeStructure, TSTOpenGroupBookmarkBehavior & sv.kGROUP_BOOKMARK_EXPAND_ALL_TREE); sv.readyToOpenNewTabGroup(null, treeStructure, TSTOpenGroupBookmarkBehavior & sv.kGROUP_BOOKMARK_EXPAND_ALL_TREE);
} }
replaceCurrentTab = false; // replaceCurrentTab works only on Firefox 7 or earlier
// See: https://bugzilla.mozilla.org/show_bug.cgi?id=440093
if (typeof replaceCurrentTab !== 'undefined')
replaceCurrentTab = false;
} }
else { else {
replaceCurrentTab = !!(TSTOpenGroupBookmarkBehavior & sv.kGROUP_BOOKMARK_REPLACE); if (typeof replaceCurrentTab !== 'undefined')
replaceCurrentTab = !!(TSTOpenGroupBookmarkBehavior & sv.kGROUP_BOOKMARK_REPLACE);
} }
} }
$1 $1

10
content/treestyletab/config.js
View File

@ -168,6 +168,16 @@ function initTabPane()
newTabPref.removeAttribute('hidden'); newTabPref.removeAttribute('hidden');
else else
newTabPref.setAttribute('hidden', true); newTabPref.setAttribute('hidden', true);
var bookmarkGroupReplacePref = document.getElementById('openGroupBookmark.replace');
if (comparator.compare(XULAppInfo.version, '7.0') > 0) {
if (bookmarkGroupReplacePref.selected)
document.getElementById('openGroupBookmark.subtree').selected = true;
bookmarkGroupReplacePref.setAttribute('hidden', true);
}
else {
bookmarkGroupReplacePref.removeAttribute('hidden');
}
} }
function onSyncGroupBookmarkUIToPref() function onSyncGroupBookmarkUIToPref()

5
content/treestyletab/config.xul
View File

@ -446,7 +446,7 @@
onsyncfrompreference="return onSyncGroupBookmarkPrefToUI();" onsyncfrompreference="return onSyncGroupBookmarkPrefToUI();"
preference="extensions.treestyletab.openGroupBookmark.behavior"> preference="extensions.treestyletab.openGroupBookmark.behavior">
<radio value="0" collapsed="true"/> <radio value="0" collapsed="true"/>
<radio value="1" label="&config.openGroupBookmark.subtree;"/> <radio id="openGroupBookmark.subtree" value="1" label="&config.openGroupBookmark.subtree;"/>
<hbox> <hbox>
<spacer style="width:1em;"/> <spacer style="width:1em;"/>
<vbox> <vbox>
@ -471,7 +471,8 @@
</vbox> </vbox>
</hbox> </hbox>
<radio value="2" label="&config.openGroupBookmark.flat;"/> <radio value="2" label="&config.openGroupBookmark.flat;"/>
<radio value="4" label="&config.openGroupBookmark.replace;"/> <radio id="openGroupBookmark.replace"
value="4" label="&config.openGroupBookmark.replace;"/>
</radiogroup> </radiogroup>
</vbox> </vbox>
</deck> </deck>