forked from 0x2620/pandora
drag & drop: data._event -> data.event
This commit is contained in:
parent
25b87a10b0
commit
81dbceb0ef
1 changed files with 6 additions and 8 deletions
|
@ -242,16 +242,14 @@ pandora.enableDragAndDrop = function($list, canMove) {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
$tooltip.options({
|
$tooltip.options({title: getTitle()}).show(data.event);
|
||||||
title: getTitle(data._event)
|
|
||||||
}).show(data._event);
|
|
||||||
canMove && Ox.UI.$window.bind({
|
canMove && Ox.UI.$window.bind({
|
||||||
keydown: keydown,
|
keydown: keydown,
|
||||||
keyup: keyup
|
keyup: keyup
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
draganddrop: function(data) {
|
draganddrop: function(data) {
|
||||||
var event = data._event;
|
var event = data.event;
|
||||||
$tooltip.options({
|
$tooltip.options({
|
||||||
title: getTitle(event)
|
title: getTitle(event)
|
||||||
}).show(event);
|
}).show(event);
|
||||||
|
@ -261,7 +259,7 @@ pandora.enableDragAndDrop = function($list, canMove) {
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
draganddroppause: function(data) {
|
draganddroppause: function(data) {
|
||||||
var event = data._event, scroll,
|
var event = data.event, scroll,
|
||||||
$parent, $grandparent, $panel, title;
|
$parent, $grandparent, $panel, title;
|
||||||
// fixme: should be named showLists in the user ui prefs!
|
// fixme: should be named showLists in the user ui prefs!
|
||||||
if (!pandora.user.ui.showSidebar) {
|
if (!pandora.user.ui.showSidebar) {
|
||||||
|
@ -298,7 +296,7 @@ pandora.enableDragAndDrop = function($list, canMove) {
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
draganddropenter: function(data) {
|
draganddropenter: function(data) {
|
||||||
var $parent = $(data._event.target).parent(),
|
var $parent = $(data.event.target).parent(),
|
||||||
$item = $parent.is('.OxItem') ? $parent : $parent.parent(),
|
$item = $parent.is('.OxItem') ? $parent : $parent.parent(),
|
||||||
$list = $item.parent().parent().parent().parent();
|
$list = $item.parent().parent().parent().parent();
|
||||||
if ($list.is('.OxDroppable')) {
|
if ($list.is('.OxDroppable')) {
|
||||||
|
@ -309,7 +307,7 @@ pandora.enableDragAndDrop = function($list, canMove) {
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
draganddropleave: function(data) {
|
draganddropleave: function(data) {
|
||||||
var $parent = $(data._event.target).parent(),
|
var $parent = $(data.event.target).parent(),
|
||||||
$item = $parent.is('.OxItem') ? $parent : $parent.parent();
|
$item = $parent.is('.OxItem') ? $parent : $parent.parent();
|
||||||
if ($item.is('.OxDroppable')) {
|
if ($item.is('.OxDroppable')) {
|
||||||
$item.removeClass('OxDrop');
|
$item.removeClass('OxDrop');
|
||||||
|
@ -369,7 +367,7 @@ pandora.enableDragAndDrop = function($list, canMove) {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
function getTitle(e) {
|
function getTitle() {
|
||||||
var image, text;
|
var image, text;
|
||||||
if (drag.action == 'move' && drag.source.user != pandora.user.username) {
|
if (drag.action == 'move' && drag.source.user != pandora.user.username) {
|
||||||
image = 'symbolClose'
|
image = 'symbolClose'
|
||||||
|
|
Loading…
Reference in a new issue