Changeset 12525 for trunk/themes/default/js/ui/jquery.ui.mouse.js

Timestamp:

Oct 28, 2011, 3:25:54 PM (12 years ago)

Author:

patdenice

Message:

feature:2487
Update jQuery to 1.6.4 and jQuery UI to 1.8.16

File:

• trunk/themes/default/js/ui/jquery.ui.mouse.js (modified) (6 diffs)

trunk/themes/default/js/ui/jquery.ui.mouse.js

@@ -1 +1 @@
 /*!
- * jQuery UI Mouse 1.8.10
+ * jQuery UI Mouse 1.8.16
  *
  * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
@@ -12 +12 @@
  */
 (function( $, undefined ) {
+
+var mouseHandled = false;
+$( document ).mouseup( function( e ) {
+        mouseHandled = false;
+});
 
 $.widget("ui.mouse", {
@@ -45 +50 @@
         _mouseDown: function(event) {
                 // don't let more than one widget handle mouseStart
-                // TODO: figure out why we have to use originalEvent
-                event.originalEvent = event.originalEvent || {};
-                if (event.originalEvent.mouseHandled) { return; }
+                if( mouseHandled ) { return };
 
                 // we may have missed mouseup (out of window)
@@ -56 +59 @@
                 var self = this,
                         btnIsLeft = (event.which == 1),
-                        elIsCancel = (typeof this.options.cancel == "string" ? $(event.target).parents().add(event.target).filter(this.options.cancel).length : false);
+                        // event.target.nodeName works around a bug in IE 8 with
+                        // disabled inputs (#7620)
+                        elIsCancel = (typeof this.options.cancel == "string" && event.target.nodeName ? $(event.target).closest(this.options.cancel).length : false);
                 if (!btnIsLeft || elIsCancel || !this._mouseCapture(event)) {
                         return true;
@@ -76 +81 @@
                 }
 
+                // Click event may never have fired (Gecko & Opera)
+                if (true === $.data(event.target, this.widgetName + '.preventClickEvent')) {
+                        $.removeData(event.target, this.widgetName + '.preventClickEvent');
+                }
+
                 // these delegates are required to keep context
                 this._mouseMoveDelegate = function(event) {
@@ -88 +98 @@
 
                 event.preventDefault();
-                event.originalEvent.mouseHandled = true;
+                
+                mouseHandled = true;
                 return true;
         },