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

Focus note-editor faster

Browse source
This commit is contained in:
Martynas Bagdonas 2021-04-27 11:00:36 +03:00
parent 0b219ed8a7
commit 09125277ac
3 changed files with 48 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
chrome/content/zotero/bindings/noteeditor.xml
View file

@ -227,9 +227,38 @@
<field name="_item"/>
<property name="item" onget="return this._item;">
<setter><![CDATA[
return (async () => {
// The binding can be immediately destroyed
// (which i.e. happens in merge dialog)
if (this._destroyed) {
return;
}
if (!val) {
this._item = null;
}
if (this._item && this._item.id === val.id) {
return;
}
if (this._editorInstance) {
this._editorInstance.uninit();
this._editorInstance = null;
}
this._lastHtmlValue = val.note;
this._item = val;
// var parentKey = this._item.parentKey;
// if (parentKey) {
// this.parentItem = Zotero.Items.getByLibraryAndKey(this._item.libraryID, parentKey);
// }
this._id('links-box').item = this._item;
(async () => {
// `item` field can be set before the constructor is called
// or noteditor is attached to dom (which happens in the
// or noteeditor is attached to dom (which happens in the
// merge dialog i.e.), therefore we wait for the initialization
let n = 0;
while (!this._initialized && !this._destroyed) {
@ -240,27 +269,11 @@
n++;
}
// The binding can also be immediately destructed
// (which also happens in the merge dialog)
if (this._destroyed) {
return;
}
if (!val) this._item = null;
if (this._item && this._item.id === val.id) return;
this._lastHtmlValue = val.note;
this._item = val;
this.initEditor();
// var parentKey = this._item.parentKey;
// if (parentKey) {
// this.parentItem = Zotero.Items.getByLibraryAndKey(this._item.libraryID, parentKey);
// }
this._id('links-box').item = this._item;
})();
]]></setter>
</property>
@ -325,13 +338,15 @@
<method name="focus">
<body>
<![CDATA[
setTimeout(() => {
if (this._iframe && this._iframe.contentWindow) {
this._iframe.focus();
this._editorInstance.focus();
(async () => {
let n = 0;
while (!this._editorInstance && n++ < 100) {
await Zotero.Promise.delay(10);
}
}, 500);
await this._editorInstance._initPromise;
this._iframe.focus();
this._editorInstance.focus();
})();
]]>
</body>
</method>

8
chrome/content/zotero/xpcom/editorInstance.js
View file

@ -67,6 +67,10 @@ class EditorInstance {
this._quickFormatWindow = null;
this._isAttachment = this._item.isAttachment();
this._citationItemsList = [];
this._initPromise = new Promise((resolve, reject) => {
this._resolveInitPromise = resolve;
this._rejectInitPromise = reject;
});
this._prefObserverIDs = [
Zotero.Prefs.registerObserver('note.fontSize', this._handleFontChange),
Zotero.Prefs.registerObserver('note.fontFamily', this._handleFontChange)
@ -436,6 +440,10 @@ class EditorInstance {
let message = e.data.message;
try {
switch (message.action) {
case 'initialized': {
this._resolveInitPromise();
return;
}
case 'insertObject': {
let { type, data, pos } = message;
if (this._readOnly) {

2
note-editor

@ -1 +1 @@
Subproject commit 743160b8c75a78aac1b4a5bb394840085cd1c50a
Subproject commit 5089831c44c6e26af532292d159a2c0e6d16e941