Skip to content
Permalink
Browse files

Merge branch 'master' of https://github.com/voxwerk/jquery-ui into vo…

…xwerk-master
  • Loading branch information...
scottgonzalez committed Mar 7, 2011
2 parents 74b7c3f + cf0649e commit d4b2e494f9ad81dd4211673d9dc5a8cc8e322bb2
Showing with 72 additions and 0 deletions.
  1. +67 −0 tests/visual/mouse/mouse_ticket_6946.html
  2. +5 −0 ui/jquery.ui.mouse.js
@@ -0,0 +1,67 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset=utf-8 />
<title>Test for Issue #6946</title>
<link rel="stylesheet" href="../all.css" type="text/css">
<link rel="stylesheet" href="../../../themes/base/jquery.ui.all.css" type="text/css" />
<script type="text/javascript" src="../../../jquery-1.4.4.js"></script>
<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
<script type="text/javascript" src="../../../ui/jquery.ui.widget.js"></script>
<script type="text/javascript" src="../../../ui/jquery.ui.mouse.js"></script>
<script type="text/javascript" src="../../../ui/jquery.ui.sortable.js"></script>
<style type="text/css" media="screen">
body {
background: white;
font-size: 90%;
}
.error {
color: #f55;
font-style: italic;
}
#sortable div:hover {
cursor: move;
}
</style>
</head>
<body>
<h1>Test for Issue #6946</h1>
<p>Use the following list to test the steps listed below:</p>
<div id="sortable">
<div>One</div>
<div>Two</div>
<div>Three</div>
</div>
<div id="events"></div>
<h2>Expected</h2>
<ol>
<li>Drag an item to a new position in the list and release.</li>
<li>The click event should be received (appropriately suppressed by jQuery UI).</li>
<li>Click the same item.</li>
<li>The click event should be received.</li>
<li>Click the same item again.</li>
<li>The click event should be received.</li>
</ol>
<h2>Experienced (Gecko/Opera)</h2>
<ol>
<li>Drag an item to a new position in the list and release.</li>
<li>The click event is not received <em>(never sent by browser)</em>.</li>
<li>Click the same item.</li>
<li class="error">The click event is not received (erroneously suppressed by jQuery UI).</li>
<li>Click the same item again.</li>
<li>The click event is finally received.</li>
</ol>
<script type="text/javascript">
$(function () {
$('#sortable').sortable();
$('#sortable').bind('click', function () {
$('#events').append('Click event received!<br />');
});
});​
</script>
</body>
</html>​
@@ -75,6 +75,11 @@ $.widget("ui.mouse", {
}
}

// 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) {
return self._mouseMove(event);

0 comments on commit d4b2e49

Please sign in to comment.
You can’t perform that action at this time.