diff options
| author | Eduardo Lundgren <eduardolundgren@gmail.com> | 2008-05-30 19:18:20 +0000 |
|---|---|---|
| committer | Eduardo Lundgren <eduardolundgren@gmail.com> | 2008-05-30 19:18:20 +0000 |
| commit | 10afdceddedad72ef826cebb441b4cfd8a788270 (patch) | |
| tree | 87e50c27f5e6fe6dcd46ad73006e20c92fff6db8 /ui/tests/jquery.useraction.js | |
| parent | 3d16364e611bf059eb5145d90e370dd906a7f149 (diff) | |
| download | jquery-ui-10afdceddedad72ef826cebb441b4cfd8a788270.tar.gz jquery-ui-10afdceddedad72ef826cebb441b4cfd8a788270.zip | |
More fixes for userAction
Diffstat (limited to 'ui/tests/jquery.useraction.js')
| -rw-r--r-- | ui/tests/jquery.useraction.js | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/ui/tests/jquery.useraction.js b/ui/tests/jquery.useraction.js index 605063184..6a94b3944 100644 --- a/ui/tests/jquery.useraction.js +++ b/ui/tests/jquery.useraction.js @@ -114,37 +114,42 @@ $.extend($.userAction.prototype, { // drag helper function, thanks Richard Worth's testmouse api. var self = this, o = this.options, center = this.findCenter(), target = $(this.target), lastx = center.x, lasty = center.y, - fake = $(StringPool.FAKE_CURSOR_EXP); + fake = $(StringPool.FAKE_CURSOR_EXP), + speed = o.speed || StringPool.SLOW, + easing = o.easing || StringPool.SWING; fake = fake.size() ? fake : $(StringPool.FAKE_CURSOR_DIV) .css({ position: StringPool.ABSOLUTE }).appendTo(document.body); fake - .animate({ left: center.x, top: center.y }, "fast", function() { + .animate({ left: center.x, top: center.y }, speed, easing, function() { target .userAction(StringPool.MOUSEOVER) .userAction(StringPool.MOUSEDOWN) .userAction(StringPool.MOUSEMOVE); }) .animate({ left: center.x + (dx||0), top: center.y + (dy||0) }, { - speed: "fast", + speed: speed, + easing: easing, step: function(i, anim) { lastx = anim.prop == StringPool.LEFT ? i : lastx; lasty = anim.prop == StringPool.TOP ? i : lasty; - target.userAction(StringPool.MOUSEMOVE, { x: lastx, y: lasty, after: o.drag }); + target.userAction(StringPool.MOUSEMOVE, { x: lastx, y: lasty, after: o.drag || o.after }); }, complete: function() { target.userAction(StringPool.MOUSEUP).userAction(StringPool.MOUSEOUT); // remove fake cursor - //$(this).remove(); + $(this).remove(); // trigger drag queue var queue = $.data(self.target, StringPool.DATA_QUEUE); if (queue) queue.shift(); + if (queue && queue[0]) self.drag(queue[0][0], queue[0][1]); + else $.removeData(self.target, StringPool.DATA_QUEUE); } }); }, @@ -278,7 +283,9 @@ var StringPool = { ABSOLUTE: 'absolute', DATA_QUEUE: 'ua-drag-queue', TOP: 'top', - LEFT: 'left' + LEFT: 'left', + SLOW: 'slow', + SWING: 'swing' }; })(jQuery);
\ No newline at end of file |