suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Undo behavior in notes (right pane and separate window) to not undo content from other notes into current one and to not undo to empty where possible

Browse Source
This commit is contained in:
Dan Stillman 2007-12-15 21:26:33 +00:00
parent c357a25045
commit 6a71c39d91
2 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
chrome/content/zotero/note.js
View File

@ -45,7 +45,14 @@ function onLoad()
if (itemID) {
var ref = Zotero.Items.get(itemID);
// Make sure Undo doesn't wipe out the note
if (!noteEditor.note || noteEditor.note.getID() != ref.getID()) {
noteEditor.id('noteField').editor.enableUndo(false);
}
noteEditor.note = ref;
noteEditor.id('noteField').editor.enableUndo(true);
document.title = ref.getNoteTitle();
}
else if (parentItemID) {
@ -72,9 +79,18 @@ function onUnload()
var NotifyCallback = {
notify: function(action, type, ids){
// DEBUG: why does this reset without checking the modified ids?
if (noteEditor.note){
if (noteEditor.note) {
noteEditor.note = noteEditor.note;
document.title = noteEditor.note.getNoteTitle();
// If the document title hasn't yet been set, reset undo so
// undoing to empty isn't possible
var noteTitle = noteEditor.note.getNoteTitle();
if (!document.title && noteTitle != '') {
noteEditor.id('noteField').editor.enableUndo(false);
noteEditor.id('noteField').editor.enableUndo(true);
document.title = noteTitle;
}
// Update the window name (used for focusing) in case this is a new note
window.name = 'zotero-note-' + noteEditor.note.getID();
}

10
chrome/content/zotero/overlay.js
View File

@ -763,8 +763,18 @@ var ZoteroPane = new function()
if(item.isNote())
{
var noteEditor = document.getElementById('zotero-note-editor');
// If loading new or different note, disable undo while we repopulate the text field
// so Undo doesn't end up clearing the field. This also ensures that Undo doesn't
// undo content from another note into the current one.
if (!noteEditor.note || noteEditor.note.getID() != item.ref.getID()) {
noteEditor.id('noteField').editor.enableUndo(false);
}
noteEditor.item = null;
noteEditor.note = item.ref;
noteEditor.id('noteField').editor.enableUndo(true);
document.getElementById('zotero-view-note-button').setAttribute('noteID',item.ref.getID());
if(item.ref.getSource())
{