Merge branch '4.0'
Conflicts: chrome/content/zotero/xpcom/schema.js
This commit is contained in:
commit
4384a8ecc2
5 changed files with 7 additions and 7 deletions
|
@ -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>
|
||||
|
|
|
@ -1497,5 +1497,5 @@ Zotero.Collection.prototype._refreshChildCollections = function () {
|
|||
|
||||
|
||||
Zotero.Collection.prototype._generateKey = function () {
|
||||
return Zotero.Utilites.generateObjectKey();
|
||||
return Zotero.Utilities.generateObjectKey();
|
||||
}
|
||||
|
|
|
@ -552,7 +552,7 @@ Zotero.Creator.prototype._checkValue = function (field, value) {
|
|||
|
||||
|
||||
Zotero.Creator.prototype._generateKey = function () {
|
||||
return Zotero.Utilites.generateObjectKey();
|
||||
return Zotero.Utilities.generateObjectKey();
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -5189,7 +5189,7 @@ Zotero.Item.prototype._clearFieldChange = function (field) {
|
|||
|
||||
|
||||
Zotero.Item.prototype._generateKey = function () {
|
||||
return Zotero.Utilites.generateObjectKey();
|
||||
return Zotero.Utilities.generateObjectKey();
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -773,6 +773,6 @@ Zotero.Tag.prototype._prepFieldChange = function (field) {
|
|||
|
||||
|
||||
Zotero.Tag.prototype._generateKey = function () {
|
||||
return Zotero.Utilites.generateObjectKey();
|
||||
return Zotero.Utilities.generateObjectKey();
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue