--- a/cms/app-client/app/components/visu-carto.js Wed Jan 20 23:05:52 2016 +0100
+++ b/cms/app-client/app/components/visu-carto.js Wed Jan 20 23:51:55 2016 +0100
@@ -5,8 +5,6 @@
didInsertElement: function(){
var _this = this;
- var continentsDataProvider;
-
var franceDataProvider = {
mapVar: AmCharts.maps.france2016Low,
getAreasFromMap:true,
@@ -99,7 +97,7 @@
// console.log("getTotalLength", event.event.originalTarget.getTotalLength());
// console.log("getBBox", event.event.originalTarget.getBBox());
// console.log("event", event.event.originalTarget.attributes[1].d);
- if (event.mapObject.id == "backButton") {
+ if (event.mapObject.id === "backButton") {
handleGoHome();
}
_this.sendAction('action', event.mapObject.title);
@@ -113,12 +111,13 @@
var areaList = [];
var count = {};
- area.svg.g.path.map(function(elt, index){
+ area.svg.g.path.map(function(elt){
var length = _this.get("documents").filterBy("spatial", elt.title).toArray().length;
- if (length > 0)
+ if (length > 0){
count[elt.id]= length;
+ }
});
- area.svg.g.path.map(function(elt, index){
+ area.svg.g.path.map(function(elt){
areaList.push({
id: elt.id,
--- a/cms/app-client/app/components/visu-chrono.js Wed Jan 20 23:05:52 2016 +0100
+++ b/cms/app-client/app/components/visu-chrono.js Wed Jan 20 23:51:55 2016 +0100
@@ -10,36 +10,36 @@
var isMouseDown = false,
isHighlighted;
- $("#our_table li").mousedown(function () {
+ Ember.$("#our_table li").mousedown(function () {
isMouseDown = true;
- $(this).toggleClass("highlighted");
- isHighlighted = $(this).hasClass("highlighted");
+ Ember.$(this).toggleClass("highlighted");
+ isHighlighted = Ember.$(this).hasClass("highlighted");
_this.sendUpdate();
return false; // prevent text selection
}).mouseover(function () {
if (isMouseDown) {
- $(this).toggleClass("highlighted", isHighlighted);
+ Ember.$(this).toggleClass("highlighted", isHighlighted);
_this.sendUpdate();
}
}).bind("selectstart", function () {
return false;
- })
+ });
- $(document).mouseup(function () {
+ Ember.$(document).mouseup(function () {
isMouseDown = false;
});
},
sendUpdate: function(){
var dateQuery = [];
- $('.highlighted').map(function(index, elt) {
- dateQuery.push(parseInt($(elt).parent().attr('id')) + parseInt($(elt).html()));
+ Ember.$('.highlighted').map(function(index, elt) {
+ dateQuery.push(parseInt(Ember.$(elt).parent().attr('id')) + parseInt(Ember.$(elt).html()));
});
this.sendAction('action', dateQuery);
},
highlightQuery: function(list){
- list.map(function(elt, index){
+ list.map(function(elt){
var year = Math.floor(parseInt(elt)/10)*10;
- $("#"+year+" ."+(parseInt(elt)-year)).toggleClass("highlighted", true);
+ Ember.$("#"+year+" ."+(parseInt(elt)-year)).toggleClass("highlighted", true);
});
}
});
--- a/cms/app-client/app/components/visu-langues.js Wed Jan 20 23:05:52 2016 +0100
+++ b/cms/app-client/app/components/visu-langues.js Wed Jan 20 23:51:55 2016 +0100
@@ -64,9 +64,7 @@
// We also take a snapshot of the original children (_children) to avoid
// the children being overwritten when when layout is computed.
function accumulate(d) {
- return (d._children = d.children)
- ? d.value = d.children.reduce(function(p, v) { return p + accumulate(v); }, 0)
- : d.value;
+ return (d._children = d.children) ? d.value = d.children.reduce(function(p, v) { return p + accumulate(v); }, 0) : d.value;
}
// Compute the treemap layout recursively such that each group of siblings
@@ -105,18 +103,12 @@
.data(d._children)
.enter().append("g");
- g.classed("bla", true).on("click", selectHandler)
+ g.classed("bla", true).on("click", selectHandler);
g.filter(function(d) { return d._children; })
.classed("children", true)
.on("click", transition);
- // g.selectAll(".child")
- // .data(function(d) { return d._children || [d]; })
- // .enter().append("rect")
- // .attr("class", "child")
- // .call(rect);
-
g.append("rect")
.attr("class", "parent")
// .attr("fill", (d.color || "#bbb"))
@@ -130,7 +122,7 @@
.call(text);
function transition(d) {
- if (transitioning || !d) return;
+ if (transitioning || !d) { return; }
selectHandler(d);
transitioning = true;
@@ -174,12 +166,12 @@
return g;
}
- function text(text) {
+ function text() {
text.attr("x", function(d) { return x(d.x) + 6; })
.attr("y", function(d) { return y(d.y) + 6; });
}
- function rect(rect) {
+ function rect() {
rect.attr("x", function(d) { return x(d.x); })
.attr("y", function(d) { return y(d.y); })
.attr("width", function(d) { return x(d.x + d.dx) - x(d.x); })
@@ -188,9 +180,7 @@
}
function name(d) {
- return d.parent
- ? name(d.parent) + "." + d.name
- : d.name;
+ return d.parent ? name(d.parent) + "." + d.name : d.name;
}
});
}
--- a/cms/app-client/app/routes/application.js Wed Jan 20 23:05:52 2016 +0100
+++ b/cms/app-client/app/routes/application.js Wed Jan 20 23:51:55 2016 +0100
@@ -1,13 +1,13 @@
import Ember from 'ember';
export default Ember.Route.extend({
- serializeQueryParam: function(value, urlKey, defaultValueType) {
+ serializeQueryParam: function(value, urlKey) {
if (urlKey === 'date') {
return value;
}
return '' + value;
},
- deserializeQueryParam: function(value, urlKey, defaultValueType) {
+ deserializeQueryParam: function(value, urlKey) {
if (urlKey === 'date') {
var arr = [];
for (var i = 0; i < value.length; i++) {
@@ -22,10 +22,10 @@
return this.store.findAll('document');
},
actions: {
- willTransition: function(transition) {
+ willTransition: function() {
var _this = this;
var queryParams = {};
- this.controller.get('queryParams').map(function(elt, index){
+ this.controller.get('queryParams').map(function(elt){
queryParams[elt] = _this.controller.get(elt);
});
this.transitionTo({ queryParams: queryParams });