mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix loading of reports and timelines

Browse source 
Regression from df40ee72
This commit is contained in:
Dan Stillman 2020-01-04 00:51:43 -05:00
parent b9d5c33993
commit 8172f00941
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
chrome/content/zotero/reportInterface.js
View file

@ -28,7 +28,7 @@ var Zotero_Report_Interface = new function() {
/*
* Load a report for the currently selected collection
*/
this.loadCollectionReport = function (event) {
this.loadCollectionReport = function () {
var sortColumn = ZoteroPane_Local.getSortField();
var sortDirection = ZoteroPane_Local.getSortDirection();
var queryString = '?sort=' + sortColumn
@ -55,14 +55,14 @@ var Zotero_Report_Interface = new function() {
url += '/items' + queryString;
ZoteroPane_Local.loadURI(url, event);
Zotero.openInViewer(url);
}
/*
* Load a report for the currently selected items
*/
this.loadItemReport = function (event) {
this.loadItemReport = function () {
var libraryID = ZoteroPane_Local.getSelectedLibraryID();
var items = ZoteroPane_Local.getSelectedItems();
@ -72,6 +72,6 @@ var Zotero_Report_Interface = new function() {
var url = 'zotero://report/' + Zotero.API.getLibraryPrefix(libraryID) + '/items'
+ '?itemKey=' + items.map(item => item.key).join(',');
ZoteroPane_Local.loadURI(url, event);
Zotero.openInViewer(url);
}
}

2
chrome/content/zotero/timelineInterface.js
View file

@ -47,6 +47,6 @@ var Zotero_Timeline_Interface = new function() {
}
}
}
ZoteroPane_Local.loadURI(uri);
Zotero.openInViewer(uri);
}
}

4
chrome/content/zotero/zoteroPane.js
View file

@ -2422,7 +2422,7 @@ var ZoteroPane = new function()
},
{
id: "loadReport",
oncommand: event => Zotero_Report_Interface.loadCollectionReport(event)
oncommand: () => Zotero_Report_Interface.loadCollectionReport()
},
{
id: "emptyTrash",
@ -3287,7 +3287,7 @@ var ZoteroPane = new function()
}
}
this.launchURL(uri);
Zotero.launchURL(uri);
}
}

2
chrome/content/zotero/zoteroPane.xul
View file

@ -276,7 +276,7 @@
<menuseparator/>
<menuitem class="menuitem-iconic zotero-menuitem-export" oncommand="Zotero_File_Interface.exportItems();"/>
<menuitem class="menuitem-iconic zotero-menuitem-create-bibliography" oncommand="Zotero_File_Interface.bibliographyFromItems();"/>
<menuitem class="menuitem-iconic zotero-menuitem-create-report" oncommand="Zotero_Report_Interface.loadItemReport(event)"/>
<menuitem class="menuitem-iconic zotero-menuitem-create-report" oncommand="Zotero_Report_Interface.loadItemReport()"/>
<menuseparator/>
<menuitem class="menuitem-iconic zotero-menuitem-retrieve-metadata" oncommand="ZoteroPane.recognizeSelected();"/>
<menuitem class="menuitem-iconic zotero-menuitem-unrecognize" label="&zotero.items.menu.unrecognize;" oncommand="ZoteroPane.unrecognizeSelected()"/>