mirror of https://github.com/vitalif/dimple
Fix Issue #54
parent
3d4c7a0353
commit
09d9cbe327
|
@ -4547,7 +4547,7 @@ var dimple = {
|
||||||
returnValue = 0;
|
returnValue = 0;
|
||||||
} else {
|
} else {
|
||||||
// Get the size from the parent recursively
|
// Get the size from the parent recursively
|
||||||
returnValue = dimple._parseYPosition(d3.select(parent).attr("height"), parent.parentNode);
|
returnValue = dimple._parentHeight(parent.parentNode);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return returnValue;
|
return returnValue;
|
||||||
|
@ -4574,7 +4574,7 @@ var dimple = {
|
||||||
returnValue = 0;
|
returnValue = 0;
|
||||||
} else {
|
} else {
|
||||||
// Get the size from the parent recursively
|
// Get the size from the parent recursively
|
||||||
returnValue = dimple._parseXPosition(d3.select(parent).attr("width"), parent.parentNode);
|
returnValue = dimple._parentWidth(parent.parentNode);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return returnValue;
|
return returnValue;
|
||||||
|
@ -4585,20 +4585,23 @@ var dimple = {
|
||||||
// Source: /src/methods/_parseXPosition.js
|
// Source: /src/methods/_parseXPosition.js
|
||||||
dimple._parseXPosition = function (value, parent) {
|
dimple._parseXPosition = function (value, parent) {
|
||||||
var returnValue = 0,
|
var returnValue = 0,
|
||||||
|
values;
|
||||||
|
if (value !== null && value !== undefined) {
|
||||||
values = value.toString().split(",");
|
values = value.toString().split(",");
|
||||||
values.forEach(function (v) {
|
values.forEach(function (v) {
|
||||||
if (v !== undefined && v !== null) {
|
if (v !== undefined && v !== null) {
|
||||||
if (!isNaN(v)) {
|
if (!isNaN(v)) {
|
||||||
returnValue += parseFloat(v);
|
returnValue += parseFloat(v);
|
||||||
} else if (v.slice(-1) === "%") {
|
} else if (v.slice(-1) === "%") {
|
||||||
returnValue += dimple._parentWidth(parent) * (parseFloat(v.slice(0, v.length - 1)) / 100);
|
returnValue += dimple._parentWidth(parent) * (parseFloat(v.slice(0, v.length - 1)) / 100);
|
||||||
} else if (v.slice(-2) === "px") {
|
} else if (v.slice(-2) === "px") {
|
||||||
returnValue += parseFloat(v.slice(0, v.length - 2));
|
returnValue += parseFloat(v.slice(0, v.length - 2));
|
||||||
} else {
|
} else {
|
||||||
returnValue = value;
|
returnValue = value;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}, this);
|
||||||
}, this);
|
}
|
||||||
return returnValue;
|
return returnValue;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -4607,20 +4610,23 @@ var dimple = {
|
||||||
// Source: /src/methods/_parseYPosition.js
|
// Source: /src/methods/_parseYPosition.js
|
||||||
dimple._parseYPosition = function (value, parent) {
|
dimple._parseYPosition = function (value, parent) {
|
||||||
var returnValue = 0,
|
var returnValue = 0,
|
||||||
|
values;
|
||||||
|
if (value !== null && value !== undefined) {
|
||||||
values = value.toString().split(",");
|
values = value.toString().split(",");
|
||||||
values.forEach(function (v) {
|
values.forEach(function (v) {
|
||||||
if (v !== undefined && v !== null) {
|
if (v !== undefined && v !== null) {
|
||||||
if (!isNaN(v)) {
|
if (!isNaN(v)) {
|
||||||
returnValue += parseFloat(v);
|
returnValue += parseFloat(v);
|
||||||
} else if (v.slice(-1) === "%") {
|
} else if (v.slice(-1) === "%") {
|
||||||
returnValue += dimple._parentHeight(parent) * (parseFloat(v.slice(0, v.length - 1)) / 100);
|
returnValue += dimple._parentHeight(parent) * (parseFloat(v.slice(0, v.length - 1)) / 100);
|
||||||
} else if (v.slice(-2) === "px") {
|
} else if (v.slice(-2) === "px") {
|
||||||
returnValue += parseFloat(v.slice(0, v.length - 2));
|
returnValue += parseFloat(v.slice(0, v.length - 2));
|
||||||
} else {
|
} else {
|
||||||
returnValue = value;
|
returnValue = value;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}, this);
|
||||||
}, this);
|
}
|
||||||
return returnValue;
|
return returnValue;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -19,7 +19,7 @@
|
||||||
returnValue = 0;
|
returnValue = 0;
|
||||||
} else {
|
} else {
|
||||||
// Get the size from the parent recursively
|
// Get the size from the parent recursively
|
||||||
returnValue = dimple._parseYPosition(d3.select(parent).attr("height"), parent.parentNode);
|
returnValue = dimple._parentHeight(parent.parentNode);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return returnValue;
|
return returnValue;
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
returnValue = 0;
|
returnValue = 0;
|
||||||
} else {
|
} else {
|
||||||
// Get the size from the parent recursively
|
// Get the size from the parent recursively
|
||||||
returnValue = dimple._parseXPosition(d3.select(parent).attr("width"), parent.parentNode);
|
returnValue = dimple._parentWidth(parent.parentNode);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return returnValue;
|
return returnValue;
|
||||||
|
|
|
@ -3,19 +3,22 @@
|
||||||
// Source: /src/methods/_parseXPosition.js
|
// Source: /src/methods/_parseXPosition.js
|
||||||
dimple._parseXPosition = function (value, parent) {
|
dimple._parseXPosition = function (value, parent) {
|
||||||
var returnValue = 0,
|
var returnValue = 0,
|
||||||
|
values;
|
||||||
|
if (value !== null && value !== undefined) {
|
||||||
values = value.toString().split(",");
|
values = value.toString().split(",");
|
||||||
values.forEach(function (v) {
|
values.forEach(function (v) {
|
||||||
if (v !== undefined && v !== null) {
|
if (v !== undefined && v !== null) {
|
||||||
if (!isNaN(v)) {
|
if (!isNaN(v)) {
|
||||||
returnValue += parseFloat(v);
|
returnValue += parseFloat(v);
|
||||||
} else if (v.slice(-1) === "%") {
|
} else if (v.slice(-1) === "%") {
|
||||||
returnValue += dimple._parentWidth(parent) * (parseFloat(v.slice(0, v.length - 1)) / 100);
|
returnValue += dimple._parentWidth(parent) * (parseFloat(v.slice(0, v.length - 1)) / 100);
|
||||||
} else if (v.slice(-2) === "px") {
|
} else if (v.slice(-2) === "px") {
|
||||||
returnValue += parseFloat(v.slice(0, v.length - 2));
|
returnValue += parseFloat(v.slice(0, v.length - 2));
|
||||||
} else {
|
} else {
|
||||||
returnValue = value;
|
returnValue = value;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}, this);
|
||||||
}, this);
|
}
|
||||||
return returnValue;
|
return returnValue;
|
||||||
};
|
};
|
||||||
|
|
|
@ -3,19 +3,22 @@
|
||||||
// Source: /src/methods/_parseYPosition.js
|
// Source: /src/methods/_parseYPosition.js
|
||||||
dimple._parseYPosition = function (value, parent) {
|
dimple._parseYPosition = function (value, parent) {
|
||||||
var returnValue = 0,
|
var returnValue = 0,
|
||||||
|
values;
|
||||||
|
if (value !== null && value !== undefined) {
|
||||||
values = value.toString().split(",");
|
values = value.toString().split(",");
|
||||||
values.forEach(function (v) {
|
values.forEach(function (v) {
|
||||||
if (v !== undefined && v !== null) {
|
if (v !== undefined && v !== null) {
|
||||||
if (!isNaN(v)) {
|
if (!isNaN(v)) {
|
||||||
returnValue += parseFloat(v);
|
returnValue += parseFloat(v);
|
||||||
} else if (v.slice(-1) === "%") {
|
} else if (v.slice(-1) === "%") {
|
||||||
returnValue += dimple._parentHeight(parent) * (parseFloat(v.slice(0, v.length - 1)) / 100);
|
returnValue += dimple._parentHeight(parent) * (parseFloat(v.slice(0, v.length - 1)) / 100);
|
||||||
} else if (v.slice(-2) === "px") {
|
} else if (v.slice(-2) === "px") {
|
||||||
returnValue += parseFloat(v.slice(0, v.length - 2));
|
returnValue += parseFloat(v.slice(0, v.length - 2));
|
||||||
} else {
|
} else {
|
||||||
returnValue = value;
|
returnValue = value;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}, this);
|
||||||
}, this);
|
}
|
||||||
return returnValue;
|
return returnValue;
|
||||||
};
|
};
|
||||||
|
|
|
@ -4547,7 +4547,7 @@ var dimple = {
|
||||||
returnValue = 0;
|
returnValue = 0;
|
||||||
} else {
|
} else {
|
||||||
// Get the size from the parent recursively
|
// Get the size from the parent recursively
|
||||||
returnValue = dimple._parseYPosition(d3.select(parent).attr("height"), parent.parentNode);
|
returnValue = dimple._parentHeight(parent.parentNode);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return returnValue;
|
return returnValue;
|
||||||
|
@ -4574,7 +4574,7 @@ var dimple = {
|
||||||
returnValue = 0;
|
returnValue = 0;
|
||||||
} else {
|
} else {
|
||||||
// Get the size from the parent recursively
|
// Get the size from the parent recursively
|
||||||
returnValue = dimple._parseXPosition(d3.select(parent).attr("width"), parent.parentNode);
|
returnValue = dimple._parentWidth(parent.parentNode);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return returnValue;
|
return returnValue;
|
||||||
|
@ -4585,20 +4585,23 @@ var dimple = {
|
||||||
// Source: /src/methods/_parseXPosition.js
|
// Source: /src/methods/_parseXPosition.js
|
||||||
dimple._parseXPosition = function (value, parent) {
|
dimple._parseXPosition = function (value, parent) {
|
||||||
var returnValue = 0,
|
var returnValue = 0,
|
||||||
|
values;
|
||||||
|
if (value !== null && value !== undefined) {
|
||||||
values = value.toString().split(",");
|
values = value.toString().split(",");
|
||||||
values.forEach(function (v) {
|
values.forEach(function (v) {
|
||||||
if (v !== undefined && v !== null) {
|
if (v !== undefined && v !== null) {
|
||||||
if (!isNaN(v)) {
|
if (!isNaN(v)) {
|
||||||
returnValue += parseFloat(v);
|
returnValue += parseFloat(v);
|
||||||
} else if (v.slice(-1) === "%") {
|
} else if (v.slice(-1) === "%") {
|
||||||
returnValue += dimple._parentWidth(parent) * (parseFloat(v.slice(0, v.length - 1)) / 100);
|
returnValue += dimple._parentWidth(parent) * (parseFloat(v.slice(0, v.length - 1)) / 100);
|
||||||
} else if (v.slice(-2) === "px") {
|
} else if (v.slice(-2) === "px") {
|
||||||
returnValue += parseFloat(v.slice(0, v.length - 2));
|
returnValue += parseFloat(v.slice(0, v.length - 2));
|
||||||
} else {
|
} else {
|
||||||
returnValue = value;
|
returnValue = value;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}, this);
|
||||||
}, this);
|
}
|
||||||
return returnValue;
|
return returnValue;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -4607,20 +4610,23 @@ var dimple = {
|
||||||
// Source: /src/methods/_parseYPosition.js
|
// Source: /src/methods/_parseYPosition.js
|
||||||
dimple._parseYPosition = function (value, parent) {
|
dimple._parseYPosition = function (value, parent) {
|
||||||
var returnValue = 0,
|
var returnValue = 0,
|
||||||
|
values;
|
||||||
|
if (value !== null && value !== undefined) {
|
||||||
values = value.toString().split(",");
|
values = value.toString().split(",");
|
||||||
values.forEach(function (v) {
|
values.forEach(function (v) {
|
||||||
if (v !== undefined && v !== null) {
|
if (v !== undefined && v !== null) {
|
||||||
if (!isNaN(v)) {
|
if (!isNaN(v)) {
|
||||||
returnValue += parseFloat(v);
|
returnValue += parseFloat(v);
|
||||||
} else if (v.slice(-1) === "%") {
|
} else if (v.slice(-1) === "%") {
|
||||||
returnValue += dimple._parentHeight(parent) * (parseFloat(v.slice(0, v.length - 1)) / 100);
|
returnValue += dimple._parentHeight(parent) * (parseFloat(v.slice(0, v.length - 1)) / 100);
|
||||||
} else if (v.slice(-2) === "px") {
|
} else if (v.slice(-2) === "px") {
|
||||||
returnValue += parseFloat(v.slice(0, v.length - 2));
|
returnValue += parseFloat(v.slice(0, v.length - 2));
|
||||||
} else {
|
} else {
|
||||||
returnValue = value;
|
returnValue = value;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}, this);
|
||||||
}, this);
|
}
|
||||||
return returnValue;
|
return returnValue;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue