www

commit 4384a8ecc28948158a2ba1bd9d5066a488cc503b
parent 2d7d72fb2ab0f9b68196fe9990d9f5c6209db660
Author: Dan Stillman <dstillman@zotero.org>
Date:   Fri, 16 Aug 2013 18:16:59 -0400

Merge branch '4.0'

Conflicts:
	chrome/content/zotero/xpcom/schema.js

Diffstat:
M
chrome/content/zotero/preferences/quickCopySiteEditor.xul
 | 
6
+++---
M
chrome/content/zotero/xpcom/data/collection.js
 | 
2
+-
M
chrome/content/zotero/xpcom/data/creator.js
 | 
2
+-
M
chrome/content/zotero/xpcom/data/item.js
 | 
2
+-
M
chrome/content/zotero/xpcom/data/tag.js
 | 
2
+-

5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/chrome/content/zotero/preferences/quickCopySiteEditor.xul b/chrome/content/zotero/preferences/quickCopySiteEditor.xul
@@ -60,7 +60,7 @@
 		<menulist id="zotero-quickCopy-menu"/>
 		<separator class="thin"/>
 		<checkbox id="zotero-quickCopy-copyAsHTML" label="&zotero.preferences.quickCopy.copyAsHTML;"
-			oncommand="Zotero_Preferences.Export.buildQuickCopyFormatDropDown(
+			oncommand="window.opener.Zotero_Preferences.Export.buildQuickCopyFormatDropDown(
 				document.getElementById('zotero-quickCopy-menu'), this.checked ? 'html' : ''
 			)"/>
 	</vbox>
@@ -69,12 +69,12 @@
 	<![CDATA[
 		var io = window.arguments[0];
 		document.getElementById('zotero-quickCopy-domain').value = io.domain ? io.domain : '';
-		Zotero_Preferences.Export.buildQuickCopyFormatDropDown(
+		window.opener.Zotero_Preferences.Export.buildQuickCopyFormatDropDown(
 			document.getElementById('zotero-quickCopy-menu'),
 			Zotero.QuickCopy.getContentType(io.format),
 			io.format
 		);
-		Zotero_Preferences.Export.updateQuickCopyHTMLCheckbox();
+		window.opener.Zotero_Preferences.Export.updateQuickCopyHTMLCheckbox();
 	]]>
 	</script>
 </dialog>
diff --git a/chrome/content/zotero/xpcom/data/collection.js b/chrome/content/zotero/xpcom/data/collection.js
@@ -1497,5 +1497,5 @@ Zotero.Collection.prototype._refreshChildCollections = function () {
 
 
 Zotero.Collection.prototype._generateKey = function () {
-	return Zotero.Utilites.generateObjectKey();
+	return Zotero.Utilities.generateObjectKey();
 }
diff --git a/chrome/content/zotero/xpcom/data/creator.js b/chrome/content/zotero/xpcom/data/creator.js
@@ -552,7 +552,7 @@ Zotero.Creator.prototype._checkValue = function (field, value) {
 
 
 Zotero.Creator.prototype._generateKey = function () {
-	return Zotero.Utilites.generateObjectKey();
+	return Zotero.Utilities.generateObjectKey();
 }
 
 
diff --git a/chrome/content/zotero/xpcom/data/item.js b/chrome/content/zotero/xpcom/data/item.js
@@ -5189,7 +5189,7 @@ Zotero.Item.prototype._clearFieldChange = function (field) {
 
 
 Zotero.Item.prototype._generateKey = function () {
-	return Zotero.Utilites.generateObjectKey();
+	return Zotero.Utilities.generateObjectKey();
 }
 
 
diff --git a/chrome/content/zotero/xpcom/data/tag.js b/chrome/content/zotero/xpcom/data/tag.js
@@ -773,6 +773,6 @@ Zotero.Tag.prototype._prepFieldChange = function (field) {
 
 
 Zotero.Tag.prototype._generateKey = function () {
-	return Zotero.Utilites.generateObjectKey();
+	return Zotero.Utilities.generateObjectKey();
 }