www

commit f92ed125b6e06ab04dcade8bd5f00fce1b31ea69
parent fdf1c35114dbafd1574df45d8ff0e126900a0cd3
Author: Dan Stillman <dstillman@zotero.org>
Date:   Mon, 25 Feb 2013 12:46:43 -0500

Merge branch '3.0' into 3.1

Conflicts:
	chrome/content/zotero/tinymce/note.html
	chrome/content/zotero/tinymce/noteview.html
	chrome/content/zotero/xpcom/zotero.js
	install.rdf
	update.rdf

Diffstat:
M
chrome/content/zotero/xpcom/integration.js
 | 
3
+++
M
chrome/content/zotero/xpcom/itemTreeView.js
 | 
5
+++++
M
resource/schema/repotime.txt
 | 
2
+-

3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/chrome/content/zotero/xpcom/integration.js b/chrome/content/zotero/xpcom/integration.js
@@ -2155,6 +2155,9 @@ Zotero.Integration.Session.prototype.getCitationField = function(citation) {
 			serializeCitationItem.id = citationItem.itemData.id;
 			serializeCitationItem.uris = citationItem.uris;
 			
+			// XXX For compatibility with older versions of Zotero; to be removed at a later date
+			serializeCitationItem.uri = serializeCitationItem.uris;
+			
 			// always store itemData, since we have no way to get it back otherwise
 			serializeCitationItem.itemData = citationItem.itemData;
 			addSchema = true;
diff --git a/chrome/content/zotero/xpcom/itemTreeView.js b/chrome/content/zotero/xpcom/itemTreeView.js
@@ -507,6 +507,11 @@ Zotero.ItemTreeView.prototype.notify = function(action, type, ids, extraData)
 			for each(var item in items) {
 				var id = item.id;
 				
+				// Make sure row map is up to date
+				// if we made changes in a previous loop
+				if (madeChanges) {
+					this._refreshHashMap();
+				}
 				var row = this._itemRowMap[id];
 				
 				// Deleted items get a modify that we have to ignore when
diff --git a/resource/schema/repotime.txt b/resource/schema/repotime.txt
@@ -1 +1 @@
-2013-02-08 07:00:00
+2013-02-19 00:25:00