fx-compat: Item box: Disable guidancepanel trigger + cleanup
This commit is contained in:
parent
6f8c5d7c51
commit
8ff75607a5
1 changed files with 446 additions and 463 deletions
|
@ -1185,8 +1185,7 @@
|
|||
elem.scrollIntoView();
|
||||
}
|
||||
|
||||
changeTypeTo(itemTypeID, menu) {
|
||||
return (async function () {
|
||||
async changeTypeTo(itemTypeID, menu) {
|
||||
var functionsToRun = [];
|
||||
if (this.eventHandlers.itemtypechange && this.eventHandlers.itemtypechange.length) {
|
||||
functionsToRun = [...this.eventHandlers.itemtypechange];
|
||||
|
@ -1275,7 +1274,6 @@
|
|||
}
|
||||
|
||||
return false;
|
||||
}.bind(this))();
|
||||
}
|
||||
|
||||
toggleAbstractExpand(label, valueElement) {
|
||||
|
@ -1455,8 +1453,7 @@
|
|||
return valueElement;
|
||||
}
|
||||
|
||||
removeCreator(index, labelToDelete) {
|
||||
return (async function () {
|
||||
async removeCreator(index, labelToDelete) {
|
||||
// If unsaved row, just remove element
|
||||
if (!this.item.hasCreatorAt(index)) {
|
||||
labelToDelete.parentNode.removeChild(labelToDelete);
|
||||
|
@ -1473,11 +1470,9 @@
|
|||
this.item.removeCreator(index);
|
||||
await this.blurOpenField();
|
||||
await this.item.saveTx();
|
||||
}.bind(this))();
|
||||
}
|
||||
|
||||
showEditor(elem) {
|
||||
return (async () => {
|
||||
async showEditor(elem) {
|
||||
Zotero.debug(`Showing editor for ${elem.getAttribute('fieldname')}`);
|
||||
|
||||
var label = elem.closest('tr').querySelector('th');
|
||||
|
@ -1498,12 +1493,6 @@
|
|||
}
|
||||
}
|
||||
|
||||
// In Firefox 45, when clicking a multiline field such as Extra, the event is
|
||||
// triggered on the inner 'description' element instead of the 'vbox'.
|
||||
if (elem.tagName == 'description') {
|
||||
elem = elem.parentNode;
|
||||
}
|
||||
|
||||
var fieldName = elem.getAttribute('fieldname');
|
||||
var tabindex = elem.getAttribute('ztabindex');
|
||||
|
||||
|
@ -1637,10 +1626,9 @@
|
|||
removeEventListener("activate", unignoreBlur);
|
||||
this.blurHandler(t);
|
||||
});
|
||||
t.onkeypress = (event) => this.handleKeyPress(event);
|
||||
t.addEventListener('keypress', event => this.handleKeyPress(event));
|
||||
|
||||
return t;
|
||||
})();
|
||||
}
|
||||
|
||||
|
||||
|
@ -1815,8 +1803,7 @@
|
|||
}
|
||||
}
|
||||
|
||||
hideEditor(textbox) {
|
||||
return (async function () {
|
||||
async hideEditor(textbox) {
|
||||
// Handle cases where creator autocomplete doesn't trigger
|
||||
// the textentered and change events handled in showEditor
|
||||
if (textbox.getAttribute('fieldname').startsWith('creator-')) {
|
||||
|
@ -1931,9 +1918,10 @@
|
|||
if (Zotero.ItemTypes.getName(this.item.itemTypeID) === "bookSection") {
|
||||
var creatorTypeLabels = this.getElementsByClassName("creator-type-label");
|
||||
Zotero.debug(creatorTypeLabels[creatorTypeLabels.length-1] + "");
|
||||
document.getElementById("zotero-author-guidance").show({
|
||||
forEl: creatorTypeLabels[creatorTypeLabels.length-1]
|
||||
});
|
||||
// fx-compat TODO: Re-enable this
|
||||
// document.getElementById("zotero-author-guidance").show({
|
||||
// forEl: creatorTypeLabels[creatorTypeLabels.length-1]
|
||||
// });
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -2015,7 +2003,6 @@
|
|||
if (this.saveOnEdit) {
|
||||
await this.item.saveTx();
|
||||
}
|
||||
}.bind(this))();
|
||||
}
|
||||
|
||||
_rowIsClickable(fieldName) {
|
||||
|
@ -2137,8 +2124,7 @@
|
|||
/**
|
||||
* @return {Promise}
|
||||
*/
|
||||
swapNames(event) {
|
||||
return (async function () {
|
||||
async swapNames(event) {
|
||||
var row = document.popupNode.closest('tr');
|
||||
var typeBox = row.querySelector('.creator-type-label');
|
||||
var creatorIndex = parseInt(typeBox.getAttribute('fieldname').split('-')[1]);
|
||||
|
@ -2153,7 +2139,6 @@
|
|||
await this.blurOpenField();
|
||||
await this.item.saveTx();
|
||||
}
|
||||
}.bind(this))();
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -2292,14 +2277,12 @@
|
|||
return true;
|
||||
}
|
||||
|
||||
blurOpenField() {
|
||||
return (async function () {
|
||||
async blurOpenField() {
|
||||
var activeField = this._infoTable.querySelector('input, textarea');
|
||||
if (!activeField) {
|
||||
return false;
|
||||
}
|
||||
return this.blurHandler(activeField);
|
||||
}.bind(this))();
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue