conflicts resolution

This commit is contained in:
danteloayza
2015-03-30 11:00:04 -04:00
parent ad805f9038
commit d4ecc6c1a4
4 changed files with 2380 additions and 2120 deletions

View File

@@ -1793,7 +1793,6 @@ RingChart.prototype.drawRing = function(data, canvas, param){
if (typeof _mouseClick == "function") {
//DL: original call back function commented
//_mouseClick.call();
alert(1);
}
}
}
@@ -2127,7 +2126,6 @@ function drawVelocimeter(selector,param){
this.config.lightBlueColor = configuration.lightBlueColor || "6085A0";
};
//alert(value);
this.render = function () {
this.body = this.myContainer//dashContainer//d3.select("#" + this.placeholderName)
@@ -2160,7 +2158,6 @@ function drawVelocimeter(selector,param){
this.redrawDimmableFace(xDim);//0);
var pointerContainer = this.body.append("svg:g").attr("class", "pointerContainer");
//alert(value);
this.drawPointer(value);
pointerContainer.append("svg:circle")
.attr("cx", this.config.cx)

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff