www

Unnamed repository; edit this file 'description' to name the repository.
Log | Files | Refs | Submodules | README | LICENSE
commit d382f293caab047e65650c2f83710bb32808c7b5
parent 6cdcb8a1fbb5813dfbf25a2d3bb223ebb7c362c6
Author: Simon Kornblith <simon@simonster.com>
Date:   Wed, 24 Aug 2011 06:58:42 +0000

Add link to cslPreview.xul and make sure things work in Standalone (and tab mode)


Diffstat:

Mchrome/content/zotero/preferences/preferences.xul | 1+


Mchrome/content/zotero/tools/csledit.xul | 9+--------


Mchrome/content/zotero/tools/cslpreview.xul | 13+++----------


Mchrome/locale/en-US/zotero/preferences.dtd | 5+++--


4 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/chrome/content/zotero/preferences/preferences.xul b/chrome/content/zotero/preferences/preferences.xul
@@ -807,6 +807,7 @@ To add a new preference:
 			<hbox align="center">
 				<button id="openAboutConfig" label="&zotero.preferences.openAboutConfig;" oncommand="openInViewer('about:config', '')"/>
 				<button id="openCSLEdit" label="&zotero.preferences.openCSLEdit;" oncommand="openInViewer('chrome://zotero/content/tools/cslEdit.xul', '')"/>
+				<button id="openCSLPreview" label="&zotero.preferences.openCSLPreview;" oncommand="openInViewer('chrome://zotero/content/tools/cslPreview.xul', '')"/>
 			</hbox>
 		</groupbox>
 		
diff --git a/chrome/content/zotero/tools/csledit.xul b/chrome/content/zotero/tools/csledit.xul
@@ -37,13 +37,6 @@
 	<script>
 	<![CDATA[
 		var Zotero_CSL_Editor = new function() {
-			var mainWindow = window.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
-				.getInterface(Components.interfaces.nsIWebNavigation)
-				.QueryInterface(Components.interfaces.nsIDocShellTreeItem)
-				.rootTreeItem
-				.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
-				.getInterface(Components.interfaces.nsIDOMWindow);
-			
 			this.init = init;
 			this.handleKeyPress = handleKeyPress;
 			this.loadCSL = loadCSL;
@@ -103,7 +96,7 @@
 				var editor = document.getElementById('zotero-csl-editor')
 				var iframe = document.getElementById('zotero-csl-preview-box');
 				
-				var items = mainWindow.ZoteroPane.getSelectedItems();
+				var items = Zotero.getActiveZoteroPane().getSelectedItems();
 				if (items.length == 0) {
 					iframe.contentDocument.documentElement.innerHTML = '<html><head><title></title></head><body><p style="color: red">No references selected in Zotero.</p></body></html>';
 					return;
diff --git a/chrome/content/zotero/tools/cslpreview.xul b/chrome/content/zotero/tools/cslpreview.xul
@@ -40,13 +40,6 @@
 		default xml namespace = "http://purl.org/net/xbiblio/csl";
 
 		var Zotero_CSL_Preview = new function() {
-			var mainWindow = window.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
-				.getInterface(Components.interfaces.nsIWebNavigation)
-				.QueryInterface(Components.interfaces.nsIDocShellTreeItem)
-				.rootTreeItem
-				.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
-				.getInterface(Components.interfaces.nsIDOMWindow);
-			
 			this.init = init;
 			this.refresh = refresh;
 			this.generateBibliography = generateBibliography;
@@ -56,7 +49,7 @@
 			}
 			function refresh() {
 				var iframe = document.getElementById('zotero-csl-preview-box');
-				var items = mainWindow.ZoteroPane.getSelectedItems();
+				var items = Zotero.getActiveZoteroPane().getSelectedItems();
 				if (items.length == 0) {
 					iframe.contentDocument.documentElement.innerHTML = '<html><head><title></title></head><body><p style="color: red">No references selected in Zotero.</p></body></html>';
 					return;
@@ -65,7 +58,7 @@
 				// XXX needs its own string really!
 				progressWin.changeHeadline(Zotero.getString("pane.items.menu.createBib.multiple"));
 				var icon = 'chrome://zotero/skin/treeitem-attachment-file.png';
-				progressWin.addLines(window.content.document.title, icon)
+				progressWin.addLines(document.title, icon)
 				progressWin.show();
 				progressWin.startCloseTimer();
 				var f = function() {
@@ -94,7 +87,7 @@
 			function generateBibliography(style) {
 				var iframe = document.getElementById('zotero-csl-preview-box');
 				
-				var items = mainWindow.ZoteroPane.getSelectedItems();
+				var items = Zotero.getActiveZoteroPane().getSelectedItems();
 				if (items.length == 0) {
 					iframe.contentDocument.documentElement.innerHTML = '<html><head><title></title></head><body><p style="color: red">No references selected in Zotero.</p></body></html>';
 					return '';
diff --git a/chrome/locale/en-US/zotero/preferences.dtd b/chrome/locale/en-US/zotero/preferences.dtd
@@ -186,4 +186,5 @@
 <!ENTITY zotero.preferences.debugOutputLogging.submitToServer			"Submit to Zotero Server">
 
 <!ENTITY zotero.preferences.openAboutConfig				"Open about:config">
-<!ENTITY zotero.preferences.openCSLEdit					"Open csledit.xul">
-\ No newline at end of file
+<!ENTITY zotero.preferences.openCSLEdit					"Open CSL Editor">
+<!ENTITY zotero.preferences.openCSLPreview				"Open CSL Preview">
+\ No newline at end of file