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

Merge branch '4.0'

Browse source 
Conflicts:
	chrome/content/zotero/xpcom/schema.js
This commit is contained in:
Dan Stillman 2013-08-16 18:16:59 -04:00
commit 4384a8ecc2
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
chrome/content/zotero/preferences/quickCopySiteEditor.xul
View file

@ -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>

2
chrome/content/zotero/xpcom/data/collection.js
View file

@ -1497,5 +1497,5 @@ Zotero.Collection.prototype._refreshChildCollections = function () {
Zotero.Collection.prototype._generateKey = function () {
return Zotero.Utilites.generateObjectKey();
return Zotero.Utilities.generateObjectKey();
}

2
chrome/content/zotero/xpcom/data/creator.js
View file

@ -552,7 +552,7 @@ Zotero.Creator.prototype._checkValue = function (field, value) {
Zotero.Creator.prototype._generateKey = function () {
return Zotero.Utilites.generateObjectKey();
return Zotero.Utilities.generateObjectKey();
}

2
chrome/content/zotero/xpcom/data/item.js
View file

@ -5189,7 +5189,7 @@ Zotero.Item.prototype._clearFieldChange = function (field) {
Zotero.Item.prototype._generateKey = function () {
return Zotero.Utilites.generateObjectKey();
return Zotero.Utilities.generateObjectKey();
}

2
chrome/content/zotero/xpcom/data/tag.js
View file

@ -773,6 +773,6 @@ Zotero.Tag.prototype._prepFieldChange = function (field) {
Zotero.Tag.prototype._generateKey = function () {
return Zotero.Utilites.generateObjectKey();
return Zotero.Utilities.generateObjectKey();
}