Merge branch '844-Error-en-la-posición-al-crear-un-elemento-con-imagen-en-las-consolas-visuales' into 'develop'

Fix image align when create a static graph in vconsole - #844

See merge request !642
This commit is contained in:
vgilc 2017-07-13 13:15:26 +02:00
commit f10e67342d
1 changed files with 4 additions and 2 deletions

View File

@ -1521,7 +1521,6 @@ function set_static_graph_status(idElement, image, status) {
data: parameter,
success: function (data) {
set_static_graph_status(idElement, image, data);
if($('#'+idElement+' table').css('float') == 'right' || $('#'+idElement+ ' table').css('float') == 'left'){
$('#'+idElement+ ' img').css('margin-top', parseInt($('#'+idElement).css('height'))/2 - parseInt($('#'+idElement+ ' img').css('height'))/2);
}
@ -1557,7 +1556,6 @@ function set_static_graph_status(idElement, image, status) {
suffix = ".png";
break;
}
set_image("image", idElement, image + suffix);
}
@ -2028,6 +2026,10 @@ function createItem(type, values, id_data) {
if($('#preview > img')[0].naturalWidth > 150 || $('#preview > img')[0].naturalHeight > 150){
$image.attr('width', '70')
.attr('height', '70');
}
else{
$image.attr('width', $('#preview > img')[0].naturalWidth)
.attr('height', $('#preview > img')[0].naturalHeight);
}
}
else {