Skip to content

Commit

Permalink
Cleanup js code
Browse files Browse the repository at this point in the history
  • Loading branch information
@kroman0
kroman0 committed Oct 15, 2013
1 parent 06b989e commit b113f78
Showing 1 changed file with 16 additions and 53 deletions.
69 changes: 16 additions & 53 deletions quintagroup/plonetabs/browser/resources/dragdropreorder.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,10 @@ plonetabsDnDReorder.handler = null;
(function($) {

plonetabsDnDReorder.doDown = function(e) {
console.log('doDown');
var dragging = plonetabsDnDReorder.dragging,
body;
// Waiting for a server operation to complete or following an error
if (plonetabsDnDReorder.locked) {return;}
console.log('doDown0');
// already dragging, probably catching up a lost drag.
if (dragging) {
if ($(this).attr('id') !== dragging.attr('id')) {
Expand All @@ -33,48 +31,37 @@ plonetabsDnDReorder.doDown = function(e) {
}
return;
}
console.log('doDown1');
dragging = $(this).parents('li:first');
dragging = $(this).parents('li:first');
if (!dragging.length) {return;}
console.log('doDown2');
plonetabsDnDReorder.items.mousemove(plonetabsDnDReorder.doDrag);
body = $('body');
body.mouseup(plonetabsDnDReorder.doUp);
body.mouseleave(plonetabsDnDReorder.doCancel);

plonetabsDnDReorder.dragging = dragging;
dragging.data('plonetabsDnDReorder.startPosition', plonetabsDnDReorder.getPos(dragging));
dragging.addClass("dragging");
dragging.addClass('dragging');
$(this).parents('li').addClass('dragindicator');
// Find the original subset ids. This must be in the current order.
dragging.data('plonetabsDnDReorder.subset_ids', $.map(
plonetabsDnDReorder.container.find('.drag-handle'),
function(elem) {
return $(elem).attr('id').substr('folder-contents-item-'.length);
}));
console.log('doDown3');


return false;
};

plonetabsDnDReorder.getPos = function(node) {
console.log('getPos', node);
var pos = node.parent().children('li').index(node[0]);
console.log('getPos1', pos);
return pos === -1 ? null : pos;
};

plonetabsDnDReorder.doDrag = function(e) {
console.log('doDrag');
var dragging = plonetabsDnDReorder.dragging,
target = this;

console.log('doDrag1');
if (!dragging) {return;}
console.log('doDrag2');
if (!target) {return;}
console.log('doDrag3');

if ($(target).attr('id') !== dragging.attr('id')) {
plonetabsDnDReorder.swapElements($(target), dragging);
Expand All @@ -83,25 +70,20 @@ plonetabsDnDReorder.doDrag = function(e) {
};

plonetabsDnDReorder.swapElements = function(child1, child2) {
console.log('swapElements', child1, child2);
var parent = child1.parent(),
items = parent.children('[id]'),
t;

// Only adjacent elements may be swapped.
if (Math.abs(plonetabsDnDReorder.getPos(child1) - plonetabsDnDReorder.getPos(child2)) !== 1) {
console.log('swapElements0', items);
return;
}

console.log('swapElements1', items);
items.removeClass('even').removeClass('odd');
if (child1[0].swapNode) {
console.log('swapElements2', items);
// IE proprietary method
child1[0].swapNode(child2[0]);
} else {
console.log('swapElements3', items);
// swap the two elements, using a textnode as a position marker
t = parent[0].insertBefore(document.createTextNode(''),
child1[0]);
Expand All @@ -112,11 +94,9 @@ plonetabsDnDReorder.swapElements = function(child1, child2) {
// odd and even are 0-based, so we want them the other way around
parent.children('[id]:odd').addClass('even');
parent.children('[id]:even').addClass('odd');
console.log('swapElements5', parent);
};

plonetabsDnDReorder.doUp = function(e) {
console.log('doUp');
var dragging = plonetabsDnDReorder.dragging,
body = $('body');
if (!dragging) {return;}
Expand All @@ -133,20 +113,19 @@ plonetabsDnDReorder.doUp = function(e) {
};

plonetabsDnDReorder.doCancel = function(e) {
console.log('doCancel');
var dragging = plonetabsDnDReorder.dragging,
body = $('body');
if (!dragging) {return;}

dragging.removeClass("dragging");
dragging.removeClass('dragging');
// Need to remove the indicator as well, important in the
// case when the mouse up occurs outside the grid.
dragging.removeClass('dragindicator');

if (plonetabsDnDReorder.getPos(dragging) - dragging.data('plonetabsDnDReorder.startPosition')) {
// position has changed, error out
plonetabsDnDReorder.locked = true;
dragging.addClass("error");
dragging.addClass('error');
}
plonetabsDnDReorder.items.unbind('mousemove', plonetabsDnDReorder.doDrag);
body.unbind('mouseup', plonetabsDnDReorder.doCancel);
Expand All @@ -173,36 +152,24 @@ plonetabsDnDReorder.updatePositionOnServer = function() {
plonetabsDnDReorder.doCancel.call();
return;
}
// Strip off id prefix
args = {
item_id: dragging.attr('id').substr('folder-contents-item-'.length),
subset_ids: dragging.data('plonetabsDnDReorder.subset_ids')
};
args['delta:int'] = delta;
// Convert jQuery's name[]=1&name[]=2 to Zope's name:list=1&name:list=2
encoded = $.param(args).replace(/%5B%5D=/g, '%3Alist=');
if (plonetabsDnDReorder.handler) plonetabsDnDReorder.handler(plonetabsDnDReorder.complete);
// $.ajax({
// type: 'POST',
// url: 'folder_moveitem',
// data: encoded,
// complete: plonetabsDnDReorder.complete
// });
plonetabsDnDReorder.locked = true;
// plonetabsDnDReorder.complete();
if (plonetabsDnDReorder.handler) {
plonetabsDnDReorder.locked = true;
plonetabsDnDReorder.handler(plonetabsDnDReorder.complete);
} else {
plonetabsDnDReorder.complete({status_code: 200});
}
};

plonetabsDnDReorder.complete = function(responce) {
console.log('complete', responce);
var dragging = plonetabsDnDReorder.dragging;
dragging.removeClass("dragging");
dragging.removeClass('dragging');
// Need to remove the indicator as well, important in the
// case when the mouse up occurs outside the grid.
dragging.removeClass('dragindicator');
if (responce.status_code === 200) {
plonetabsDnDReorder.locked = false;
} else {
dragging.addClass("error");
dragging.addClass('error');
}
plonetabsDnDReorder.dragging = null;
};
Expand All @@ -218,14 +185,10 @@ function initializeplonetabsDnDReorder(container_selector, handler) {
return;
plonetabsDnDReorder.locked = false;
plonetabsDnDReorder.dragging = null;
plonetabsDnDReorder.items = $(container + " > li");
$(container + " > li .drag-handle")
plonetabsDnDReorder.items = $(container + ' > li');
$(container + ' > li .drag-handle')
.mousedown(plonetabsDnDReorder.doDown)
.mouseup(plonetabsDnDReorder.doUp)
.addClass("draggingHook")
.css("cursor","ns-resize");
.addClass('draggingHook')
.css('cursor', 'ns-resize');
}

// $(document).ready(function() {
// initializeDnDReorder('#tabslist');
// });

0 comments on commit b113f78

Please sign in to comment.