Merge branch 'ent-8015-palabras-conflictivas' into 'develop'
Removed some cheerful words in the project Closes pandora_enterprise#8015 See merge request artica/pandorafms!4460
This commit is contained in:
commit
fff8f910f8
|
@ -88,7 +88,7 @@ public class PandoraWebView extends Activity {
|
|||
//Check the first load the page for to hide a toast with the
|
||||
//connection message
|
||||
|
||||
//Close the CustomToast (I love this hack, fuck javalovers and yours patterns.).
|
||||
//Close the CustomToast.
|
||||
if (ConnectionCustomToast.activity != null)
|
||||
ConnectionCustomToast.activity.finish();
|
||||
}
|
||||
|
|
319
extras/cats.html
319
extras/cats.html
|
@ -1,54 +1,64 @@
|
|||
<html>
|
||||
<head>
|
||||
<title>gatete</title>
|
||||
<script type="text/javascript" src="http://code.jquery.com/jquery-2.2.0.min.js"></script>
|
||||
<script
|
||||
type="text/javascript"
|
||||
src="http://code.jquery.com/jquery-2.2.0.min.js"
|
||||
></script>
|
||||
<script type="text/javascript" src="http://d3js.org/d3.v3.min.js"></script>
|
||||
</head>
|
||||
<body>
|
||||
<script>
|
||||
|
||||
var svg = d3.select("#test svg");
|
||||
</script>
|
||||
<body>
|
||||
<script>
|
||||
var svg = d3.select("#test svg");
|
||||
</script>
|
||||
|
||||
<div id="test">
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="1000px" height="1000px" style="background: black;">
|
||||
<image id="cat_piano" x="400" y="-100" width="50%" height="50%" xlink:href="https://media.giphy.com/media/ymckEpq27dQ9W/giphy.gif" />
|
||||
<svg
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:xlink="http://www.w3.org/1999/xlink"
|
||||
width="1000px"
|
||||
height="1000px"
|
||||
style="background: black;"
|
||||
>
|
||||
<image
|
||||
id="cat_piano"
|
||||
x="400"
|
||||
y="-100"
|
||||
width="50%"
|
||||
height="50%"
|
||||
xlink:href="https://media.giphy.com/media/ymckEpq27dQ9W/giphy.gif"
|
||||
/>
|
||||
<g id="zoom" transform="translate(-10 20) scale (1)">
|
||||
|
||||
<g
|
||||
transform="translate(100, 300) scale(0.50)"
|
||||
id="cat1">
|
||||
<g transform="translate(100, 300) scale(0.50)" id="cat1">
|
||||
<path
|
||||
id="path8068"
|
||||
d="m 80,286.64792 28.57143,-31.42857 94.28571,60 5.71429,122.85714 L 200,472.3622 l 82.85714,-54.28571 194.28572,8.57143 191.42857,31.42857 48.57143,40 -11.42857,-65.71429 -48.57143,-94.28571 31.42857,-51.42857 14.28571,-88.57143 62.85715,74.28571 65.71428,0 31.42857,-82.85714 42.85715,94.28572 L 920,340.93363 897.14286,423.79078 868.57143,515.21935 800,663.79078 814.28571,795.21935 760,855.21935 734.28571,649.50506 691.42857,672.3622 714.28571,883.79078 640,895.21935 l -8.57143,-208.57143 -85.71428,71.42857 -160,-14.28571 L 317.14286,695.21935 360,838.07649 l -22.85714,65.71429 -74.28572,-200 -11.42857,162.85714 -74.28571,-17.14286 40,-217.14286 -42.85715,-17.14285 5.71429,-85.71429 -5.71429,-54.28571 -2.85714,-108.57143 -20,-42.85714 z"
|
||||
style="fill:none;fill-rule:evenodd;stroke: red; fill: white; stroke-width:4px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
|
||||
style="fill:none;fill-rule:evenodd;stroke: red; fill: white; stroke-width:4px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
/>
|
||||
</g>
|
||||
|
||||
<g
|
||||
transform="translate(700, 500) scale(0.25)"
|
||||
id="cat2">
|
||||
<g transform="translate(700, 500) scale(0.25)" id="cat2">
|
||||
<path
|
||||
id="path8068"
|
||||
d="m 80,286.64792 28.57143,-31.42857 94.28571,60 5.71429,122.85714 L 200,472.3622 l 82.85714,-54.28571 194.28572,8.57143 191.42857,31.42857 48.57143,40 -11.42857,-65.71429 -48.57143,-94.28571 31.42857,-51.42857 14.28571,-88.57143 62.85715,74.28571 65.71428,0 31.42857,-82.85714 42.85715,94.28572 L 920,340.93363 897.14286,423.79078 868.57143,515.21935 800,663.79078 814.28571,795.21935 760,855.21935 734.28571,649.50506 691.42857,672.3622 714.28571,883.79078 640,895.21935 l -8.57143,-208.57143 -85.71428,71.42857 -160,-14.28571 L 317.14286,695.21935 360,838.07649 l -22.85714,65.71429 -74.28572,-200 -11.42857,162.85714 -74.28571,-17.14286 40,-217.14286 -42.85715,-17.14285 5.71429,-85.71429 -5.71429,-54.28571 -2.85714,-108.57143 -20,-42.85714 z"
|
||||
style="fill:none;fill-rule:evenodd;stroke: red; fill: white; stroke-width:4px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
|
||||
style="fill:none;fill-rule:evenodd;stroke: red; fill: white; stroke-width:4px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
/>
|
||||
</g>
|
||||
|
||||
<g
|
||||
transform="translate(200, 0) scale(0.25)"
|
||||
id="cat3">
|
||||
<g transform="translate(200, 0) scale(0.25)" id="cat3">
|
||||
<path
|
||||
id="path8068"
|
||||
d="m 80,286.64792 28.57143,-31.42857 94.28571,60 5.71429,122.85714 L 200,472.3622 l 82.85714,-54.28571 194.28572,8.57143 191.42857,31.42857 48.57143,40 -11.42857,-65.71429 -48.57143,-94.28571 31.42857,-51.42857 14.28571,-88.57143 62.85715,74.28571 65.71428,0 31.42857,-82.85714 42.85715,94.28572 L 920,340.93363 897.14286,423.79078 868.57143,515.21935 800,663.79078 814.28571,795.21935 760,855.21935 734.28571,649.50506 691.42857,672.3622 714.28571,883.79078 640,895.21935 l -8.57143,-208.57143 -85.71428,71.42857 -160,-14.28571 L 317.14286,695.21935 360,838.07649 l -22.85714,65.71429 -74.28572,-200 -11.42857,162.85714 -74.28571,-17.14286 40,-217.14286 -42.85715,-17.14285 5.71429,-85.71429 -5.71429,-54.28571 -2.85714,-108.57143 -20,-42.85714 z"
|
||||
style="fill:none;fill-rule:evenodd;stroke: red; fill: white; stroke-width:4px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
|
||||
style="fill:none;fill-rule:evenodd;stroke: red; fill: white; stroke-width:4px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
/>
|
||||
</g>
|
||||
|
||||
<g
|
||||
transform="translate(600, 0) scale(0.25)"
|
||||
id="cat4">
|
||||
<g transform="translate(600, 0) scale(0.25)" id="cat4">
|
||||
<path
|
||||
id="path8068"
|
||||
d="m 80,286.64792 28.57143,-31.42857 94.28571,60 5.71429,122.85714 L 200,472.3622 l 82.85714,-54.28571 194.28572,8.57143 191.42857,31.42857 48.57143,40 -11.42857,-65.71429 -48.57143,-94.28571 31.42857,-51.42857 14.28571,-88.57143 62.85715,74.28571 65.71428,0 31.42857,-82.85714 42.85715,94.28572 L 920,340.93363 897.14286,423.79078 868.57143,515.21935 800,663.79078 814.28571,795.21935 760,855.21935 734.28571,649.50506 691.42857,672.3622 714.28571,883.79078 640,895.21935 l -8.57143,-208.57143 -85.71428,71.42857 -160,-14.28571 L 317.14286,695.21935 360,838.07649 l -22.85714,65.71429 -74.28572,-200 -11.42857,162.85714 -74.28571,-17.14286 40,-217.14286 -42.85715,-17.14285 5.71429,-85.71429 -5.71429,-54.28571 -2.85714,-108.57143 -20,-42.85714 z"
|
||||
style="fill:none;fill-rule:evenodd;stroke: red; fill: white; stroke-width:4px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
|
||||
style="fill:none;fill-rule:evenodd;stroke: red; fill: white; stroke-width:4px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
/>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
@ -56,75 +66,128 @@ var svg = d3.select("#test svg");
|
|||
<script type="text/javascript">
|
||||
var svg = d3.select("svg #zoom");
|
||||
|
||||
|
||||
|
||||
svg.append("g")
|
||||
svg
|
||||
.append("g")
|
||||
.attr("id", "circulo")
|
||||
.attr("transform",
|
||||
function(d) {
|
||||
return "translate(" + get_center_element("#cat1")[0] + " " + get_center_element("#cat1")[1] + ")";})
|
||||
.attr("transform", function(d) {
|
||||
return (
|
||||
"translate(" +
|
||||
get_center_element("#cat1")[0] +
|
||||
" " +
|
||||
get_center_element("#cat1")[1] +
|
||||
")"
|
||||
);
|
||||
})
|
||||
.append("circle")
|
||||
.attr("style", "fill: rgb(0, 255, 0);")
|
||||
.attr("cx", 0)
|
||||
.attr("cy", 0)
|
||||
.attr("r", 20);
|
||||
|
||||
svg.append("g")
|
||||
.attr("transform",
|
||||
function(d) { return "translate(" + get_pos_element("#cat1")[0] + " " + get_pos_element("#cat1")[1] + ") scale(" + get_scale_element("#cat1") + ")";})
|
||||
svg
|
||||
.append("g")
|
||||
.attr("transform", function(d) {
|
||||
return (
|
||||
"translate(" +
|
||||
get_pos_element("#cat1")[0] +
|
||||
" " +
|
||||
get_pos_element("#cat1")[1] +
|
||||
") scale(" +
|
||||
get_scale_element("#cat1") +
|
||||
")"
|
||||
);
|
||||
})
|
||||
.append("rect")
|
||||
.attr("style", "fill:none; stroke:#ffff00;stroke-width:5")
|
||||
.attr("width", function(d) { return get_size_element("#cat1")[0];})
|
||||
.attr("height", function(d) { return get_size_element("#cat1")[1];});
|
||||
.attr("width", function(d) {
|
||||
return get_size_element("#cat1")[0];
|
||||
})
|
||||
.attr("height", function(d) {
|
||||
return get_size_element("#cat1")[1];
|
||||
});
|
||||
|
||||
svg.append("g")
|
||||
.attr("transform",
|
||||
function(d) {
|
||||
return "translate(" + get_center_element("#cat1")[0] + " " + get_center_element("#cat1")[1] + ") scale(" + get_scale_element("#cat1") + ")";})
|
||||
svg
|
||||
.append("g")
|
||||
.attr("transform", function(d) {
|
||||
return (
|
||||
"translate(" +
|
||||
get_center_element("#cat1")[0] +
|
||||
" " +
|
||||
get_center_element("#cat1")[1] +
|
||||
") scale(" +
|
||||
get_scale_element("#cat1") +
|
||||
")"
|
||||
);
|
||||
})
|
||||
.append("circle")
|
||||
.attr("style", "fill: none; stroke-width: 5; stroke: rgb(0, 0, 255);")
|
||||
.attr("cx", 0)
|
||||
.attr("cy", 0)
|
||||
.attr("r", get_radius_element("#cat1"));
|
||||
|
||||
svg.append("g")
|
||||
svg
|
||||
.append("g")
|
||||
.attr("id", "circulo")
|
||||
.attr("transform",
|
||||
function(d) {
|
||||
return "translate(" + get_center_element("#cat3")[0] + " " + get_center_element("#cat3")[1] + ")";})
|
||||
.attr("transform", function(d) {
|
||||
return (
|
||||
"translate(" +
|
||||
get_center_element("#cat3")[0] +
|
||||
" " +
|
||||
get_center_element("#cat3")[1] +
|
||||
")"
|
||||
);
|
||||
})
|
||||
.append("circle")
|
||||
.attr("style", "fill: rgb(0, 255, 0);")
|
||||
.attr("cx", 0)
|
||||
.attr("cy", 0)
|
||||
.attr("r", 20);
|
||||
|
||||
svg.append("g")
|
||||
.attr("transform",
|
||||
function(d) { return "translate(" + get_pos_element("#cat3")[0] + " " + get_pos_element("#cat3")[1] + ") scale(" + get_scale_element("#cat3") + ")";})
|
||||
svg
|
||||
.append("g")
|
||||
.attr("transform", function(d) {
|
||||
return (
|
||||
"translate(" +
|
||||
get_pos_element("#cat3")[0] +
|
||||
" " +
|
||||
get_pos_element("#cat3")[1] +
|
||||
") scale(" +
|
||||
get_scale_element("#cat3") +
|
||||
")"
|
||||
);
|
||||
})
|
||||
.append("rect")
|
||||
.attr("style", "fill:none; stroke:#ffff00;stroke-width:5")
|
||||
.attr("width", function(d) { return get_size_element("#cat3")[0];})
|
||||
.attr("height", function(d) { return get_size_element("#cat3")[1];});
|
||||
.attr("width", function(d) {
|
||||
return get_size_element("#cat3")[0];
|
||||
})
|
||||
.attr("height", function(d) {
|
||||
return get_size_element("#cat3")[1];
|
||||
});
|
||||
|
||||
svg.append("g")
|
||||
.attr("transform",
|
||||
function(d) {
|
||||
return "translate(" + get_center_element("#cat3")[0] + " " + get_center_element("#cat3")[1] + ") scale(" + get_scale_element("#cat3") + ")";})
|
||||
svg
|
||||
.append("g")
|
||||
.attr("transform", function(d) {
|
||||
return (
|
||||
"translate(" +
|
||||
get_center_element("#cat3")[0] +
|
||||
" " +
|
||||
get_center_element("#cat3")[1] +
|
||||
") scale(" +
|
||||
get_scale_element("#cat3") +
|
||||
")"
|
||||
);
|
||||
})
|
||||
.append("circle")
|
||||
.attr("style", "fill: none; stroke-width: 5; stroke: rgb(0, 0, 255);")
|
||||
.attr("cx", 0)
|
||||
.attr("cy", 0)
|
||||
.attr("r", get_radius_element("#cat3"));
|
||||
|
||||
|
||||
|
||||
|
||||
arrow_by_pieces2("gatete_flecha", "cat1", "cat2");
|
||||
arrow_by_pieces2("gatete_flecha2", "cat1", "cat4");
|
||||
arrow_by_pieces2("gatete_flecha3", "cat3", "cat4");
|
||||
|
||||
|
||||
|
||||
//~ arrow_by_pieces("gatete_flecha", "cat1", "cat2");
|
||||
//~ arrow_by_pieces("gatete_flecha", "cat3", "cat4");
|
||||
|
||||
|
@ -136,8 +199,7 @@ var svg = d3.select("#test svg");
|
|||
function get_radius_element(element) {
|
||||
var size = get_size_element(element);
|
||||
|
||||
return Math.sqrt(
|
||||
Math.pow(size[0] / 2, 2) + Math.pow(size[1] / 2, 2));
|
||||
return Math.sqrt(Math.pow(size[0] / 2, 2) + Math.pow(size[1] / 2, 2));
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -147,7 +209,7 @@ var svg = d3.select("#test svg");
|
|||
*/
|
||||
function get_scale_element(element) {
|
||||
var element_t = d3.transform(d3.select(element).attr("transform"));
|
||||
var element_t_scale = parseFloat(element_t['scale']);
|
||||
var element_t_scale = parseFloat(element_t["scale"]);
|
||||
|
||||
return element_t_scale;
|
||||
}
|
||||
|
@ -158,9 +220,12 @@ var svg = d3.select("#test svg");
|
|||
* This method get the element size [width, height]
|
||||
*/
|
||||
function get_size_element(element) {
|
||||
var element_b = d3.select(element).node().getBBox();
|
||||
var element_b = d3
|
||||
.select(element)
|
||||
.node()
|
||||
.getBBox();
|
||||
|
||||
return [element_b['width'], element_b['height']];
|
||||
return [element_b["width"], element_b["height"]];
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -170,13 +235,18 @@ var svg = d3.select("#test svg");
|
|||
*/
|
||||
function get_pos_element(element) {
|
||||
var element_t = d3.transform(d3.select(element).attr("transform"));
|
||||
var element_t_scale = parseFloat(element_t['scale']);
|
||||
var element_b = d3.select(element).node().getBBox();
|
||||
var element_t_scale = parseFloat(element_t["scale"]);
|
||||
var element_b = d3
|
||||
.select(element)
|
||||
.node()
|
||||
.getBBox();
|
||||
|
||||
var box_x = parseFloat(element_t.translate[0]) +
|
||||
parseFloat(element_b['x']) * element_t_scale;
|
||||
var box_y = parseFloat(element_t.translate[1]) +
|
||||
parseFloat(element_b['y']) * element_t_scale;
|
||||
var box_x =
|
||||
parseFloat(element_t.translate[0]) +
|
||||
parseFloat(element_b["x"]) * element_t_scale;
|
||||
var box_y =
|
||||
parseFloat(element_t.translate[1]) +
|
||||
parseFloat(element_b["y"]) * element_t_scale;
|
||||
|
||||
return [box_x, box_y];
|
||||
}
|
||||
|
@ -188,19 +258,24 @@ var svg = d3.select("#test svg");
|
|||
*/
|
||||
function get_center_element(element) {
|
||||
var element_t = d3.transform(d3.select(element).attr("transform"));
|
||||
var element_t_scale = parseFloat(element_t['scale']);
|
||||
var element_b = d3.select(element).node().getBBox();
|
||||
var element_t_scale = parseFloat(element_t["scale"]);
|
||||
var element_b = d3
|
||||
.select(element)
|
||||
.node()
|
||||
.getBBox();
|
||||
|
||||
var box_x = parseFloat(element_t.translate[0]) +
|
||||
parseFloat(element_b['x']) * element_t_scale;
|
||||
var box_y = parseFloat(element_t.translate[1]) +
|
||||
parseFloat(element_b['y']) * element_t_scale;
|
||||
var box_x =
|
||||
parseFloat(element_t.translate[0]) +
|
||||
parseFloat(element_b["x"]) * element_t_scale;
|
||||
var box_y =
|
||||
parseFloat(element_t.translate[1]) +
|
||||
parseFloat(element_b["y"]) * element_t_scale;
|
||||
|
||||
var width = (element_t_scale * element_b['width']);
|
||||
var height = (element_t_scale * element_b['height']);
|
||||
var width = element_t_scale * element_b["width"];
|
||||
var height = element_t_scale * element_b["height"];
|
||||
|
||||
var c_x = box_x + (width / 2);
|
||||
var c_y = box_y + (height / 2);
|
||||
var c_x = box_x + width / 2;
|
||||
var c_y = box_y + height / 2;
|
||||
|
||||
return [c_x, c_y];
|
||||
}
|
||||
|
@ -214,72 +289,53 @@ var svg = d3.select("#test svg");
|
|||
delta_x = Math.abs(point1[0] - point2[0]);
|
||||
delta_y = Math.abs(point1[1] - point1[1]);
|
||||
|
||||
return Math.sqrt(
|
||||
Math.pow(delta_x, 2) + Math.pow(delta_y, 2));
|
||||
return Math.sqrt(Math.pow(delta_x, 2) + Math.pow(delta_y, 2));
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Function get_angle_of_line
|
||||
* Return float
|
||||
* This method get the angle of line and x axe
|
||||
*/
|
||||
function get_angle_of_line(point1, point2) {
|
||||
return Math.atan2(point2[1] - point1[1], point2[0] - point1[0]) * 180 / Math.PI;
|
||||
return (
|
||||
(Math.atan2(point2[1] - point1[1], point2[0] - point1[0]) * 180) /
|
||||
Math.PI
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
|
||||
//~ function wait_for_preload_symbol(symbol) {
|
||||
//~ preload_symbol(symbol);
|
||||
//~
|
||||
//~ while (!is_preload_symbol(symbol)) {
|
||||
//~ sleep(1000);
|
||||
//~ }
|
||||
//~ }
|
||||
//~
|
||||
//~ function arrow_by_pieces(id_arrow, element1, element2, step) {
|
||||
//~
|
||||
//~ wait_for_preload_symbol('pedo');
|
||||
//~ wait_for_preload_symbol('caca');
|
||||
//~ ...
|
||||
//~ }
|
||||
|
||||
|
||||
|
||||
function arrow_by_pieces2(id_arrow, element1, element2, step) {
|
||||
if (typeof(step) === "undefined")
|
||||
step = 0;
|
||||
if (typeof step === "undefined") step = 0;
|
||||
|
||||
step++;
|
||||
|
||||
switch (step) {
|
||||
case 1:
|
||||
wait_for_preload_symbols(
|
||||
["body_arrow.svg#body_arrow",
|
||||
"head_arrow.svg#head_arrow"],
|
||||
["body_arrow.svg#body_arrow", "head_arrow.svg#head_arrow"],
|
||||
function() {
|
||||
arrow_by_pieces2(id_arrow, element1, element2, step)
|
||||
});
|
||||
arrow_by_pieces2(id_arrow, element1, element2, step);
|
||||
}
|
||||
);
|
||||
break;
|
||||
case 2:
|
||||
|
||||
var arrow = svg.append("g")
|
||||
var arrow = svg
|
||||
.append("g")
|
||||
.attr("id", id_arrow)
|
||||
.attr("style", "opacity: 0");
|
||||
|
||||
arrow.append("g")
|
||||
arrow
|
||||
.append("g")
|
||||
.attr("id", "body")
|
||||
.append("use")
|
||||
.attr("xlink:href", "body_arrow.svg#body_arrow");
|
||||
|
||||
arrow.append("g")
|
||||
arrow
|
||||
.append("g")
|
||||
.attr("id", "head")
|
||||
.append("use")
|
||||
.attr("xlink:href", "head_arrow.svg#head_arrow");
|
||||
|
||||
|
||||
var c_elem1 = get_center_element("#" + element1);
|
||||
var c_elem2 = get_center_element("#" + element2);
|
||||
var distance = get_distance_between_point(c_elem1, c_elem2);
|
||||
|
@ -295,7 +351,7 @@ var svg = d3.select("#test svg");
|
|||
var arrow_body_b = arrow_body.node().getBBox();
|
||||
|
||||
transform.translate[0] = c_elem1[0];
|
||||
transform.translate[1] = c_elem1[1] - arrow_body_b['height'] / 2;
|
||||
transform.translate[1] = c_elem1[1] - arrow_body_b["height"] / 2;
|
||||
transform.rotate = get_angle_of_line(c_elem1, c_elem2);
|
||||
|
||||
arrow.attr("transform", transform.toString());
|
||||
|
@ -308,10 +364,10 @@ var svg = d3.select("#test svg");
|
|||
var arrow_head = d3.select("#" + id_arrow + " #head");
|
||||
var arrow_head_b = arrow_head.node().getBBox();
|
||||
|
||||
var body_width = distance - arrow_head_b['width'];
|
||||
var body_width = distance - arrow_head_b["width"];
|
||||
|
||||
transform = d3.transform();
|
||||
transform.scale[0] = body_width / arrow_body_b['width'];
|
||||
transform.scale[0] = body_width / arrow_body_b["width"];
|
||||
arrow_body.attr("transform", transform.toString());
|
||||
|
||||
/*---------------------------------------------*/
|
||||
|
@ -322,8 +378,9 @@ var svg = d3.select("#test svg");
|
|||
var arrow_body_t = d3.transform(arrow_body.attr("transform"));
|
||||
|
||||
var scale = arrow_body_t.scale[0];
|
||||
var x = 0 + arrow_body_b['width'] * scale;
|
||||
var y = 0 + (arrow_body_b['height'] / 2 - arrow_head_b['height'] / 2);
|
||||
var x = 0 + arrow_body_b["width"] * scale;
|
||||
var y =
|
||||
0 + (arrow_body_b["height"] / 2 - arrow_head_b["height"] / 2);
|
||||
|
||||
transform.translate[0] = x;
|
||||
transform.translate[1] = y;
|
||||
|
@ -347,15 +404,13 @@ var svg = d3.select("#test svg");
|
|||
preload_symbol(symbol);
|
||||
|
||||
setTimeout(function() {
|
||||
wait(symbol,
|
||||
callback);
|
||||
wait(symbol, callback);
|
||||
}, 100);
|
||||
break;
|
||||
case 0:
|
||||
// Wait
|
||||
setTimeout(function() {
|
||||
wait(symbol,
|
||||
callback);
|
||||
wait(symbol, callback);
|
||||
}, 100);
|
||||
break;
|
||||
case 1:
|
||||
|
@ -376,31 +431,28 @@ var svg = d3.select("#test svg");
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
function preload_symbol(symbol, param_step) {
|
||||
var step;
|
||||
|
||||
|
||||
if (typeof(param_step) == "undefined") {
|
||||
if (typeof param_step == "undefined") {
|
||||
step = 1;
|
||||
param_step = 1;
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
step = param_step;
|
||||
}
|
||||
|
||||
|
||||
step++;
|
||||
|
||||
var base64symbol = btoa(symbol).replace(/=/g, "");
|
||||
|
||||
var callback = function (e) {
|
||||
var callback = function(e) {
|
||||
preload_symbol(symbol, step);
|
||||
}
|
||||
};
|
||||
|
||||
switch (param_step) {
|
||||
case 1:
|
||||
d3.select("svg").append("g")
|
||||
d3.select("svg")
|
||||
.append("g")
|
||||
.attr("id", base64symbol)
|
||||
.attr("data-loaded", 0)
|
||||
.style("opacity", 0)
|
||||
|
@ -418,8 +470,7 @@ var svg = d3.select("#test svg");
|
|||
function is_preload_symbol(symbol) {
|
||||
var base64symbol = btoa(symbol).replace(/=/g, "");
|
||||
|
||||
if (d3.select("#" + base64symbol).node() === null)
|
||||
return -1;
|
||||
if (d3.select("#" + base64symbol).node() === null) return -1;
|
||||
|
||||
return parseInt(d3.select("#" + base64symbol).attr("data-loaded"));
|
||||
}
|
||||
|
|
|
@ -118,8 +118,8 @@ class ClientTest extends \PHPUnit\Framework\TestCase
|
|||
|
||||
system('echo "file3" > '.$path.'3');
|
||||
file_put_contents($path.'extras/delete_files/delete_files.txt', "1\n");
|
||||
system('echo -e "create table teta (id int);\n" >'.$path.'extras/mr/2.sql');
|
||||
system('echo -e "create table teto (id int);\n" >>'.$path.'extras/mr/2.sql');
|
||||
system('echo -e "create table toum1 (id int);\n" >'.$path.'extras/mr/2.sql');
|
||||
system('echo -e "create table toum2 (id int);\n" >>'.$path.'extras/mr/2.sql');
|
||||
system('cd '.$path.' && zip '.$target.'/test_3.zip -r * >/dev/null');
|
||||
system('mv '.$target.'/test_3.zip '.$target.'/test_3.oum');
|
||||
|
||||
|
@ -142,7 +142,7 @@ class ClientTest extends \PHPUnit\Framework\TestCase
|
|||
|
||||
system('echo "file4" > '.$path.'4');
|
||||
file_put_contents($path.'extras/delete_files/delete_files.txt', "1\n");
|
||||
system('echo -e "drop table teta;\n" >'.$path.'extras/mr/3.sql');
|
||||
system('echo -e "drop table toum1;\n" >'.$path.'extras/mr/3.sql');
|
||||
system('cd '.$path.' && zip '.$target.'/test_4.zip -r * >/dev/null');
|
||||
system('mv '.$target.'/test_4.zip '.$target.'/test_4.oum');
|
||||
|
||||
|
|
|
@ -92,7 +92,7 @@ class ModuleTemplates extends HTML
|
|||
private $validPen;
|
||||
|
||||
/**
|
||||
* Complete list of PENes.
|
||||
* Complete list of PENs.
|
||||
*
|
||||
* @var array.
|
||||
*/
|
||||
|
|
|
@ -108,7 +108,7 @@ class ModuleGraph
|
|||
|
||||
$this->height -= 80;
|
||||
// Correct the height
|
||||
// For to avoid fucking IPHONES when they are in horizontal.
|
||||
// For to avoid IPHONES when they are in horizontal.
|
||||
if ($this->height < 140) {
|
||||
$this->height = 140;
|
||||
}
|
||||
|
|
|
@ -261,23 +261,22 @@ foreach ($result as $row) {
|
|||
$data[] = $attr[1] ($row[$attr[0]]);
|
||||
} else if (($config['command_snapshot']) && (preg_match("/[\n]+/i", $row[$attr[0]]))) {
|
||||
// Its a single-data, multiline data (data snapshot) ?
|
||||
// Detect string data with \n and convert to <br>'s
|
||||
// Detect string data with \n and convert to <br>'s.
|
||||
$datos = preg_replace('/\n/i', '<br>', $row[$attr[0]]);
|
||||
$datos = preg_replace('/\s/i', ' ', $datos);
|
||||
|
||||
// Because this *SHIT* of print_table monster, I cannot format properly this cells
|
||||
// so, eat this, motherfucker :))
|
||||
// Because this print_table monster, I cannot format properly this cells.
|
||||
$datos = "<span class='mono'>".$datos.'</span>';
|
||||
|
||||
// I dont why, but using index (value) method, data is automatically converted to html entities ¿?
|
||||
$data[$attr[1]] = $datos;
|
||||
} else if ($is_web_content_string) {
|
||||
// Fixed the goliat sends the strings from web
|
||||
// without HTML entities
|
||||
// without HTML entities.
|
||||
$data[$attr[1]] = io_safe_input($row[$attr[0]]);
|
||||
} else {
|
||||
// Just a string of alphanumerical data... just do print
|
||||
// Fixed the data from Selenium Plugin
|
||||
// Fixed the data from Selenium Plugin.
|
||||
if ($row[$attr[0]] != strip_tags($row[$attr[0]])) {
|
||||
$data[$attr[1]] = io_safe_input($row[$attr[0]]);
|
||||
} else {
|
||||
|
|
|
@ -134,9 +134,7 @@ sunshine
|
|||
hunter
|
||||
4321
|
||||
buddy
|
||||
porn
|
||||
morgan
|
||||
fuck
|
||||
4128
|
||||
whatever
|
||||
matrix
|
||||
|
@ -164,7 +162,6 @@ charles
|
|||
thomas
|
||||
casper
|
||||
jackie
|
||||
cumshot
|
||||
girls
|
||||
tigger
|
||||
stupid
|
||||
|
@ -172,7 +169,6 @@ monica
|
|||
boston
|
||||
booboo
|
||||
robert
|
||||
shit
|
||||
midnight
|
||||
braves
|
||||
coffee
|
||||
|
@ -212,11 +208,9 @@ sierra
|
|||
mercedes
|
||||
johnny
|
||||
george
|
||||
cumming
|
||||
leather
|
||||
5150
|
||||
gandalf
|
||||
sexy
|
||||
hunting
|
||||
232323
|
||||
doggie
|
||||
|
@ -279,8 +273,6 @@ member
|
|||
anthony
|
||||
austin
|
||||
paul
|
||||
fucked
|
||||
boobs
|
||||
blowme
|
||||
william
|
||||
mine
|
||||
|
@ -419,13 +411,11 @@ freedom
|
|||
magnum
|
||||
extreme
|
||||
internet
|
||||
fucking
|
||||
ginger
|
||||
juice
|
||||
redskins
|
||||
action
|
||||
captain
|
||||
blowjob
|
||||
abgrtyu
|
||||
erotic
|
||||
carter
|
||||
|
@ -478,7 +468,6 @@ winner
|
|||
131313
|
||||
mistress
|
||||
florida
|
||||
cock
|
||||
samantha
|
||||
123123
|
||||
phantom
|
||||
|
|
|
@ -929,9 +929,9 @@ sub PandoraFMS::Recon::Base::create_network_profile_modules($$) {
|
|||
|
||||
# 2. Verify Private Enterprise Number matches (PEN)
|
||||
if (defined($template->{'pen'})) {
|
||||
my @penes = split(',', $template->{'pen'});
|
||||
my @pens = split(',', $template->{'pen'});
|
||||
|
||||
next unless (is_in_array(\@penes, $self->get_pen($device)));
|
||||
next unless (is_in_array(\@pens, $self->get_pen($device)));
|
||||
}
|
||||
|
||||
# 3. Retrieve module list from target template.
|
||||
|
|
Loading…
Reference in New Issue