0x2620/pandora
2
1
Fork 1
Code Issues 1.3k Pull requests Releases Wiki Activity

minor fixes

Browse source
This commit is contained in:
rolux 2011-09-03 23:35:24 +00:00
parent 83ac59857e
commit f3fac54365
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
static/js/pandora/ui/list.js
View file

@ -486,9 +486,16 @@ pandora.ui.list = function() { // fixme: remove view argument
} else { } else {
image = drag.action == 'copy' ? 'symbolAdd' : 'symbolRemove'; image = drag.action == 'copy' ? 'symbolAdd' : 'symbolRemove';
text = Ox.toTitleCase(drag.action) + ' ' + ( text = Ox.toTitleCase(drag.action) + ' ' + (
Ox.isString(drag.item) ? '"' + drag.item + '"' : drag.item + ' ' Ox.isString(drag.item)
+ pandora.site.itemName[drag.item == 1 ? 'singular' : 'plural'].toLowerCase() ? '"' + drag.item + '"'
) + '</br> to ' + (drag.target ? 'the list "' + drag.target.name + '"' : 'another list'); : drag.item + ' ' + pandora.site.itemName[
drag.item == 1 ? 'singular' : 'plural'
].toLowerCase()
) + '</br> to ' + (
drag.target && !drag.target.selected
? 'the list "' + drag.target.name + '"'
: 'another list'
);
} }
return $('<div>') return $('<div>')
.append( .append(
@ -612,7 +619,11 @@ pandora.ui.list = function() { // fixme: remove view argument
}, },
draganddropend: function(data) { draganddropend: function(data) {
Ox.print(data, drag, '------------'); Ox.print(data, drag, '------------');
if (drag.target && drag.target.editable) { Ox.UI.$window.unbind({
keydown: keydown,
keyup: keyup
});
if (drag.target && drag.target.editable && !drag.target.selected) {
if (drag.action == 'copy' || ( if (drag.action == 'copy' || (
drag.action == 'move' && drag.source.editable drag.action == 'move' && drag.source.editable
)) { )) {
@ -655,10 +666,6 @@ pandora.ui.list = function() { // fixme: remove view argument
cleanup(0); cleanup(0);
} }
function cleanup(ms) { function cleanup(ms) {
Ox.UI.$window.unbind({
keydown: keydown,
keyup: keyup
});
drag = {}; drag = {};
setTimeout(function() { setTimeout(function() {
$('.OxDroppable').removeClass('OxDroppable'); $('.OxDroppable').removeClass('OxDroppable');