Fix note editor tests
This commit is contained in:
parent
232ffba2ab
commit
5266734ac9
5 changed files with 22 additions and 10 deletions
|
@ -106,6 +106,16 @@
|
||||||
onReturn: this._returnHandler,
|
onReturn: this._returnHandler,
|
||||||
placeholder: this.placeholder
|
placeholder: this.placeholder
|
||||||
});
|
});
|
||||||
|
if (this._onInitCallback) {
|
||||||
|
this._onInitCallback();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
this.onInit = (callback) => {
|
||||||
|
if (this._editorInstance) {
|
||||||
|
return callback();
|
||||||
|
}
|
||||||
|
this._onInitCallback = callback;
|
||||||
}
|
}
|
||||||
|
|
||||||
this.notify = async (event, type, ids, extraData) => {
|
this.notify = async (event, type, ids, extraData) => {
|
||||||
|
|
|
@ -126,7 +126,7 @@ class EditorInstance {
|
||||||
|
|
||||||
saveSync() {
|
saveSync() {
|
||||||
if (!this._readOnly && !this._disableSaving && this._iframeWindow) {
|
if (!this._readOnly && !this._disableSaving && this._iframeWindow) {
|
||||||
let noteData = this._iframeWindow.wrappedJSObject.getDataSync();
|
let noteData = this._iframeWindow.wrappedJSObject.getDataSync(true);
|
||||||
if (noteData) {
|
if (noteData) {
|
||||||
noteData = JSON.parse(JSON.stringify(noteData));
|
noteData = JSON.parse(JSON.stringify(noteData));
|
||||||
}
|
}
|
||||||
|
|
|
@ -282,16 +282,18 @@ describe("Item pane", function () {
|
||||||
|
|
||||||
// Wait for the editor
|
// Wait for the editor
|
||||||
yield new Zotero.Promise((resolve, reject) => {
|
yield new Zotero.Promise((resolve, reject) => {
|
||||||
noteEditor.noteField.onInit(() => resolve());
|
noteEditor.onInit(() => resolve());
|
||||||
})
|
});
|
||||||
assert.equal(noteEditor.noteField.value, '');
|
assert.equal(noteEditor._editorInstance._iframeWindow.wrappedJSObject.getDataSync(), null);
|
||||||
|
|
||||||
item.setNote('<p>Test</p>');
|
item.setNote('<p>Test</p>');
|
||||||
yield item.saveTx();
|
yield item.saveTx();
|
||||||
|
|
||||||
assert.equal(noteEditor.noteField.value, '<p>Test</p>');
|
// Wait for asynchronous editor update
|
||||||
})
|
do {
|
||||||
})
|
yield Zotero.Promise.delay(10);
|
||||||
|
} while(noteEditor._editorInstance._iframeWindow.wrappedJSObject.getDataSync().html != '<div data-schema-version="1"><p>Test</p></div>');
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
describe("Feed buttons", function() {
|
describe("Feed buttons", function() {
|
||||||
describe("Mark as Read/Unread", function() {
|
describe("Mark as Read/Unread", function() {
|
||||||
|
|
|
@ -20,7 +20,7 @@ describe("Note Editor", function () {
|
||||||
noteEditor = win.document.getElementById('zotero-note-editor');
|
noteEditor = win.document.getElementById('zotero-note-editor');
|
||||||
}
|
}
|
||||||
return new Zotero.Promise((resolve, reject) => {
|
return new Zotero.Promise((resolve, reject) => {
|
||||||
noteEditor.noteField.onInit(() => resolve(noteEditor));
|
noteEditor.onInit(() => resolve(noteEditor));
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 73808236baa117a0e712e21f3c0ac06af1a553f0
|
Subproject commit 007082af6c4a534d98bc4a6e04c899bb5e9520d8
|
Loading…
Add table
Add a link
Reference in a new issue