From dbaa744f0c17f48336ca17259045b08ac11ef312 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Scott=20Gonz=C3=A1lez?= <scott.gonzalez@gmail.com>
Date: Wed, 23 Nov 2011 12:03:09 -0500
Subject: [PATCH] Interaction: Initial implementation for base interaction
 plugin.

---
 demos/draggable/default.html |  2 +-
 ui/jquery.ui.draggable.js    | 24 ++++---------
 ui/jquery.ui.interaction.js  | 69 ++++++++++++++++++++++++++++++++++++
 3 files changed, 76 insertions(+), 19 deletions(-)
 create mode 100644 ui/jquery.ui.interaction.js

diff --git a/demos/draggable/default.html b/demos/draggable/default.html
index 3a334d4b6..6dff38d85 100644
--- a/demos/draggable/default.html
+++ b/demos/draggable/default.html
@@ -7,7 +7,7 @@
 	<script src="../../jquery-1.6.4.js"></script>
 	<script src="../../ui/jquery.ui.core.js"></script>
 	<script src="../../ui/jquery.ui.widget.js"></script>
-	<script src="../../ui/jquery.ui.mouse.js"></script>
+	<script src="../../ui/jquery.ui.interaction.js"></script>
 	<script src="../../ui/jquery.ui.draggable.js"></script>
 	<link rel="stylesheet" href="../demos.css">
 	<style>
diff --git a/ui/jquery.ui.draggable.js b/ui/jquery.ui.draggable.js
index 15b5f873b..c0d722ce9 100644
--- a/ui/jquery.ui.draggable.js
+++ b/ui/jquery.ui.draggable.js
@@ -13,7 +13,7 @@
  */
 (function( $, undefined ) {
 
-$.widget( "ui.draggable", {
+$.widget( "ui.draggable", $.ui.interaction, {
 	version: "@VERSION",
 	widgetEventPrefix: "drag",
 
@@ -35,12 +35,11 @@ $.widget( "ui.draggable", {
 	// overflow: object containing width and height keys of scroll parent
 
 	_create: function() {
+		this._super( "_create" );
 		// Static position elements can't be moved with top/left
 		if ( this.element.css( "position" ) === "static" ) {
 			this.element.css( "position", "relative" );
 		}
-
-		this._bind({ mousedown: "_mouseDown" });
 	},
 
 	_getPosition: function() {
@@ -115,12 +114,9 @@ $.widget( "ui.draggable", {
 		}
 	},
 
-	_mouseDown: function( event ) {
+	_start: function( event ) {
 		var newLeft, newTop;
 
-		// Prevent text selection, among other things
-		event.preventDefault();
-
 		// The actual dragging element, should always be a jQuery object
 		this.dragEl = this.element;
 
@@ -178,27 +174,20 @@ $.widget( "ui.draggable", {
 
 		// If user stops propagation, leave helper there ( if there's one ), disallow any CSS changes
 		if ( this._trigger( "start", event, this._uiHash() ) === false ) {
-			this.document.unbind( "." + this.widgetName );
-			return;
+			return false;
 		}
 
 		this._blockFrames();
 		this._setCss( event );
-
-		this._bind( this.document, {
-			mousemove: "_mouseMove",
-			mouseup: "_mouseUp"
-		});
 	},
 
-	_mouseMove: function( event ) {
+	_move: function( event ) {
 		var newLeft, newTop;
 
 		this._preparePosition( event );
 
 		// If user stops propagation, leave helper there ( if there's one ), disallow any CSS changes
 		if ( this._trigger( "drag", event, this._uiHash() ) === false ) {
-			this.document.unbind( "." + this.widgetName );
 			return;
 		}
 
@@ -208,7 +197,7 @@ $.widget( "ui.draggable", {
 		this._handleScrolling( event );
 	},
 
-	_mouseUp: function( event ) {
+	_stop: function( event ) {
 		this._preparePosition( event );
 
 		// If user stops propagation, leave helper there, disallow any CSS changes
@@ -219,7 +208,6 @@ $.widget( "ui.draggable", {
 			}
 		}
 
-		this.document.unbind( "." + this.widgetName );
 		this._unblockFrames();
 	},
 
diff --git a/ui/jquery.ui.interaction.js b/ui/jquery.ui.interaction.js
new file mode 100644
index 000000000..4d00c6cb8
--- /dev/null
+++ b/ui/jquery.ui.interaction.js
@@ -0,0 +1,69 @@
+(function( $, undefined ) {
+
+var interaction; // = $.ui.interaction
+
+$.widget( "ui.interaction", {
+	version: "@VERSION",
+	_create: function() {
+		for ( var hook in interaction.hooks ) {
+			interaction.hooks[ hook ].setup( this, this._startProxy( hook ) );
+		}
+	},
+
+	_startProxy: function( hook ) {
+		var that = this;
+		return function( event ) {
+			that._interactionStart( event, hook );
+		}
+	},
+
+	_interactionStart: function( event, hook ) {
+		if ( false !== this._start( event ) ) {
+			interaction.started = true;
+			interaction.hooks[ hook ].handle( this );
+		}
+	},
+
+	_interactionMove: function( event ) {
+		this._move( event );
+	},
+
+	_interactionStop: function( event ) {
+		this._stop( event );
+		interaction.started = false;
+	}
+});
+
+interaction = $.ui.interaction;
+$.extend( interaction, {
+	started: false,
+	hooks: {}
+});
+
+interaction.hooks.mouse = {
+	setup: function( widget, start ) {
+		widget._bind({
+			"mousedown": function( event ) {
+				if ( event.which === 1 ) {
+					event.preventDefault();
+					start( event );
+				}
+			}
+		});
+	},
+
+	handle: function( widget ) {
+		widget._bind( widget.document, {
+			"mousemove": function( event ) {
+				event.preventDefault();
+				widget._interactionMove( event );
+			},
+			"mouseup": function( event ) {
+				widget._interactionStop( event );
+				widget.document.unbind( "mousemove mouseup" );
+			}
+		});
+	}
+};
+
+})( jQuery );