Commit 349b9a44 authored by Sebastien Robin's avatar Sebastien Robin

graph gadget: simplify code by using renderjs recent features

parent 2e3afafb
...@@ -77,16 +77,7 @@ ...@@ -77,16 +77,7 @@
// ready // ready
///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////
.ready(function (gadget) { .ready(function (gadget) {
gadget.property_dict = { gadget.property_dict = {};
render_deferred: RSVP.defer()
};
})
.ready(function (gadget) {
return gadget.getElement()
.push(function (element) {
gadget.property_dict.element = element;
});
}) })
///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////
...@@ -108,7 +99,7 @@ ...@@ -108,7 +99,7 @@
graph_data_and_parameter, graph_data_and_parameter,
chart; chart;
container = gadget.property_dict.element.querySelector(".graph-content"); container = gadget.element.querySelector(".graph-content");
graph_data_and_parameter = getGraphDataAndParameterFromConfiguration(configuration_dict); graph_data_and_parameter = getGraphDataAndParameterFromConfiguration(configuration_dict);
console.log("graph_data_and_parameter", graph_data_and_parameter); console.log("graph_data_and_parameter", graph_data_and_parameter);
chart = new Chart(container, graph_data_and_parameter); chart = new Chart(container, graph_data_and_parameter);
...@@ -125,7 +116,7 @@ ...@@ -125,7 +116,7 @@
*/ */
var gadget = this, var gadget = this,
graph_data_and_parameter, graph_data_and_parameter,
container = gadget.property_dict.element.querySelector(".graph-content"), container = gadget.element.querySelector(".graph-content"),
chart; chart;
gadget.property_dict.chart.destroy(); gadget.property_dict.chart.destroy();
graph_data_and_parameter = getGraphDataAndParameterFromConfiguration(configuration_dict); graph_data_and_parameter = getGraphDataAndParameterFromConfiguration(configuration_dict);
......
...@@ -127,16 +127,7 @@ ...@@ -127,16 +127,7 @@
// ready // ready
///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////
.ready(function (gadget) { .ready(function (gadget) {
gadget.property_dict = { gadget.property_dict = {};
render_deferred: RSVP.defer()
};
})
.ready(function (gadget) {
return gadget.getElement()
.push(function (element) {
gadget.property_dict.element = element;
});
}) })
///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////
...@@ -156,10 +147,10 @@ ...@@ -156,10 +147,10 @@
container, container,
graph_data_and_parameter; graph_data_and_parameter;
container = gadget.property_dict.element.querySelector(".graph-content"); container = gadget.element.querySelector(".graph-content");
graph_data_and_parameter = getGraphDataAndParameterFromConfiguration(configuration_dict); graph_data_and_parameter = getGraphDataAndParameterFromConfiguration(configuration_dict);
gadget.property_dict.graph = new Dygraph(container, gadget.property_dict.graph = new Dygraph(container,
graph_data_and_parameter.dygraph_data, graph_data_and_parameter.dygraph_data,
graph_data_and_parameter.dygraph_parameter_dict); graph_data_and_parameter.dygraph_parameter_dict);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment