vitalif-js
/
dimple
mirror of https://github.com/vitalif/dimple
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix Issue #54

master
johnkiernander 2014-04-08 01:37:39 +01:00
parent 3d4c7a0353
commit 09d9cbe327
7 changed files with 97 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
dist/dimple.v1.2.0.js vendored
View File

@ -4547,7 +4547,7 @@ var dimple = {
returnValue = 0;
} else {
// Get the size from the parent recursively
returnValue = dimple._parseYPosition(d3.select(parent).attr("height"), parent.parentNode);
returnValue = dimple._parentHeight(parent.parentNode);
}
}
return returnValue;
@ -4574,7 +4574,7 @@ var dimple = {
returnValue = 0;
} else {
// Get the size from the parent recursively
returnValue = dimple._parseXPosition(d3.select(parent).attr("width"), parent.parentNode);
returnValue = dimple._parentWidth(parent.parentNode);
}
}
return returnValue;
@ -4585,20 +4585,23 @@ var dimple = {
// Source: /src/methods/_parseXPosition.js
dimple._parseXPosition = function (value, parent) {
var returnValue = 0,
values;
if (value !== null && value !== undefined) {
values = value.toString().split(",");
values.forEach(function (v) {
if (v !== undefined && v !== null) {
if (!isNaN(v)) {
returnValue += parseFloat(v);
} else if (v.slice(-1) === "%") {
returnValue += dimple._parentWidth(parent) * (parseFloat(v.slice(0, v.length - 1)) / 100);
} else if (v.slice(-2) === "px") {
returnValue += parseFloat(v.slice(0, v.length - 2));
} else {
returnValue = value;
values.forEach(function (v) {
if (v !== undefined && v !== null) {
if (!isNaN(v)) {
returnValue += parseFloat(v);
} else if (v.slice(-1) === "%") {
returnValue += dimple._parentWidth(parent) * (parseFloat(v.slice(0, v.length - 1)) / 100);
} else if (v.slice(-2) === "px") {
returnValue += parseFloat(v.slice(0, v.length - 2));
} else {
returnValue = value;
}
}
}
}, this);
}, this);
}
return returnValue;
};
@ -4607,20 +4610,23 @@ var dimple = {
// Source: /src/methods/_parseYPosition.js
dimple._parseYPosition = function (value, parent) {
var returnValue = 0,
values;
if (value !== null && value !== undefined) {
values = value.toString().split(",");
values.forEach(function (v) {
if (v !== undefined && v !== null) {
if (!isNaN(v)) {
returnValue += parseFloat(v);
} else if (v.slice(-1) === "%") {
returnValue += dimple._parentHeight(parent) * (parseFloat(v.slice(0, v.length - 1)) / 100);
} else if (v.slice(-2) === "px") {
returnValue += parseFloat(v.slice(0, v.length - 2));
} else {
returnValue = value;
values.forEach(function (v) {
if (v !== undefined && v !== null) {
if (!isNaN(v)) {
returnValue += parseFloat(v);
} else if (v.slice(-1) === "%") {
returnValue += dimple._parentHeight(parent) * (parseFloat(v.slice(0, v.length - 1)) / 100);
} else if (v.slice(-2) === "px") {
returnValue += parseFloat(v.slice(0, v.length - 2));
} else {
returnValue = value;
}
}
}
}, this);
}, this);
}
return returnValue;
};

2
dist/dimple.v1.2.0.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
src/methods/_parentHeight.js
View File

@ -19,7 +19,7 @@
returnValue = 0;
} else {
// Get the size from the parent recursively
returnValue = dimple._parseYPosition(d3.select(parent).attr("height"), parent.parentNode);
returnValue = dimple._parentHeight(parent.parentNode);
}
}
return returnValue;

2
src/methods/_parentWidth.js
View File

@ -19,7 +19,7 @@
returnValue = 0;
} else {
// Get the size from the parent recursively
returnValue = dimple._parseXPosition(d3.select(parent).attr("width"), parent.parentNode);
returnValue = dimple._parentWidth(parent.parentNode);
}
}
return returnValue;

27
src/methods/_parseXPosition.js
View File

