Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-13 05:15:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixes "open links in tabs" attempting to open folders.

Browse Source 
Fixes open commands sometimes being disabled because they're not up to date
with the activeView
Work on fixing pasting of folders.
This commit is contained in:
annie.sullivan%gmail.com 2005-11-30 19:24:44 +00:00
parent 0e941ec936
commit fcc986ac4c
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
browser/components/places/content/commands.inc
View File

@ -1,5 +1,5 @@
<commandset id="placesCommands"
commandupdater="true" events="focus,select"
commandupdater="true" events="focus,select,mousedown"
oncommandupdate="PlacesController.onCommandUpdate()">
<command id="placesCmd_find" label="&cmd.find.label;" accesskey="&cmd.find.accesskey;"/>
<command id="placesCmd_export" label="&cmd.export.label;" accesskey="&cmd.export.accesskey;"/>

14
browser/components/places/content/controller.js
View File

@ -453,9 +453,12 @@ var PlacesController = {
var kids = this._hist.executeQueries(queries, queries.length,
node.queryOptions);
var cc = kids.childCount;
for (var i = 0; i < cc; ++i)
this._activeView.browserWindow.openNewTabWith(kids.getChild(i).url,
null, null);
for (var i = 0; i < cc; ++i) {
var node = kids.getChild(i);
if (this.nodeIsURL(node))
this._activeView.browserWindow.openNewTabWith(node.url,
null, null);
}
}
else {
var nodes = this._activeView.getSelectionNodes();
@ -663,7 +666,7 @@ var PlacesController = {
if (data.folderId > 0) {
// Place is a folder.
if (copy)
return this._getFolderCopyTransaction(data.folderId, container, index);
return PlacesControllerDragHelper._getFolderCopyTransaction(data, container, index);
return new PlacesMoveFolderTransaction(data.folderId, data.parent,
data.index, container,
index);
@ -808,6 +811,7 @@ var PlacesController = {
var xferable =
Cc["@mozilla.org/widget/transferable;1"].
createInstance(Ci.nsITransferable);
xferable.addDataFlavor(TYPE_X_MOZ_PLACE_CONTAINER);
xferable.addDataFlavor(TYPE_X_MOZ_PLACE);
xferable.addDataFlavor(TYPE_X_MOZ_URL);
xferable.addDataFlavor(TYPE_UNICODE);
@ -915,7 +919,7 @@ var PlacesControllerDragHelper = {
}
}
}
createTransactions(data.id, container, index);
createTransactions(data.folderId, container, index);
return new PlacesAggregateTransaction("FolderCopy", transactions);
},

1
browser/components/places/content/toolbar.xml
View File

@ -238,6 +238,7 @@
else
this._selection = this.getResult();
PlacesController.activeView = this;
document.commandDispatcher.updateCommands("mousedown");
]]></handler>
<handler event="click">
PlacesController.mouseLoadURI(event);