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

Fixes #679, drag-and-drop to Word and "copy item to clipboard" shortcut don't work in dev r1546

Browse Source 
Simon, fix any of this if it's incorrect
This commit is contained in:
Dan Stillman 2007-07-18 15:01:05 +00:00
parent c4c3b4ad84
commit 886ce6b4a6
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
chrome/content/zotero/fileInterface.js
View File

@ -320,10 +320,10 @@ var Zotero_File_Interface = new function() {
getService(Components.interfaces.nsIClipboard); getService(Components.interfaces.nsIClipboard);
var csl = Zotero.Cite.getStyle(style); var csl = Zotero.Cite.getStyle(style);
csl.preprocessItems(items); var itemSet = csl.generateItemSet(items);
// add HTML // add HTML
var bibliography = csl.createBibliography(items, "HTML"); var bibliography = csl.createBibliography(itemSet, "HTML");
var str = Components.classes["@mozilla.org/supports-string;1"]. var str = Components.classes["@mozilla.org/supports-string;1"].
createInstance(Components.interfaces.nsISupportsString); createInstance(Components.interfaces.nsISupportsString);
str.data = bibliography; str.data = bibliography;
@ -331,7 +331,7 @@ var Zotero_File_Interface = new function() {
transferable.setTransferData("text/html", str, bibliography.length*2); transferable.setTransferData("text/html", str, bibliography.length*2);
// add text // add text
var bibliography = csl.createBibliography(items, "Text"); var bibliography = csl.createBibliography(itemSet, "Text");
var str = Components.classes["@mozilla.org/supports-string;1"]. var str = Components.classes["@mozilla.org/supports-string;1"].
createInstance(Components.interfaces.nsISupportsString); createInstance(Components.interfaces.nsISupportsString);
str.data = bibliography; str.data = bibliography;
@ -355,10 +355,14 @@ var Zotero_File_Interface = new function() {
getService(Components.interfaces.nsIClipboard); getService(Components.interfaces.nsIClipboard);
var csl = Zotero.Cite.getStyle(style); var csl = Zotero.Cite.getStyle(style);
csl.preprocessItems(items); var itemSet = csl.generateItemSet(items);
var itemIDs = [];;
for (var i=0; i<items.length; i++) {
itemIDs.push(items[i]);
}
// add HTML // add HTML
var bibliography = csl.createCitation({citationType:1, items:items}, "HTML"); var bibliography = csl.createCitation(itemSet, itemIDs, "HTML", 1, null, null);
var str = Components.classes["@mozilla.org/supports-string;1"]. var str = Components.classes["@mozilla.org/supports-string;1"].
createInstance(Components.interfaces.nsISupportsString); createInstance(Components.interfaces.nsISupportsString);
str.data = bibliography; str.data = bibliography;
@ -366,7 +370,7 @@ var Zotero_File_Interface = new function() {
transferable.setTransferData("text/html", str, bibliography.length*2); transferable.setTransferData("text/html", str, bibliography.length*2);
// add text // add text
var bibliography = csl.createCitation({citationType:1, items:items}, "Text"); var bibliography = csl.createCitation(itemSet, itemIDs, "Text", 1, null, null);
var str = Components.classes["@mozilla.org/supports-string;1"]. var str = Components.classes["@mozilla.org/supports-string;1"].
createInstance(Components.interfaces.nsISupportsString); createInstance(Components.interfaces.nsISupportsString);
str.data = bibliography; str.data = bibliography;
@ -413,8 +417,8 @@ var Zotero_File_Interface = new function() {
} }
else { else {
var csl = Zotero.Cite.getStyle(io.style); var csl = Zotero.Cite.getStyle(io.style);
csl.preprocessItems(items); var itemSet = csl.generateItemSet(items);
var bibliography = csl.createBibliography(items, format); var bibliography = csl.createBibliography(itemSet, format);
} }
} catch(e) { } catch(e) {
window.alert(Zotero.getString("fileInterface.bibliographyGenerationError")); window.alert(Zotero.getString("fileInterface.bibliographyGenerationError"));