Project

General

Profile

« Previous | Next » 

Revision 8eaa6ba7

Added by Ohad Levy about 7 years ago

fixes #18796 - do not flot charts by default

flot initalization relay on css class, if the css class conflict,
legacy flot to try and initalize on the same div as c3.

this removes charts.js to load by default, and only load it in pages
which requires it.

View differences:

app/assets/javascripts/application.js
//= require scoped_search
//= require bootstrap
//= require patternfly
//= require charts
//= require topbar
//= require two-pane
//= require vendor
app/views/about/index.html.erb
<% title _("About") %>
<%= javascript 'proxy_status', 'about' %>
<%= javascript 'proxy_status', 'charts', 'about' %>
<div class="row" id="about">
<div class="col-md-7">
app/views/hosts/_form.html.erb
<%= javascript 'hosts', 'host_edit', 'host_edit_interfaces', 'class_edit', 'compute_resource' %>
<%= javascript 'hosts', 'host_edit', 'host_edit_interfaces', 'class_edit', 'compute_resource', 'charts' %>
<%= render "hosts/dhcp_lease_errors" if has_dhcp_lease_errors?(@host.errors) %>
<%= render "hosts/conflicts" if (!has_dhcp_lease_errors?(@host.errors) && has_conflicts?(@host.errors)) %>
<%= render "hosts/progress" %>

Also available in: Unified diff