suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Addresses #375, Drag and drop file attachments

Browse Source 
- Fix file drag-and-drop on Windows
- Dragging favicon of non-HTML local file now saves as file rather than snapshot
This commit is contained in:
Dan Stillman 2007-04-16 13:36:47 +00:00
parent 5b14285702
commit a61afc89cc
2 changed files with 67 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
chrome/content/zotero/xpcom/collectionTreeView.js
View File

@ -712,19 +712,7 @@ Zotero.CollectionTreeView.prototype.drop = function(row, orient)
this._getItemAtRow(row).ref.addItems(toAdd);
}
}
else if (dataType == 'text/x-moz-url') {
var url = data.data.split("\n")[0];
if (this._getItemAtRow(row).isCollection()) {
var parentCollectionID = this._getItemAtRow(row).ref.getID();
}
else {
var parentCollectionID = false;
}
Zotero.Attachments.importFromURL(url, false, false, false, parentCollectionID);
}
else if (dataType == 'application/x-moz-file') {
else if (dataType == 'text/x-moz-url' || dataType == 'application/x-moz-file') {
if (this._getItemAtRow(row).isCollection()) {
var parentCollectionID = this._getItemAtRow(row).ref.getID();
}
@ -733,15 +721,45 @@ Zotero.CollectionTreeView.prototype.drop = function(row, orient)
}
var unlock = Zotero.Notifier.begin(true);
try {
var dataList = dataSet.dataList;
for (var i=0, len=dataList.length; i<len; i++) {
var file = dataList[i].first.data;
if (dataType == 'text/x-moz-url') {
var url = file.split("\n")[0];
if (url.indexOf('file:///') == 0) {
var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
.getService(Components.interfaces.nsIWindowMediator);
var win = wm.getMostRecentWindow("navigator:browser");
// If dragging currently loaded page, only convert to
// file if not an HTML document
if (win.content.location.href != url ||
win.content.document.contentType != 'text/html') {
var nsIFPH = Components.classes["@mozilla.org/network/protocol;1?name=file"]
.getService(Components.interfaces.nsIFileProtocolHandler);
try {
var file = nsIFPH.getFileFromURLSpec(url);
}
catch (e) {
Zotero.debug(e);
}
}
}
// Still string, so remote URL
if (typeof file == 'string') {
Zotero.Attachments.importFromURL(url, false, false, false, parentCollectionID);
continue;
}
// Otherwise file, so fall through
}
try {
Zotero.DB.beginTransaction();
var itemID = Zotero.Attachments.importFromFile(file);
var itemID = Zotero.Attachments.importFromFile(file, false);
if (parentCollectionID) {
var col = Zotero.Collections.get(parentCollectionID);
if (col) {

54
chrome/content/zotero/xpcom/itemTreeView.js
View File

@ -1449,6 +1449,8 @@ Zotero.ItemTreeView.prototype.canDrop = function(row, orient)
var data = dataSet.first.first;
var dataType = data.flavour.contentType;
//Zotero.debug("Drag data type is " + dataType);
switch (dataType) {
case 'zotero/item':
var ids = data.data.split(','); // ids of rows we are dragging in
@ -1463,9 +1465,6 @@ Zotero.ItemTreeView.prototype.canDrop = function(row, orient)
break;
}
//Zotero.debug("Drag data type is " + dataType);
//Zotero.debug("Drag URL is " + url);
// workaround... two different services call canDrop
// (nsDragAndDrop, and the tree) -- this is for the former,
// used when dragging between windows
@ -1638,23 +1637,7 @@ Zotero.ItemTreeView.prototype.drop = function(row, orient)
}
}
}
else if (dataType == 'text/x-moz-url') {
var url = data.data.split("\n")[0];
var sourceItemID = false;
var parentCollectionID = false;
if (orient == 0) {
var rowItem = this._getItemAtRow(row).ref;
sourceItemID = rowItem.getID()
}
else if (this._itemGroup.isCollection()) {
var parentCollectionID = this._itemGroup.ref.getID();
}
Zotero.Attachments.importFromURL(url, sourceItemID, false, false, parentCollectionID);
}
else if (dataType == 'application/x-moz-file') {
else if (dataType == 'text/x-moz-url' || dataType == 'application/x-moz-file') {
var sourceItemID = false;
var parentCollectionID = false;
@ -1671,6 +1654,37 @@ Zotero.ItemTreeView.prototype.drop = function(row, orient)
for (var i=0, len=dataList.length; i<len; i++) {
var file = dataList[i].first.data;
if (dataType == 'text/x-moz-url') {
var url = file.split("\n")[0];
if (url.indexOf('file:///') == 0) {
var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
.getService(Components.interfaces.nsIWindowMediator);
var win = wm.getMostRecentWindow("navigator:browser");
// If dragging currently loaded page, only convert to
// file if not an HTML document
if (win.content.location.href != url ||
win.content.document.contentType != 'text/html') {
var nsIFPH = Components.classes["@mozilla.org/network/protocol;1?name=file"]
.getService(Components.interfaces.nsIFileProtocolHandler);
try {
var file = nsIFPH.getFileFromURLSpec(url);
}
catch (e) {
Zotero.debug(e);
}
}
}
// Still string, so remote URL
if (typeof file == 'string') {
Zotero.Attachments.importFromURL(url, sourceItemID, false, false, parentCollectionID);
continue;
}
// Otherwise file, so fall through
}
try {
Zotero.DB.beginTransaction();
var itemID = Zotero.Attachments.importFromFile(file, sourceItemID);