mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 432366 - Paste of bookmark on "Bookmarks Menu" in sidebar causes "Recently Bookmarked" folder to expand. r=dietrich.

This commit is contained in:
Asaf Romano 2008-07-08 12:33:17 +03:00
Родитель 186160143d
Коммит 624fb67ae8
2 изменённых файлов: 15 добавлений и 5 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

8
browser/components/places/content/controller.js
Просмотреть файл

@ -763,7 +763,7 @@ PlacesController.prototype = {
// select the new item // select the new item
var insertedNodeId = PlacesUtils.bookmarks var insertedNodeId = PlacesUtils.bookmarks
.getIdForItemAt(ip.itemId, ip.index); .getIdForItemAt(ip.itemId, ip.index);
this._view.selectItems([insertedNodeId], ip.itemId); this._view.selectItems([insertedNodeId], false);
} }
}, },
@ -783,7 +783,7 @@ PlacesController.prototype = {
// select the new item // select the new item
var insertedNodeId = PlacesUtils.bookmarks var insertedNodeId = PlacesUtils.bookmarks
.getIdForItemAt(ip.itemId, ip.index); .getIdForItemAt(ip.itemId, ip.index);
this._view.selectItems([insertedNodeId]); this._view.selectItems([insertedNodeId], false);
} }
}, },
@ -799,7 +799,7 @@ PlacesController.prototype = {
// select the new item // select the new item
var insertedNodeId = PlacesUtils.bookmarks var insertedNodeId = PlacesUtils.bookmarks
.getIdForItemAt(ip.itemId, ip.index); .getIdForItemAt(ip.itemId, ip.index);
this._view.selectItems([insertedNodeId]); this._view.selectItems([insertedNodeId], false);
}, },
/** /**
@ -1234,7 +1234,7 @@ PlacesController.prototype = {
insertedNodeIds.push(PlacesUtils.bookmarks insertedNodeIds.push(PlacesUtils.bookmarks
.getIdForItemAt(ip.itemId, ip.index + i)); .getIdForItemAt(ip.itemId, ip.index + i));
if (insertedNodeIds.length > 0) if (insertedNodeIds.length > 0)
this._view.selectItems(insertedNodeIds); this._view.selectItems(insertedNodeIds, false);
} }
}; };

12
browser/components/places/content/tree.xml
Просмотреть файл

@ -585,7 +585,14 @@
--> -->
<method name="selectItems"> <method name="selectItems">
<parameter name="aIDs"/> <parameter name="aIDs"/>
<parameter name="aOpenContainers"/>
<body><![CDATA[ <body><![CDATA[
// By default, we do search and select within containers which were
// closed (note that containers in which nodes were not found are
// closed).
if (aOpenContainers === undefined)
aOpenContainers = true;
var ids = aIDs; // don't manipulate the caller's array var ids = aIDs; // don't manipulate the caller's array
// Array of nodes found by findNodes which are to be selected // Array of nodes found by findNodes which are to be selected
@ -625,8 +632,11 @@
nodesURIChecked.indexOf(node.uri) != -1) nodesURIChecked.indexOf(node.uri) != -1)
return foundOne; return foundOne;
nodesURIChecked.push(node.uri);
asContainer(node); asContainer(node);
if (!aOpenContainers && !node.containerOpen)
return foundOne;
nodesURIChecked.push(node.uri);
// Remember the beginning state so that we can re-close // Remember the beginning state so that we can re-close
// this node if we don't find any additional results here. // this node if we don't find any additional results here.