@ -3,19 +3,22 @@
// Source: /src/methods/_parseXPosition.js
dimple._parseXPosition = function (value, parent) {
var returnValue = 0,
values;
if (value !== null && value !== undefined) {
values = value.toString().split(",");
values.forEach(function (v) {
if (v !== undefined && v !== null) {
if (!isNaN(v)) {
returnValue += parseFloat(v);
} else if (v.slice(-1) === "%") {
returnValue += dimple._parentWidth(parent) * (parseFloat(v.slice(0, v.length - 1)) / 100);
} else if (v.slice(-2) === "px") {
returnValue += parseFloat(v.slice(0, v.length - 2));
} else {
returnValue = value;
values.forEach(function (v) {
if (v !== undefined && v !== null) {
if (!isNaN(v)) {
returnValue += parseFloat(v);
} else if (v.slice(-1) === "%") {
returnValue += dimple._parentWidth(parent) * (parseFloat(v.slice(0, v.length - 1)) / 100);
} else if (v.slice(-2) === "px") {
returnValue += parseFloat(v.slice(0, v.length - 2));
} else {
returnValue = value;
}
}
}
}, this);
}, this);
}
return returnValue;
};

27
src/methods/_parseYPosition.js
View File

@ -3,19 +3,22 @@
// Source: /src/methods/_parseYPosition.js
dimple._parseYPosition = function (value, parent) {
var returnValue = 0,
values;
if (value !== null && value !== undefined) {
values = value.toString().split(",");
values.forEach(function (v) {
if (v !== undefined && v !== null) {
if (!isNaN(v)) {
returnValue += parseFloat(v);
} else if (v.slice(-1) === "%") {
returnValue += dimple._parentHeight(parent) * (parseFloat(v.slice(0, v.length - 1)) / 100);
} else if (v.slice(-2) === "px") {
returnValue += parseFloat(v.slice(0, v.length - 2));
} else {
returnValue = value;
values.forEach(function (v) {
if (v !== undefined && v !== null) {
if (!isNaN(v)) {
returnValue += parseFloat(v);
} else if (v.slice(-1) === "%") {
returnValue += dimple._parentHeight(parent) * (parseFloat(v.slice(0, v.length - 1)) / 100);
} else if (v.slice(-2) === "px") {
returnValue += parseFloat(v.slice(0, v.length - 2));
} else {
returnValue = value;
}
}
}
}, this);
}, this);
}
return returnValue;
};

58
tmp/dimple.js
View File

@ -4547,7 +4547,7 @@ var dimple = {
returnValue = 0;
} else {
// Get the size from the parent recursively
returnValue = dimple._parseYPosition(d3.select(parent).attr("height"), parent.parentNode);
returnValue = dimple._parentHeight(parent.parentNode);
}
}
return returnValue;
@ -4574,7 +4574,7 @@ var dimple = {
returnValue = 0;
} else {
// Get the size from the parent recursively
returnValue = dimple._parseXPosition(d3.select(parent).attr("width"), parent.parentNode);
returnValue = dimple._parentWidth(parent.parentNode);
}
}
return returnValue;
@ -4585,20 +4585,23 @@ var dimple = {
// Source: /src/methods/_parseXPosition.js
dimple._parseXPosition = function (value, parent) {
var returnValue = 0,
values;
if (value !== null && value !== undefined) {
values = value.toString().split(",");
values.forEach(function (v) {
if (v !== undefined && v !== null) {
if (!isNaN(v)) {
returnValue += parseFloat(v);
} else if (v.slice(-1) === "%") {
returnValue += dimple._parentWidth(parent) * (parseFloat(v.slice(0, v.length - 1)) / 100);
} else if (v.slice(-2) === "px") {
returnValue += parseFloat(v.slice(0, v.length - 2));
} else {
returnValue = value;
values.forEach(function (v) {
if (v !== undefined && v !== null) {
if (!isNaN(v)) {
returnValue += parseFloat(v);
} else if (v.slice(-1) === "%") {
returnValue += dimple._parentWidth(parent) * (parseFloat(v.slice(0, v.length - 1)) / 100);
} else if (v.slice(-2) === "px") {
returnValue += parseFloat(v.slice(0, v.length - 2));
} else {
returnValue = value;
}
}
}
}, this);
}, this);
}
return returnValue;
};
@ -4607,20 +4610,23 @@ var dimple = {
// Source: /src/methods/_parseYPosition.js
dimple._parseYPosition = function (value, parent) {
var returnValue = 0,
values;
if (value !== null && value !== undefined) {
values = value.toString().split(",");
values.forEach(function (v) {
if (v !== undefined && v !== null) {
if (!isNaN(v)) {
returnValue += parseFloat(v);
} else if (v.slice(-1) === "%") {
returnValue += dimple._parentHeight(parent) * (parseFloat(v.slice(0, v.length - 1)) / 100);
} else if (v.slice(-2) === "px") {
returnValue += parseFloat(v.slice(0, v.length - 2));
} else {
returnValue = value;
values.forEach(function (v) {
if (v !== undefined && v !== null) {
if (!isNaN(v)) {
returnValue += parseFloat(v);
} else if (v.slice(-1) === "%") {
returnValue += dimple._parentHeight(parent) * (parseFloat(v.slice(0, v.length - 1)) / 100);
} else if (v.slice(-2) === "px") {
returnValue += parseFloat(v.slice(0, v.length - 2));
} else {
returnValue = value;
}
}
}
}, this);
}, this);
}
return returnValue;
};