зеркало из https://github.com/mozilla/pjs.git
fix for bug #388860: New folder button on Add Bookmark panel does nothing.
r=mano
This commit is contained in:
Родитель
ab2a8e1bfe
Коммит
b88592c6d6
|
@ -1022,7 +1022,7 @@ var BookmarkPropertiesPanel = {
|
|||
expander.className = "up";
|
||||
expander.setAttribute("tooltiptext",
|
||||
expander.getAttribute("tooltiptextup"));
|
||||
document.documentElement.buttons = "accept,cancel, extra2";
|
||||
document.documentElement.buttons = "accept,cancel,extra2";
|
||||
|
||||
if (!this._folderTree.treeBoxObject.view.isContainerOpen(0))
|
||||
this._folderTree.treeBoxObject.view.toggleOpenState(0);
|
||||
|
|
|
@ -109,7 +109,7 @@
|
|||
<parameter name="optionsFilter"/>
|
||||
<body><![CDATA[
|
||||
// preserve grouping
|
||||
var queryNode = asQuery(this.getResult().root);
|
||||
var queryNode = asQuery(this.getResultNode());
|
||||
var options = queryNode.queryOptions.clone();
|
||||
if (optionsFilter)
|
||||
options = optionsFilter.filter(queryNode.getQueries({}), options,
|
||||
|
@ -438,9 +438,12 @@
|
|||
<getter><![CDATA[
|
||||
// there is no insertion point for history queries
|
||||
// so bail out now and save a lot of work when updating commands
|
||||
var options = asQuery(this.getResult().root).queryOptions;
|
||||
if (options.queryType == options.QUERY_TYPE_HISTORY)
|
||||
return null;
|
||||
var resultNode = this.getResultNode();
|
||||
if (PlacesUtils.nodeIsQuery(resultNode)) {
|
||||
var options = asQuery(resultNode).queryOptions;
|
||||
if (options.queryType == options.QUERY_TYPE_HISTORY)
|
||||
return null;
|
||||
}
|
||||
|
||||
var orientation = NHRVO.DROP_AFTER;
|
||||
// If there is no selection, insert at the end of the container.
|
||||
|
@ -791,7 +794,7 @@
|
|||
return foundNode;
|
||||
}
|
||||
var folder = null;
|
||||
var root = asContainer(this.getResult().root);
|
||||
var root = asContainer(this.getResultNode());
|
||||
if (PlacesUtils.nodeIsFolder(root) &&
|
||||
root.itemId == insertionPoint.itemId)
|
||||
folder = root;
|
||||
|
|
Загрузка…
Ссылка в новой задаче