Merged from 1.7

This commit is contained in:
vyshane 2006-11-15 02:42:38 +00:00
parent ced6ca158f
commit 7fdbbaea87
2 changed files with 18 additions and 12 deletions

View File

@ -36,6 +36,9 @@ block_class.prototype.init_block = function(id, sGroup, config) {
this.is = 'block'; this.is = 'block';
this.instanceId = this.getEl().id.replace(/inst/i, ''); this.instanceId = this.getEl().id.replace(/inst/i, '');
// Add the drag class (move handle) only to blocks that need it.
YAHOO.util.Dom.addClass(this.getEl(), 'drag');
this.addInvalidHandleType('a'); this.addInvalidHandleType('a');
var s = this.getEl().style; var s = this.getEl().style;
@ -97,6 +100,7 @@ block_class.prototype.endDrag = function() {
this.resetTargets(); this.resetTargets();
} }
block_class.prototype.onDragDrop = function(e, id) { block_class.prototype.onDragDrop = function(e, id) {
// get the drag and drop object that was targeted // get the drag and drop object that was targeted
var oDD; var oDD;
@ -107,22 +111,20 @@ block_class.prototype.onDragDrop = function(e, id) {
oDD = YAHOO.util.DDM.getBestMatch(id); oDD = YAHOO.util.DDM.getBestMatch(id);
} }
var el = this.getEl(); var el = this.getEl();
if (this.debug) {
YAHOO.log("id="+id+" el="+e+" x="+YAHOO.util.Dom.getXY(this.getDragEl())); YAHOO.log("id="+id+" el="+e+" x="+YAHOO.util.Dom.getXY(this.getDragEl()));
}
//var collisions = this.find_collisions(e,id); //var collisions = this.find_collisions(e,id);
this.move_block(id); this.move_block(id);
//YAHOO.util.DDM.moveToEl(el, oDD.getEl()); //YAHOO.util.DDM.moveToEl(el, oDD.getEl());
this.resetTargets(); this.resetTargets();
} }
block_class.prototype.find_target = function(column){ block_class.prototype.find_target = function(column){
var collisions = column.find_sub_collision(YAHOO.util.Region.getRegion(this.getDragEl())); var collisions = column.find_sub_collision(YAHOO.util.Region.getRegion(this.getDragEl()));
@ -261,12 +263,16 @@ block_class.prototype.delete_button = function() {
} }
block_class.prototype.updatePosition = function(index, columnId) { block_class.prototype.updatePosition = function(index, columnId) {
//update the db for the position //update the db for the position
main.connectQueue_add('post','class=block&field=position',null,'value='+index+'&column='+columnId+'&instanceId='+this.instanceId); main.connectQueue_add('post', 'class=block&field=position', null,
if(this.debug)YAHOO.log("updating position of "+this.getEl().id+" to index "+index+" on column "+columnId); 'value='+index+'&column='+columnId+'&instanceId='+this.instanceId);
if (this.debug) {
YAHOO.log("Updating position of "+this.getEl().id+" to index "+index+" on column "+columnId);
} }
}
/* /*
* column class, DD targets * column class, DD targets