From eb79a0f65946e9ab03c315f98ab2da4d3f34928f Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Wed, 28 Jan 2009 21:25:06 +0000 Subject: [PATCH] Addresses #513, Deleted Items folder - Still experimental, but committing for testing - Sync conflicts with deleted items aren't yet supported Unrelated: deprecated ZoteroPane.deleteSelectedItem() in favor of more accurately named deleteSelectedItems() --- chrome/content/zotero/bindings/noteeditor.xml | 13 ++- chrome/content/zotero/itemPane.js | 5 +- chrome/content/zotero/overlay.js | 104 ++++++++++++++---- chrome/content/zotero/overlay.xul | 10 +- .../zotero/xpcom/collectionTreeView.js | 20 ++++ chrome/content/zotero/xpcom/data/item.js | 79 ++++++++++++- chrome/content/zotero/xpcom/data/items.js | 57 ++++++++++ chrome/content/zotero/xpcom/itemTreeView.js | 31 ++++-- chrome/content/zotero/xpcom/schema.js | 7 +- chrome/content/zotero/xpcom/search.js | 33 +++--- chrome/content/zotero/xpcom/sync.js | 9 ++ chrome/locale/en-US/zotero/zotero.dtd | 1 + chrome/locale/en-US/zotero/zotero.properties | 3 + .../skin/default/zotero/treesource-trash.png | Bin 0 -> 476 bytes triggers.sql | 37 ++++++- userdata.sql | 7 +- 16 files changed, 359 insertions(+), 57 deletions(-) create mode 100644 chrome/skin/default/zotero/treesource-trash.png diff --git a/chrome/content/zotero/bindings/noteeditor.xml b/chrome/content/zotero/bindings/noteeditor.xml index 0affde8a96..2614e9f83b 100644 --- a/chrome/content/zotero/bindings/noteeditor.xml +++ b/chrome/content/zotero/bindings/noteeditor.xml @@ -146,13 +146,17 @@ var parentbox = this._id('citeLabel'); var textbox = this._id('noteField'); + var textboxReadOnly = this._id('noteFieldReadOnly'); var button = this._id('goButton'); if (this.editable) { - textbox.removeAttribute('readonly'); + textbox.hidden = false; + textboxReadOnly.hidden = true; } else { - textbox.setAttribute('readonly', 'true'); + textbox.hidden = true; + textboxReadOnly.hidden = false; + textbox = textboxReadOnly; } //var scrollPos = textbox.inputField.scrollTop; @@ -361,7 +365,10 @@ - +