[Pkg-javascript-commits] [dojo] 06/11: Propagating changes from [11745] to the Dojo 1.0.2 branch. Refs #4140.

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to annotated tag 1.0.2
in repository dojo.

commit 4dad74b4c963946d63bb36924e967aa4711fd889
Author: Eugene Lazutkin <eugene at lazutkin.com>
Date:   Sat Dec 8 04:41:23 2007 +0000

    Propagating changes from [11745] to the Dojo 1.0.2 branch. Refs #4140.
    
    git-svn-id: http://svn.dojotoolkit.org/src/branches/1.0/dojo/trunk@11746 560b804f-0ae3-0310-86f3-f6aa0a117693
---
 dnd/Manager.js | 2 +-
 dnd/Source.js  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/dnd/Manager.js b/dnd/Manager.js
index 078da9d..9ba89ff 100644
--- a/dnd/Manager.js
+++ b/dnd/Manager.js
@@ -108,7 +108,7 @@ dojo.extend(dojo.dnd.Manager, {
 	onMouseUp: function(e){
 		// summary: event processor for onmouseup
 		// e: Event: mouse event
-		if(this.avatar && this.source.mouseButton == e.button){
+		if(this.avatar && (!("mouseButton" in this.source) || this.source.mouseButton == e.button)){
 			if(this.target && this.canDropFlag){
 				var params = [this.source, this.nodes, Boolean(this.source.copyState(dojo.dnd.getCopyKeyState(e))), this.target];
 				dojo.publish("/dnd/drop/before", params);
diff --git a/dnd/Source.js b/dnd/Source.js
index f05dd4c..c5635bf 100644
--- a/dnd/Source.js
+++ b/dnd/Source.js
@@ -301,6 +301,7 @@ dojo.declare("dojo.dnd.Source", dojo.dnd.Selector, {
 		this.before = true;
 		this.isDragging = false;
 		this.mouseDown = false;
+		delete this.mouseButton;
 		this._changeState("Source", "");
 		this._changeState("Target", "");
 	},

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/dojo.git