www

commit 642a857a29f3c1ec32ae0b774f9d8ba4381f416c
parent 1b7e2b412b2564019f7a65235d630ca1e4e5c0f4
Author: Dan Stillman <dstillman@zotero.org>
Date:   Sun, 26 Dec 2010 03:08:35 +0000

Fix drag from advanced search window


Diffstat:
M
chrome/content/zotero/advancedSearch.js
 | 
2
+-
M
chrome/content/zotero/advancedSearch.xul
 | 
4
+---
M
chrome/content/zotero/xpcom/itemTreeView.js
 | 
2
+-

3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/chrome/content/zotero/advancedSearch.js b/chrome/content/zotero/advancedSearch.js
@@ -72,7 +72,7 @@ var ZoteroAdvancedSearch = new function() {
 			isLibrary: function () { return false; },
 			isCollection: function () { return false; },
 			isSearch: function () { return true; },
-			isShare: function () { return true; },
+			isShare: function () { return false; },
 			isTrash: function () { return false; }
 		}
 		
diff --git a/chrome/content/zotero/advancedSearch.xul b/chrome/content/zotero/advancedSearch.xul
@@ -22,8 +22,6 @@
 	
 	<script src="include.js"/>
 	<script src="advancedSearch.js"/>
-	<script src="chrome://global/content/nsDragAndDrop.js"/>
-	<script src="chrome://global/content/nsTransferable.js"/>
 	
 	<vbox id="zotero-search-box-container" flex="1">
 	
@@ -39,7 +37,7 @@
 	
 	<tree id="zotero-items-tree" flex="1" hidecolumnpicker="true" seltype="multiple"
 			ondblclick="ZoteroAdvancedSearch.onDblClick(event, this)"
-			ondraggesture="if (event.target.localName == 'treechildren') { Zotero.debug('starting'); ZoteroAdvancedSearch.startDrag(event, ZoteroAdvancedSearch.itemsView); }">
+			ondragstart="if (event.target.localName == 'treechildren') { ZoteroAdvancedSearch.startDrag(event, ZoteroAdvancedSearch.itemsView); }">
 		<treecols>
 			<treecol
 				id="zotero-items-column-title" primary="true"
diff --git a/chrome/content/zotero/xpcom/itemTreeView.js b/chrome/content/zotero/xpcom/itemTreeView.js
@@ -1777,7 +1777,7 @@ Zotero.ItemTreeCommandController.prototype.onEvent = function(evt)
 /**
  * Start a drag using nsDragAndDrop.js or HTML 5 Drag and Drop
  */
-Zotero.ItemTreeView.prototype.onDragStart = function (event, transferData, action) {
+Zotero.ItemTreeView.prototype.onDragStart = function (event) {
 	// Quick implementation of dragging of XML item format
 	if (this._itemGroup.isShare()) {
 		var items = this.getSelectedItems();