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

ツリー構造を得るメソッドを分離

Browse Source 
git-svn-id: http://www.cozmixng.org/repos/piro/treestyletab/trunk@4848 599a83e7-65a4-db11-8015-0010dcdd6dc2
This commit is contained in:
piro 2009-07-31 02:08:35 +00:00
parent c6e2cf4cc7
commit 83a7f89827
2 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
content/treestyletab/bookmarksOverlay.js
View File

@ -14,21 +14,6 @@ window.addEventListener('load', function() {
).replace( ).replace(
/(browserWindow\.getBrowser\(\)\.loadTabs\([^;]+\);)/, /(browserWindow\.getBrowser\(\)\.loadTabs\([^;]+\);)/,
<![CDATA[ <![CDATA[
var openGroupBookmarkBehavior = TreeStyleTabService.openGroupBookmarkBehavior();
var treeStructure = ids.map(function(aId) {
let id = TreeStyleTabService.getParentItemForBookmark(aId);
return id < 0 ? -1 : ids.indexOf(id);
});
treeStructure = treeStructure.reverse();
treeStructure = treeStructure.map(function(aPosition, aIndex) {
if (aIndex > 0 &&
aIndex < treeStructure.length-1 &&
aPosition < 0) {
return treeStructure[aIndex-1];
}
return aPosition;
});
treeStructure = treeStructure.reverse();
if ( if (
where.indexOf('tab') == 0 || where.indexOf('tab') == 0 ||
aEvent.target.id == 'placesContext_openContainer:tabs' || aEvent.target.id == 'placesContext_openContainer:tabs' ||
@ -36,17 +21,17 @@ window.addEventListener('load', function() {
aEvent.target == aEvent.target.parentNode._endOptOpenAllInTabs || aEvent.target == aEvent.target.parentNode._endOptOpenAllInTabs ||
aEvent.target.getAttribute('openInTabs') == 'true' aEvent.target.getAttribute('openInTabs') == 'true'
) { ) {
let openGroupBookmarkBehavior = TreeStyleTabService.openGroupBookmarkBehavior();
if (openGroupBookmarkBehavior & TreeStyleTabService.kGROUP_BOOKMARK_SUBTREE) { if (openGroupBookmarkBehavior & TreeStyleTabService.kGROUP_BOOKMARK_SUBTREE) {
let treeStructure = TreeStyleTabService.getTreeStructureFromBookmarkItems(ids);
if ( if (
openGroupBookmarkBehavior & TreeStyleTabService.kGROUP_BOOKMARK_USE_DUMMY && openGroupBookmarkBehavior & TreeStyleTabService.kGROUP_BOOKMARK_USE_DUMMY &&
treeStructure.filter(function(aParent, aIndex) { treeStructure.filter(function(aParent, aIndex) {
return aParent == -1 || aIndex == aParent; return aParent == -1 || aIndex == aParent;
}).length > 1 }).length > 1
) { ) {
treeStructure.unshift(-1); ids.unshift(-1);
treeStructure = treeStructure.map(function(aPosition) { treeStructure = TreeStyleTabService.getTreeStructureFromBookmarkItems(ids);
return aPosition == -1 ? -1 : aPosition + 1;
});
urls.unshift(TreeStyleTabService.getGroupTabURI(aFolderTitle)); urls.unshift(TreeStyleTabService.getGroupTabURI(aFolderTitle));
} }
TreeStyleTabService.readyToOpenNewTabGroup(null, treeStructure); TreeStyleTabService.readyToOpenNewTabGroup(null, treeStructure);

19
content/treestyletab/treestyletab.js
View File

@ -2634,6 +2634,25 @@ catch(e) {
return -1; return -1;
}, },
getTreeStructureFromBookmarkItems : function(aIDs)
{
var treeStructure = aIDs.map(function(aId) {
let id = this.getParentItemForBookmark(aId);
return id < 0 ? -1 : aIDs.indexOf(id);
}, this);
treeStructure = treeStructure.reverse();
treeStructure = treeStructure.map(function(aPosition, aIndex) {
if (aIndex > 0 &&
aIndex < treeStructure.length-1 &&
aPosition < 0) {
return treeStructure[aIndex-1];
}
return aPosition;
});
treeStructure = treeStructure.reverse();
return treeStructure;
},
// based on PlacesUtils.getURLsForContainerNode() // based on PlacesUtils.getURLsForContainerNode()
getItemIdsForContainerNode : function(aNode) getItemIdsForContainerNode : function(aNode)
{ {