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

- Fix error saving attachments

Browse source 
- Increase default separate note window height
This commit is contained in:
Dan Stillman 2008-10-15 05:30:59 +00:00
parent 1d6dea45ec
commit ad5ac7ba64
2 changed files with 16 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
chrome/content/zotero/note.xul
View file

@ -8,7 +8,7 @@
id="zotero-note-window" id="zotero-note-window"
orient="vertical" orient="vertical"
width="400" width="400"
height="250" height="350"
title="&zotero.items.menu.attach.note;" title="&zotero.items.menu.attach.note;"
persist="screenX screenY width height" persist="screenX screenY width height"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">

28
chrome/content/zotero/xpcom/data/item.js
View file

@ -1996,21 +1996,23 @@ Zotero.Item.prototype.getNote = function() {
var note = Zotero.DB.valueQuery(sql, this.id); var note = Zotero.DB.valueQuery(sql, this.id);
// Convert non-HTML notes on-the-fly // Convert non-HTML notes on-the-fly
if (!note.match(/^<div class="zotero-note znv[0-9]+">[\s\S]*<\/div>$/)) { if (note) {
note = Zotero.Utilities.prototype.htmlSpecialChars(note); if (!note.match(/^<div class="zotero-note znv[0-9]+">[\s\S]*<\/div>$/)) {
note = '<p>' note = Zotero.Utilities.prototype.htmlSpecialChars(note);
+ note.replace(/\n/g, '</p><p>') note = '<p>'
.replace(/\t/g, '&nbsp;&nbsp;&nbsp;&nbsp;') + note.replace(/\n/g, '</p><p>')
.replace(/ /g, '&nbsp;&nbsp;') .replace(/\t/g, '&nbsp;&nbsp;&nbsp;&nbsp;')
+ '</p>'; .replace(/ /g, '&nbsp;&nbsp;')
note = note.replace(/<p>\s*<\/p>/g, '<p>&nbsp;</p>'); + '</p>';
var sql = "UPDATE itemNotes SET note=? WHERE itemID=?"; note = note.replace(/<p>\s*<\/p>/g, '<p>&nbsp;</p>');
Zotero.DB.query(sql, [note, this.id]); var sql = "UPDATE itemNotes SET note=? WHERE itemID=?";
Zotero.DB.query(sql, [note, this.id]);
}
// Don't include <div> wrapper when returning value
note = note.replace(/^<div class="zotero-note znv[0-9]+">([\s\S]*)<\/div>$/, '$1');
} }
// Don't include <div> wrapper when returning value
note = note.replace(/^<div class="zotero-note znv[0-9]+">([\s\S]*)<\/div>$/, '$1');
this._noteText = note ? note : ''; this._noteText = note ? note : '';
return this._noteText; return this._noteText;