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

315940 consolidate insertion point computation functions in treeview NPOB

This commit is contained in:
beng%bengoodger.com 2005-11-28 23:15:41 +00:00
Родитель 718018ef17
Коммит c8611352f4
4 изменённых файлов: 94 добавлений и 58 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -70,6 +70,23 @@ function STACK(args) {
}
}
/**
* Represents an insertion point within a container where we can insert
* items.
* @param folderId
* The folderId of the parent container
* @param index
* The index within the container where we should insert
* @constructor
*/
function InsertionPoint(folderId, index) {
this.folderId = folderId;
this.index = index;
}
/**
* The Master Places Controller
*/
var PlacesController = {
_uri: function PC__uri(spec) {
var ios =
@ -202,6 +219,8 @@ var PlacesController = {
* @returns true if the node is a Bookmark folder, false otherwise
*/
nodeIsFolder: function PC_nodeIsFolder(node) {
if (!node)
STACK(arguments);
return node.type == Ci.nsINavHistoryResultNode.RESULT_TYPE_FOLDER;
},
@ -483,7 +502,7 @@ var PlacesController = {
var value = { value: bundle.getString("newFolderDefault") };
if (ps.prompt(window, title, text, value, null, { })) {
var ip = view.insertionPoint;
var txn = new PlacesCreateFolderTransaction(value.value, ip.container,
var txn = new PlacesCreateFolderTransaction(value.value, ip.folderId,
ip.index);
this._txmgr.doTransaction(txn);
}
@ -521,10 +540,12 @@ var PlacesController = {
* @param node
* The node to look up
* @returns The index of the node within its parent container, or -1 if the
* node was not found.
* node was not found or the node specified has no parent.
*/
getIndexOfNode: function PC_getIndexOfNode(node) {
var parent = node.parent;
if (!parent)
return -1;
var cc = parent.childCount;
for (var i = 0; i < cc && parent.getChild(i) != node; ++i);
return i < cc ? i : -1;
@ -789,13 +810,11 @@ var PlacesController = {
data = data.value.QueryInterface(Ci.nsISupportsString).data;
data = this.unwrapNodes(data, type.value);
LOG("NODES: " + data);
var ip = this._activeView.insertionPoint;
var transactions = [];
for (var i = 0; i < data.length; ++i)
transactions.push(this.makeTransaction(data[i], type.value,
ip.container, ip.index, true));
ip.folderId, ip.index, true));
var txn = new PlacesAggregateTransaction("Paste", transactions);
this._txmgr.doTransaction(txn);
},

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

@ -159,7 +159,7 @@
var index = -1;
else
index = PlacesController.getIndexOfNode(this.selectedNode)
return { container: this._result.folderId, index: index };
return new InsertionPoint(this._result.folderId, index);
]]></getter>
</property>

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

@ -260,38 +260,48 @@
<!-- AVI Method -->
<property name="insertionPoint">
<getter><![CDATA[
var view = this.view;
var selection = view.selection;
var selection = this.view.selection;
var rc = selection.getRangeCount();
var min = { }, max = { };
selection.getRangeAt(rc - 1, min, max);
return this._getInsertionPoint(max.value, 1);
]]></getter>
</property>
<method name="_getInsertionPoint">
<parameter name="index"/>
<parameter name="orientation"/>
<body><![CDATA[
const NHRVO = Ci.nsINavHistoryResultViewObserver;
var result = this.getResult();
var container = result;
// When there's no selection, assume the container is the container
// the view is populated from (i.e. the result's folderId).
if (max.value != -1) {
var lastSelected = result.nodeForTreeIndex(max.value);
if (view.isContainer(max.value) && view.isContainerOpen(max.value)) {
if (index != -1) {
var lastSelected = result.nodeForTreeIndex(index);
if (this.view.isContainer(index) &&
(this.view.isContainerOpen(index) || orientation == NHRVO.DROP_ON)) {
// If the last selected item is an open container, append _into_
// it, rather than insert adjacent to it.
container = lastSelected;
max.value = -1;
index = -1;
}
else {
// Any visible selected item will always have a parent. The parent of
// an item at the root is the result itself, which can be QI'ed to
// nsINavHistoryResult
container = lastSelected.parent;
for (var i = 0;
i < container.childCount && container.getChild(i) != lastSelected;
++i);
max.value = i < container.childCount ? i + 1 : i;
var lsi = PlacesController.getIndexOfNode(lastSelected);
if (lsi < container.childCount)
index = orientation == NHRVO.DROP_BEFORE ? lsi : lsi + 1;
else
index = orientation == NHRVO.DROP_BEFORE ? lsi - 1 : lsi;
}
}
return { container: container.folderId, index: max.value };
]]></getter>
</property>
return new InsertionPoint(container.folderId, index);
]]></body>
</method>
<!-- AVI Method -->
<property name="browserWindow" onget="return this._browserWindow"/>
@ -341,7 +351,7 @@
canDrop: function VO_canDrop(index, orientation) {
var root = this._self.getResult();
var node = root.nodeForTreeIndex(index);
var node = index != -1 ? root.nodeForTreeIndex(index) : root;
// Cannot drop before fixed items in the list.
if (node.parent == root &&
PlacesController.getIndexOfNode(node) < this._self.firstDropIndex &&
@ -358,54 +368,60 @@
// We are responsible for translating the |index| and |orientation|
// parameters into a container id and index within the container,
// since this information is specific to the tree view.
const NHRVO = Ci.nsINavHistoryResultViewObserver;
var result = this._self.getResult();
var view = this._self.view;
var node = index != -1 ? result.nodeForTreeIndex(index) : null;
var destContainer = null;
var destIndex = -1;
if (!node) {
// Dropping in some blank area of the view, just use the result as
// the container.
destContainer = result.folderId;
}
else if (view.isContainer(index) && orientation == NHRVO.DROP_ON) {
// If we're dropping _on_ a container, the container is the
// container we dropped on, otherwise it's the parent of the drop
// target.
destContainer = node.folderId;
}
else {
var destIndex = PlacesController.getIndexOfNode(node);
// For non leaves, or when not dropping _on_ a container, drop after
// by default (i.e. when dropping after a container, or ON AND AFTER
// a leaf node).
if (orientation != NHRVO.DROP_BEFORE)
++destIndex;
destContainer = node.parent.folderId;
}
PlacesControllerDragHelper.onDrop(this._self, destContainer,
destIndex, orientation);
var ip = this._self._getInsertionPoint(index, orientation);
PlacesControllerDragHelper.onDrop(this._self, ip.folderId, ip.index,
orientation);
},
_states: { },
onToggleOpenState: function VO_onToggleOpenState(index) {
// XXXben we will probably have to implement this to refresh Live
// Bookmarks.
onToggleOpenState: function VO_onToggleOpenState(index) { },
var view = this._self.view;
if (view.isContainer(index))
this._states[index] = view.isContainerOpen(index);
},
onSelectionChanged: function VO_onSelectionChanged() { },
onCycleHeader: function VO_onCycleHeader(column) { },
onCycleCell: function VO_onCycleCell(row, column) { },
onSelectionChanged: function VO_onSelectionChanged() { },
onPerformAction: function VO_onPerformAction(action) { },
onPerformActionOnRow: function VO_onPerformActionOnRow(action, row) { },
onPerformActionOnCell: function VO_onPerformActionOnCell(action, row, column) { },
})]]></field>
<field name="_selection">null</field>
<method name="_saveSelection">
<body><![CDATA[
this._selection = [];
var selection = this.view.selection;
var rc = selection.getRangeCount();
for (var i = 0; i < rc; ++i) {
var min = { }, max = { };
selection.getRangeAt(i, min, max);
this._selection.push({ min: min.value, max: max.value });
}
]]></body>
</method>
<method name="_restoreSelection">
<body><![CDATA[
var selection = this.view.selection;
for (var i = 0; i < this._selection.length; ++i) {
var range = this._selection[i];
selection.rangedSelect(range.min, range.max, true);
}
]]></body>
</method>
<method name="_reloadView">
<body><![CDATA[
var result = this.getResult();
this._saveSelection();
if (PlacesController.nodeIsFolder(result))
this.loadFolder(result.folderId, this._lastFilterOptions);
else
this.load(result.getSourceQueries({ }), result.sourceQueryOptions);
this._restoreSelection();
]]></body>
</method>

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

@ -122,7 +122,7 @@
var index = -1;
else
index = PlacesController.getIndexOfNode(this.selectedNode)
return { container: this._result.folderId, index: index };
return new InsertionPoint(this._result.folderId, index);
]]></getter>
</property>
@ -231,9 +231,10 @@
<handler event="mousedown"><![CDATA[
// When the user clicks down on a button, set it as the selection and
// tell the controller that we are the active view.
if (event.target.localName != "toolbarbutton")
return;
if (event.target.localName == "toolbarbutton")
this._selection = event.target.node;
else
this._selection = this.getResult();
PlacesController.activeView = this;
]]></handler>
<handler event="click">