www

commit 14d669c00a941b170e55cf43b7316a9d88c981b2
parent ed49b867ac3405c10963ae979d4310fb9ccc6d01
Author: Simon Kornblith <simon@simonster.com>
Date:   Sat, 14 Jul 2012 18:28:12 -0400

Kill zoteroconf remnants that used E4X

Diffstat:
M
chrome/content/zotero/xpcom/collectionTreeView.js
 | 
36
------------------------------------
M
chrome/content/zotero/xpcom/itemTreeView.js
 | 
14
--------------

2 files changed, 0 insertions(+), 50 deletions(-)
diff --git a/chrome/content/zotero/xpcom/collectionTreeView.js b/chrome/content/zotero/xpcom/collectionTreeView.js
@@ -182,14 +182,6 @@ Zotero.CollectionTreeView.prototype.refresh = function()
 		}
 	}
 	
-	/*var shares = Zotero.Zeroconf.instances;
-	if (shares.length) {
-		this._showRow(new Zotero.ItemGroup('separator', false));
-		for each(var share in shares) {
-			this._showRow(new Zotero.ItemGroup('share', share));
-		}
-	}*/
-	
 	if (this.hideSources.indexOf('commons') == -1 && Zotero.Commons.enabled) {
 		this._showRow(new Zotero.ItemGroup('separator', false));
 		var header = {
@@ -1282,16 +1274,6 @@ Zotero.CollectionTreeView.prototype.canDrop = function(row, orient, dragData)
 			}
 			return true;
 		}
-		else if (dataType == 'zotero/item-xml') {
-			var xml = new XML(data.data);
-			for each(var xmlNode in xml.items.item) {
-				var item = Zotero.Sync.Server.Data.xmlToItem(xmlNode);
-				if (item.isRegularItem() || !item.getSource()) {
-					return true;
-				}
-			}
-			return false;
-		}
 		else if (dataType == 'text/x-moz-url' || dataType == 'application/x-moz-file') {
 			if (itemGroup.isSearch()) {
 				return false;
@@ -1695,24 +1677,6 @@ Zotero.CollectionTreeView.prototype.drop = function(row, orient)
 		
 		Zotero.DB.commitTransaction();
 	}
-	else if (dataType == 'zotero/item-xml') {
-		Zotero.DB.beginTransaction();
-		var xml = new XML(data.data);
-		var toAdd = [];
-		for each(var xmlNode in xml.items.item) {
-			var item = Zotero.Sync.Server.Data.xmlToItem(xmlNode, false, true);
-			if (item.isRegularItem() || !item.getSource()) {
-				var id = item.save();
-				toAdd.push(id);
-			}
-		}
-		if (toAdd.length > 0) {
-			this._getItemAtRow(row).ref.addItems(toAdd);
-		}
-		
-		Zotero.DB.commitTransaction();
-		return;
-	}
 	else if (dataType == 'text/x-moz-url' || dataType == 'application/x-moz-file') {
 		if (itemGroup.isWithinGroup()) {
 			var targetLibraryID = itemGroup.ref.libraryID;
diff --git a/chrome/content/zotero/xpcom/itemTreeView.js b/chrome/content/zotero/xpcom/itemTreeView.js
@@ -2096,20 +2096,6 @@ Zotero.ItemTreeCommandController.prototype.onEvent = function(evt)
  * Start a drag using HTML 5 Drag and Drop
  */
 Zotero.ItemTreeView.prototype.onDragStart = function (event) {
-	// Quick implementation of dragging of XML item format
-	if (this._itemGroup.isShare()) {
-		var items = this.getSelectedItems();
-		
-		var xml = <data/>;
-		for (var i=0; i<items.length; i++) {
-			var xmlNode = Zotero.Sync.Server.Data.itemToXML(items[i]);
-			xml.items.item += xmlNode;
-		}
-		Zotero.debug(xml.toXMLString());
-		event.dataTransfer.setData("zotero/item-xml", xml.toXMLString());
-		return;
-	}
-	
 	var itemIDs = this.saveSelection();
 	var items = Zotero.Items.get(itemIDs);