commit 7da0313a8b9edc317de76b808d9a1b40356f62ed
parent 43bb978a6e6a7b3afc6edcffefd97372f1e02cd0
Author: Simon Kornblith <simon@simonster.com>
Date: Thu, 24 Mar 2011 23:23:11 +0000
use ZoteroPane_Local everywhere we possibly can
Diffstat:
10 files changed, 58 insertions(+), 58 deletions(-)
diff --git a/chrome/content/zotero/bindings/attachmentbox.xml b/chrome/content/zotero/bindings/attachmentbox.xml
@@ -199,7 +199,7 @@
urlField.setAttribute('hidden', false);
if (this.clickableLink) {
urlField.onclick = function (event) {
- ZoteroPane.loadURI(this.value, event)
+ ZoteroPane_Local.loadURI(this.value, event)
};
urlField.className = 'text-link';
}
@@ -435,7 +435,7 @@
<parameter name="event"/>
<body>
<![CDATA[
- ZoteroPane.viewAttachment(this.item.id, event, !this.editable);
+ ZoteroPane_Local.viewAttachment(this.item.id, event, !this.editable);
]]>
</body>
</method>
@@ -445,7 +445,7 @@
<parameter name="event"/>
<body>
<![CDATA[
- ZoteroPane.showAttachmentInFilesystem(this.item.id, event.originalTarget, !this.editable);
+ ZoteroPane_Local.showAttachmentInFilesystem(this.item.id, event.originalTarget, !this.editable);
]]>
</body>
</method>
@@ -536,7 +536,7 @@
<label id="index-status-label"/>
<hbox>
<label id="index-status"/>
- <toolbarbutton id="reindex" oncommand="this.hidden = true; setTimeout(function () { ZoteroPane.reindexItem(); }, 50)"/>
+ <toolbarbutton id="reindex" oncommand="this.hidden = true; setTimeout(function () { ZoteroPane_Local.reindexItem(); }, 50)"/>
</hbox>
</row>
</rows>
diff --git a/chrome/content/zotero/bindings/itembox.xml b/chrome/content/zotero/bindings/itembox.xml
@@ -342,7 +342,7 @@
if ((fieldName == 'url' || fieldName == 'homepage') && val) {
label.setAttribute("isButton", true);
// TODO: make getFieldValue non-private and use below instead
- label.setAttribute("onclick", "ZoteroPane.loadURI(this.nextSibling.firstChild ? this.nextSibling.firstChild.nodeValue : this.nextSibling.value, event)");
+ label.setAttribute("onclick", "ZoteroPane_Local.loadURI(this.nextSibling.firstChild ? this.nextSibling.firstChild.nodeValue : this.nextSibling.value, event)");
label.setAttribute("tooltiptext", Zotero.getString('locate.online.tooltip'));
}
else if (fieldName == 'DOI' && val && typeof val == 'string') {
@@ -351,7 +351,7 @@
if (doi) {
doi = "http://dx.doi.org/" + encodeURIComponent(doi);
label.setAttribute("isButton", true);
- label.setAttribute("onclick", "ZoteroPane.loadURI('" + doi + "', event)");
+ label.setAttribute("onclick", "ZoteroPane_Local.loadURI('" + doi + "', event)");
label.setAttribute("tooltiptext", Zotero.getString('locate.online.tooltip'));
}
}
diff --git a/chrome/content/zotero/bindings/relatedbox.xml b/chrome/content/zotero/bindings/relatedbox.xml
@@ -221,9 +221,9 @@
if(id)
{
var p;
- if(window.ZoteroPane)
+ if(window.ZoteroPane_Local)
{
- p = window.ZoteroPane;
+ p = window.ZoteroPane_Local;
}
else
{
diff --git a/chrome/content/zotero/fileInterface.js b/chrome/content/zotero/fileInterface.js
@@ -137,17 +137,17 @@ var Zotero_File_Interface = new function() {
function exportCollection() {
var exporter = new Zotero_File_Exporter();
- var collection = ZoteroPane.getSelectedCollection();
+ var collection = ZoteroPane_Local.getSelectedCollection();
if(collection) {
exporter.name = collection.getName();
exporter.collection = collection;
} else {
// find sorted items
- exporter.items = ZoteroPane.getSortedItems();
+ exporter.items = ZoteroPane_Local.getSortedItems();
if(!exporter.items) throw ("No items to save");
// find name
- var search = ZoteroPane.getSelectedSavedSearch();
+ var search = ZoteroPane_Local.getSelectedSavedSearch();
if(search) {
exporter.name = search.name;
}
@@ -162,7 +162,7 @@ var Zotero_File_Interface = new function() {
function exportItems() {
var exporter = new Zotero_File_Exporter();
- exporter.items = ZoteroPane.getSelectedItems();
+ exporter.items = ZoteroPane_Local.getSelectedItems();
if(!exporter.items || !exporter.items.length) throw("no items currently selected");
exporter.save();
@@ -351,17 +351,17 @@ var Zotero_File_Interface = new function() {
*/
function bibliographyFromCollection() {
// find sorted items
- var items = Zotero.Items.get(ZoteroPane.getSortedItems(true));
+ var items = Zotero.Items.get(ZoteroPane_Local.getSortedItems(true));
if(!items) return;
// find name
var name = false;
- var collection = ZoteroPane.getSelectedCollection();
+ var collection = ZoteroPane_Local.getSelectedCollection();
if(collection) {
name = collection.getName();
} else {
- var searchRef = ZoteroPane.getSelectedSavedSearch();
+ var searchRef = ZoteroPane_Local.getSelectedSavedSearch();
if(searchRef) {
var search = new Zotero.Search();
search.id = searchRef.id;
@@ -379,7 +379,7 @@ var Zotero_File_Interface = new function() {
* Creates a bibliography from a items
*/
function bibliographyFromItems() {
- var items = ZoteroPane.getSelectedItems();
+ var items = ZoteroPane_Local.getSelectedItems();
if(!items || !items.length) throw("no items currently selected");
_doBibliographyOptions(Zotero.getString("fileInterface.untitledBibliography"), items);
diff --git a/chrome/content/zotero/itemPane.js b/chrome/content/zotero/itemPane.js
@@ -88,7 +88,7 @@ var ZoteroItemPane = new function() {
_lastItem = item;
if (index == 1) {
- var editable = ZoteroPane.canEdit();
+ var editable = ZoteroPane_Local.canEdit();
_notesButton.hidden = !editable;
while(_notesList.hasChildNodes()) {
@@ -109,7 +109,7 @@ var ZoteroItemPane = new function() {
label.setAttribute('crop','end');
var box = document.createElement('box');
- box.setAttribute('onclick',"ZoteroPane.selectItem(" + notes[i].id + ");");
+ box.setAttribute('onclick',"ZoteroPane_Local.selectItem(" + notes[i].id + ");");
box.setAttribute('class','zotero-clicky');
box.appendChild(icon);
box.appendChild(label);
@@ -146,7 +146,7 @@ var ZoteroItemPane = new function() {
this.addNote = function (popup) {
- ZoteroPane.newNote(popup, _lastItem.id);
+ ZoteroPane_Local.newNote(popup, _lastItem.id);
}
diff --git a/chrome/content/zotero/locateMenu.js b/chrome/content/zotero/locateMenu.js
@@ -42,7 +42,7 @@ var Zotero_LocateMenu = new function() {
locateMenu.removeChild(locateMenu.firstChild);
}
- var selectedItems = [item for each(item in ZoteroPane.getSelectedItems()) if(!item.isNote())];
+ var selectedItems = [item for each(item in ZoteroPane_Local.getSelectedItems()) if(!item.isNote())];
if(selectedItems.length) {
_addViewOptions(locateMenu, selectedItems, true, true);
@@ -98,7 +98,7 @@ var Zotero_LocateMenu = new function() {
*/
this.buildContextMenu = function(menu) {
// get selected items
- var selectedItems = [item for each(item in ZoteroPane.getSelectedItems()) if(!item.isNote())];
+ var selectedItems = [item for each(item in ZoteroPane_Local.getSelectedItems()) if(!item.isNote())];
// if no items selected, stop now
if(!selectedItems.length) return;
@@ -273,7 +273,7 @@ var Zotero_LocateMenu = new function() {
* Locate selected items
*/
function _locateItem(event) {
- var selectedItems = ZoteroPane.getSelectedItems();
+ var selectedItems = ZoteroPane_Local.getSelectedItems();
// find selected engine
var selectedEngine = Zotero.LocateManager.getEngineByName(event.target.label);
@@ -291,7 +291,7 @@ var Zotero_LocateMenu = new function() {
Zotero.debug("Loading using "+selectedEngine.name);
Zotero.debug(urls);
- ZoteroPane.loadURI(urls, event, postDatas);
+ ZoteroPane_Local.loadURI(urls, event, postDatas);
}
/**
@@ -330,7 +330,7 @@ var Zotero_LocateMenu = new function() {
for each(var item in items) {
var attachment = _getFirstAttachmentWithMIMEType(item, this._mimeTypes);
if(attachment) {
- ZoteroPane.viewAttachment(attachment.id, event);
+ ZoteroPane_Local.viewAttachment(attachment.id, event);
return;
}
}
@@ -357,7 +357,7 @@ var Zotero_LocateMenu = new function() {
this.handleItems = function(items, event) {
var urls = [_getURL(item) for each(item in items)];
- ZoteroPane.loadURI([url for each(url in urls) if(url)], event);
+ ZoteroPane_Local.loadURI([url for each(url in urls) if(url)], event);
}
function _getURL(item) {
@@ -420,7 +420,7 @@ var Zotero_LocateMenu = new function() {
for each(var item in items) {
var attachment = _getFile(item);
if(attachment) {
- ZoteroPane.viewAttachment(attachment.id, event);
+ ZoteroPane_Local.viewAttachment(attachment.id, event);
return;
}
}
@@ -458,7 +458,7 @@ var Zotero_LocateMenu = new function() {
for each(var item in items) {
var attachment = _getBestNonNativeAttachment(item);
if(attachment) {
- ZoteroPane.viewAttachment(attachment.id, event, false, this.useExternalViewer);
+ ZoteroPane_Local.viewAttachment(attachment.id, event, false, this.useExternalViewer);
return;
}
}
@@ -515,7 +515,7 @@ var Zotero_LocateMenu = new function() {
for each(var item in items) {
var attachment = _getBestFile(item);
if(attachment) {
- ZoteroPane.showAttachmentInFilesystem(attachment.id);
+ ZoteroPane_Local.showAttachmentInFilesystem(attachment.id);
return;
}
}
@@ -546,7 +546,7 @@ var Zotero_LocateMenu = new function() {
var url = Zotero.OpenURL.resolve(item);
if(url) urls.push(url);
}
- ZoteroPane.loadURI(urls, event);
+ ZoteroPane_Local.loadURI(urls, event);
}
};
}
\ No newline at end of file
diff --git a/chrome/content/zotero/recognizePDF.js b/chrome/content/zotero/recognizePDF.js
@@ -51,12 +51,12 @@ var Zotero_RecognizePDF = new function() {
* of the new items
*/
this.recognizeSelected = function() {
- var installed = ZoteroPane.checkPDFConverter();
+ var installed = ZoteroPane_Local.checkPDFConverter();
if (!installed) {
return;
}
- var items = ZoteroPane.getSelectedItems();
+ var items = ZoteroPane_Local.getSelectedItems();
if (!items) return;
var itemRecognizer = new Zotero_RecognizePDF.ItemRecognizer();
itemRecognizer.recognizeItems(items);
diff --git a/chrome/content/zotero/reportInterface.js b/chrome/content/zotero/reportInterface.js
@@ -36,23 +36,23 @@ var Zotero_Report_Interface = new function() {
function loadCollectionReport() {
var queryString = '';
- var col = ZoteroPane.getSelectedCollection();
- var sortColumn = ZoteroPane.getSortField();
- var sortDirection = ZoteroPane.getSortDirection();
+ var col = ZoteroPane_Local.getSelectedCollection();
+ var sortColumn = ZoteroPane_Local.getSortField();
+ var sortDirection = ZoteroPane_Local.getSortDirection();
if (sortColumn != 'title' || sortDirection != 'ascending') {
queryString = '?sort=' + sortColumn + (sortDirection != 'ascending' ? '' : '/d');
}
if (col) {
- ZoteroPane.loadURI('zotero://report/collection/'
+ ZoteroPane_Local.loadURI('zotero://report/collection/'
+ Zotero.Collections.getLibraryKeyHash(col)
+ '/html/report.html' + queryString);
return;
}
- var s = ZoteroPane.getSelectedSavedSearch();
+ var s = ZoteroPane_Local.getSelectedSavedSearch();
if (s) {
- ZoteroPane.loadURI('zotero://report/search/'
+ ZoteroPane_Local.loadURI('zotero://report/search/'
+ Zotero.Searches.getLibraryKeyHash(s)
+ '/html/report.html' + queryString);
return;
@@ -66,7 +66,7 @@ var Zotero_Report_Interface = new function() {
* Load a report for the currently selected items
*/
function loadItemReport() {
- var items = ZoteroPane.getSelectedItems();
+ var items = ZoteroPane_Local.getSelectedItems();
if (!items || !items.length) {
throw ('No items currently selected');
@@ -77,7 +77,7 @@ var Zotero_Report_Interface = new function() {
keyHashes.push(Zotero.Items.getLibraryKeyHash(item));
}
- ZoteroPane.loadURI('zotero://report/items/' + keyHashes.join('-') + '/html/report.html');
+ ZoteroPane_Local.loadURI('zotero://report/items/' + keyHashes.join('-') + '/html/report.html');
}
@@ -89,6 +89,6 @@ var Zotero_Report_Interface = new function() {
throw ('No itemIDs provided to loadItemReportByIds()');
}
- ZoteroPane.loadURI('zotero://report/items/' + ids.join('-') + '/html/report.html');
+ ZoteroPane_Local.loadURI('zotero://report/items/' + ids.join('-') + '/html/report.html');
}
}
diff --git a/chrome/content/zotero/timelineInterface.js b/chrome/content/zotero/timelineInterface.js
@@ -30,25 +30,25 @@ var Zotero_Timeline_Interface = new function() {
*/
this.loadTimeline = function () {
var uri = 'zotero://timeline/';
- var col = ZoteroPane.getSelectedCollection();
+ var col = ZoteroPane_Local.getSelectedCollection();
if (col) {
- ZoteroPane.loadURI(uri + 'collection/' + Zotero.Collections.getLibraryKeyHash(col));
+ ZoteroPane_Local.loadURI(uri + 'collection/' + Zotero.Collections.getLibraryKeyHash(col));
return;
}
- var s = ZoteroPane.getSelectedSavedSearch();
+ var s = ZoteroPane_Local.getSelectedSavedSearch();
if (s) {
- ZoteroPane.loadURI(uri + 'search/' + Zotero.Searches.getLibraryKeyHash(s));
+ ZoteroPane_Local.loadURI(uri + 'search/' + Zotero.Searches.getLibraryKeyHash(s));
return;
}
- var l = ZoteroPane.getSelectedLibraryID();
+ var l = ZoteroPane_Local.getSelectedLibraryID();
if (l) {
- ZoteroPane.loadURI(uri + 'library/' + l);
+ ZoteroPane_Local.loadURI(uri + 'library/' + l);
return;
}
- ZoteroPane.loadURI(uri);
+ ZoteroPane_Local.loadURI(uri);
}
}
diff --git a/chrome/content/zotero/xpcom/itemTreeView.js b/chrome/content/zotero/xpcom/itemTreeView.js
@@ -95,8 +95,8 @@ Zotero.ItemTreeView.prototype.setTree = function(treebox)
this._treebox = treebox;
- if (this._ownerDocument.defaultView.ZoteroPane) {
- this._ownerDocument.defaultView.ZoteroPane.setItemsPaneMessage(Zotero.getString('pane.items.loading'));
+ if (this._ownerDocument.defaultView.ZoteroPane_Local) {
+ this._ownerDocument.defaultView.ZoteroPane_Local.setItemsPaneMessage(Zotero.getString('pane.items.loading'));
}
// Generate the tree contents in a timer to allow message above to display
@@ -105,16 +105,16 @@ Zotero.ItemTreeView.prototype.setTree = function(treebox)
var msg = "Zotero is locked -- not loading items tree";
Zotero.debug(msg, 2);
- if (obj._ownerDocument.defaultView.ZoteroPane) {
- obj._ownerDocument.defaultView.ZoteroPane.clearItemsPaneMessage();
+ if (obj._ownerDocument.defaultView.ZoteroPane_Local) {
+ obj._ownerDocument.defaultView.ZoteroPane_Local.clearItemsPaneMessage();
}
return;
}
// If a DB transaction is open, display error message and bail
if (!Zotero.stateCheck()) {
- if (obj._ownerDocument.defaultView.ZoteroPane) {
- obj._ownerDocument.defaultView.ZoteroPane.displayErrorMessage();
+ if (obj._ownerDocument.defaultView.ZoteroPane_Local) {
+ obj._ownerDocument.defaultView.ZoteroPane_Local.displayErrorMessage();
}
return;
}
@@ -149,8 +149,8 @@ Zotero.ItemTreeView.prototype.setTree = function(treebox)
//Zotero.debug('Running callbacks in itemTreeView.setTree()', 4);
obj._runCallbacks();
- if (obj._ownerDocument.defaultView.ZoteroPane) {
- obj._ownerDocument.defaultView.ZoteroPane.clearItemsPaneMessage();
+ if (obj._ownerDocument.defaultView.ZoteroPane_Local) {
+ obj._ownerDocument.defaultView.ZoteroPane_Local.clearItemsPaneMessage();
}
// Select a queued item from selectItem()
@@ -1298,9 +1298,9 @@ Zotero.ItemTreeView.prototype.selectItem = function(id, expand, noRecurse)
// Clear the quicksearch and tag selection and try again (once)
if (!noRecurse) {
- if (this._ownerDocument.defaultView.ZoteroPane) {
- this._ownerDocument.defaultView.ZoteroPane.clearQuicksearch();
- this._ownerDocument.defaultView.ZoteroPane.clearTagSelection();
+ if (this._ownerDocument.defaultView.ZoteroPane_Local) {
+ this._ownerDocument.defaultView.ZoteroPane_Local.clearQuicksearch();
+ this._ownerDocument.defaultView.ZoteroPane_Local.clearTagSelection();
}
return this.selectItem(id, expand, true);
}
