RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

The elements must be queried again otherwise the offset is calculated badly

Browse source 
This seems to be the cause of the problem:
http://bugs.jquery.com/ticket/7602

FEA: ItEr75S08MigrationZK5
This commit is contained in:
Óscar González Fernández 2011-06-20 19:32:55 +02:00
parent 5d60359518
commit f76552371f
1 changed files with 26 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
ganttzk/src/main/resources/web/js/ganttz/DependencyComponent.js
View file

@ -218,7 +218,6 @@ ganttz.DependencyComponent = zk.$extends(ganttz.DependencyComponentBase,{
},
bind_ : function(){
this.$supers('bind_', arguments);
this._initializeProperties();
//this.setupArrow_();
/*maybe move this listener to the $init method*/
YAHOO.util.Event.onDOMReady(this.proxy(function() {
@ -227,37 +226,37 @@ ganttz.DependencyComponent = zk.$extends(ganttz.DependencyComponentBase,{
ganttz.TaskComponent.$(this.getIdTaskEnd()).addRelatedDependency(this);
}));
},
draw : function(){
var orig = this.findPos_(this._origin);
var dest = this.findPos_(this._destination);
draw : function() {
this._withOriginAndDestination(function(origin, destination) {
var orig = this.findPos_(origin);
var dest = this.findPos_(destination);
// This corner case may depend on dependence type
var offsetX = origin.outerWidth() - ganttz.TaskComponent.CORNER_WIDTH;
var separation = orig.left + origin.outerWidth() - dest.left;
// This corner case may depend on dependence type
var offsetX = this._origin.outerWidth() - ganttz.TaskComponent.CORNER_WIDTH;
var separation = orig.left + this._origin.outerWidth() - dest.left;
if (separation > 0) {
offsetX = offsetX - separation;
}
if (this.getDependencyType() == this.$class.END_START
|| this.getDependencyType() == null) {
orig.left = orig.left + Math.max(0, offsetX);
} else if (this.getDependencyType() == this.$class.END_END) {
orig.left = orig.left + origin.outerWidth();
dest.left = dest.left + destination.outerWidth();
}
if (separation > 0) {
offsetX = offsetX - separation;
}
if (this.getDependencyType() == this.$class.END_START
|| this.getDependencyType() == null) {
orig.left = orig.left + Math.max(0, offsetX);
} else if (this.getDependencyType() == this.$class.END_END) {
orig.left = orig.left + this._origin.outerWidth();
dest.left = dest.left + this._destination.outerWidth();
}
orig.top = orig.top + ganttz.TaskComponent.HEIGHT;
dest.top = dest.top + ganttz.TaskComponent.HALF_HEIGHT;
orig.top = orig.top + ganttz.TaskComponent.HEIGHT;
dest.top = dest.top + ganttz.TaskComponent.HALF_HEIGHT;
if (orig.top > dest.top) {
orig.top = orig.top - ganttz.TaskComponent.HEIGHT;
}
if (orig.top > dest.top) {
orig.top = orig.top - ganttz.TaskComponent.HEIGHT;
}
this.drawArrow_(orig, dest);
this.drawArrow_(orig, dest);
});
},
_initializeProperties : function(){
this._origin = jq('#' + this.getIdTaskOrig());
this._destination = jq('#' + this.getIdTaskEnd());
_withOriginAndDestination : function(f) {
f.call(this, jq('#' + this.getIdTaskOrig()), jq('#' + this.getIdTaskEnd()));
}
},{});