diff --git a/extras/chrome_extension/js/background.js b/extras/chrome_extension/js/background.js index 8f3b80e866..14960d849a 100644 --- a/extras/chrome_extension/js/background.js +++ b/extras/chrome_extension/js/background.js @@ -3,7 +3,7 @@ var isFetching = null; var storedEvents = new Array(); var notVisited = {}; -$(window).load(function() { +$(window).on('load', function() { initilise(); // Wait some ms to throw main function var delay = setTimeout(main, 100); diff --git a/pandora_console/godmode/reporting/visual_console_builder.editor.js b/pandora_console/godmode/reporting/visual_console_builder.editor.js index 88f27d76b0..cada5a2f51 100755 --- a/pandora_console/godmode/reporting/visual_console_builder.editor.js +++ b/pandora_console/godmode/reporting/visual_console_builder.editor.js @@ -50,10 +50,10 @@ function toggle_advance_options_palette(close) { function visual_map_main() { img_handler_start = "images/dot_red.png"; img_handler_end = "images/dot_green.png"; - get_image_url(img_handler_start).success(function (data) { + get_image_url(img_handler_start).done(function (data) { img_handler_start = data; }); - get_image_url(img_handler_end).success(function (data) { + get_image_url(img_handler_end).done(function (data) { img_handler_end = data; }); @@ -65,9 +65,7 @@ function visual_map_main() { eventsItems(); //Fixed to wait the load of images. - $(window).load(function() { - - + $(window).on('load', function() { $('#module').change(function(){ var txt = $("#module").val(); if(selectedItem == 'simple_value' || creationItem == 'simple_value'){ @@ -153,8 +151,7 @@ function visual_map_main() { draw_user_lines("", 0, 0, 0 , 0, 0, true); //~ center_labels(); - } - ); + }); obj_js_user_lines = new jsGraphics("background"); @@ -1978,14 +1975,14 @@ function cleanFields(item) { $("select[name=period]").val(''); $("input[name=width]").val(0); $("input[name=height]").val(0); - $("select[name=parent]").val(''); + $("select[name=parent]").val(0); $("select[name=linked_map_status_calculation_type]").val('default').change(); - $("select[name=map_linked]").val('').change(); + $("select[name=map_linked]").val(0).change(); $("input[name=linked_map_node_id]").val(0); $("input[name=map_linked_weight]").val(''); $("input[name=linked_map_status_service_critical]").val(''); $("input[name=linked_map_status_service_warning]").val(''); - $("select[name=element_group]").val(''); + $("select[name=element_group]").val(0); $("input[name=width_module_graph]").val(300); $("input[name=height_module_graph]").val(180); $("input[name='width_box']").val(300); diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php index afcfe1d604..1451cb80d3 100755 --- a/pandora_console/include/functions_visual_map.php +++ b/pandora_console/include/functions_visual_map.php @@ -3369,7 +3369,7 @@ function visual_map_print_visual_map ($id_layout, $show_links = true, var user_lines = Array(); //Fixed to wait the load of images. - $(window).load(function () { + $(window).on('load', function () { draw_lines(lines, 'background_' + id_layout); draw_user_lines_read('background_' + id_layout); //center_labels(); diff --git a/pandora_console/include/functions_visual_map_editor.php b/pandora_console/include/functions_visual_map_editor.php index 3a270f2135..f8db1a362f 100755 --- a/pandora_console/include/functions_visual_map_editor.php +++ b/pandora_console/include/functions_visual_map_editor.php @@ -203,7 +203,7 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) { $form_items['image_row']['html'] = '' . __('Image') . ' ' . - html_print_select ($images_list, 'image', '', 'showPreview(this.value);', 'None', 'none', true) . + html_print_select ($images_list, 'image', '', 'showPreview(this.value);', 'None', '', true) . ''; $form_items['clock_animation_row'] = array(); @@ -696,7 +696,7 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) { __('Parent') . ' ' . html_print_input_hidden('parents_load', base64_encode(json_encode($parents)), true) . - html_print_select($parents, 'parent', '', '', __('None'), 0, true) . + html_print_select($parents, 'parent', 0, '', __('None'), 0, true) . ''; $form_items_advance['map_linked_row'] = array(); @@ -879,11 +879,12 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) { "VR", true, 'element_group', - __('All'), - '', - '', 0, - true) . + '', + '', + '', + true + ) . ui_print_help_tip ( __("If selected, restrict visualization of this item in the visual console to users who have access to selected group. This is also used on calculating child visual consoles."), true) . ''; diff --git a/pandora_console/operation/visual_console/public_console.php b/pandora_console/operation/visual_console/public_console.php index a06404109f..396ddb2800 100755 --- a/pandora_console/operation/visual_console/public_console.php +++ b/pandora_console/operation/visual_console/public_console.php @@ -190,7 +190,7 @@ $ignored_params['refr'] = ''; //~ fetchMap(); }); - $(window).load (function () { + $(window).on('load', function () { $('.item:not(.icon) img:not(.b64img)').each( function() { if ($(this).css('float')=='left' || $(this).css('float')=='right') { if( $(this).parent()[0].tagName == 'DIV'){ diff --git a/pandora_console/operation/visual_console/pure_ajax.php b/pandora_console/operation/visual_console/pure_ajax.php index c0367649d3..a0183576f6 100644 --- a/pandora_console/operation/visual_console/pure_ajax.php +++ b/pandora_console/operation/visual_console/pure_ajax.php @@ -186,7 +186,7 @@ $ignored_params['refr'] = ''; }); - $(window).load (function () { + $(window).on('load', function () { $('.item:not(.icon) img').each(function(){ diff --git a/pandora_console/operation/visual_console/render_view.php b/pandora_console/operation/visual_console/render_view.php index 4e3429ad9b..88aa649ecf 100755 --- a/pandora_console/operation/visual_console/render_view.php +++ b/pandora_console/operation/visual_console/render_view.php @@ -283,7 +283,7 @@ $ignored_params['refr'] = ''; }); - $(window).load (function () { + $(window).on('load', function () { $('.item:not(.icon) img:not(.b64img)').each( function() { if ($(this).css('float')=='left' || $(this).css('float')=='right') { if( $(this).parent()[0].tagName == 'DIV'){