Merge "Adding missing files in JSHint"

This commit is contained in:
Jenkins 2014-01-03 01:47:10 +00:00 committed by Gerrit Code Review
commit 4d04f1cae4
3 changed files with 55 additions and 28 deletions

View File

@ -442,10 +442,16 @@ horizon.d3_bar_chart = {
if ($(this).attr('tooltip-used')){
tooltip.html($(this).attr('tooltip-used'));
}
tooltip.style('visibility', 'visible');})
.on('mousemove', function(d){tooltip.style('top',
(event.pageY - 10) + 'px').style('left',(event.pageX + 10) + 'px');})
.on('mouseout', function(d){tooltip.style('visibility', 'hidden');})
tooltip.style('visibility', 'visible');
})
.on('mousemove', function(d){
tooltip
.style('top', (event.pageY - 10) + 'px')
.style('left',(event.pageX + 10) + 'px');
})
.on('mouseout', function(d){
tooltip.style('visibility', 'hidden');
})
.transition()
.duration(500)
.attr(self.trasition_attr, self.trasition_value);
@ -493,12 +499,16 @@ horizon.d3_bar_chart = {
];
self.wrapper.bar.selectAll('polygon')
.data([poly])
.enter().append('polygon')
.attr('points',function(d) {
return d.map(function(d) { return [d.x,d.y].join(','); }).join(' ');})
.attr('stroke','black')
.attr('stroke-width', 2);
.data([poly])
.enter()
.append('polygon')
.attr('points',function(d) {
return d.map(function(d) {
return [d.x,d.y].join(',');
}).join(' ');
})
.attr('stroke','black')
.attr('stroke-width', 2);
}
};
},
@ -545,8 +555,11 @@ horizon.d3_bar_chart = {
.style('stroke-width', 3)
.style('stroke-dasharray', ('6, 2'))
.on('mouseover', function(){tooltip.style('visibility', 'visible');})
.on('mousemove', function(){tooltip.style('top',
(event.pageY-10)+'px').style('left',(event.pageX+10)+'px');})
.on('mousemove', function(){
tooltip
.style('top',(event.pageY-10)+'px')
.style('left',(event.pageX+10)+'px');
})
.on('mouseout', function(){tooltip.style('visibility', 'hidden');});
// A normal line, so it shows popup even in spaces, it's also bigger so
@ -561,8 +574,11 @@ horizon.d3_bar_chart = {
.style('stroke', 'transparent')
.style('stroke-width', 5)
.on('mouseover', function(){tooltip.style('visibility', 'visible');})
.on('mousemove', function(){tooltip.style('top',
(event.pageY-10)+'px').style('left',(event.pageX+10)+'px');})
.on('mousemove', function(){
tooltip
.style('top',(event.pageY-10)+'px')
.style('left',(event.pageX+10)+'px');
})
.on('mouseout', function(){tooltip.style('visibility', 'hidden');});
}
};
@ -588,9 +604,14 @@ horizon.d3_bar_chart = {
.attr('ry', self.wrapper.lvl_curve)
.style('fill', self.wrapper.bkgrnd)
.on('mouseover', function(d){tooltip_free.style('visibility', 'visible');})
.on('mousemove', function(d){tooltip_free.style('top',
(event.pageY-10)+'px').style('left',(event.pageX+10)+'px');})
.on('mouseover', function(d){
tooltip_free.style('visibility', 'visible');
})
.on('mousemove', function(d){
tooltip_free
.style('top',(event.pageY-10)+'px')
.style('left',(event.pageX+10)+'px');
})
.on('mouseout', function(d){tooltip_free.style('visibility', 'hidden');});
self.wrapper.bar.append('rect')

View File

@ -1,12 +1,15 @@
horizon.inline_edit = {
get_cell_id: function (td_element) {
return (td_element.parents("tr").first().data("object-id")
+ "__" + td_element.data("cell-name"));
return [
td_element.parents("tr").first().data("object-id"),
"__",
td_element.data("cell-name")
].join('');
},
get_object_container: function (td_element) {
// global cell object container
if (!window.cell_object_container) {
window.cell_object_container = new Array();
window.cell_object_container = [];
}
return window.cell_object_container;
},
@ -14,14 +17,15 @@ horizon.inline_edit = {
var cell_id = horizon.inline_edit.get_cell_id(td_element);
var id = "cell__" + cell_id;
var container = horizon.inline_edit.get_object_container(td_element);
var cell_object;
if (container && container[id]){
// if cell object exists, I will reuse it
var cell_object = container[id];
cell_object = container[id];
cell_object.reset_with(td_element);
return cell_object;
} else {
// or I will create new cell object
var cell_object = new horizon.inline_edit.Cell(td_element);
cell_object = new horizon.inline_edit.Cell(td_element);
// saving cell object to global container
container[id] = cell_object;
return cell_object;
@ -153,7 +157,7 @@ horizon.inline_edit = {
// obtain the error message from response body
error_message = $.parseJSON(jqXHR.responseText).message;
// insert the error icon
var error = $('<div title="' + error_message + '" class="error"></div>')
var error = $('<div title="' + error_message + '" class="error"></div>');
self.td_element.find(".inline-edit-error").html(error);
error.tooltip({'placement':'top'});
}
@ -230,7 +234,7 @@ horizon.addInitFunction(function() {
cell.update(post_data);
evt.preventDefault();
}
};
$('table').on('click', '.inline-edit-submit', function (evt) {
submit_form(evt, this);

View File

@ -18,9 +18,14 @@ horizon.addInitFunction(function () {
//'curly': true
};
jsHintTest('angular/horizon.js', '/static/horizon/js/angular/horizon.js', config);
jsHintTest('angular/controllers/dummy.js', '/static/horizon/js/angular/controllers/dummy.js', config);
jsHintTest('angular/directives/forms.js', '/static/horizon/js/angular/directives/forms.js', config);
jsHintTest('horizon.communication.js', '/static/horizon/js/horizon.communication.js', config);
jsHintTest('horizon.conf.js', '/static/horizon/js/horizon.conf.js', config);
jsHintTest('horizon.cookies.js', '/static/horizon/js/horizon.cookies.js', config);
jsHintTest('horizon.d3barchart.js', '/static/horizon/js/horizon.d3barchart.js', config);
jsHintTest('horizon.d3linechart.js', '/static/horizon/js/horizon.d3linechart.js', config);
jsHintTest('horizon.d3piechart.js', '/static/horizon/js/horizon.d3piechart.js', config);
jsHintTest('horizon.firewalls.js', '/static/horizon/js/horizon.firewalls.js', config);
@ -34,6 +39,7 @@ horizon.addInitFunction(function () {
jsHintTest('horizon.networktopology.js', '/static/horizon/js/horizon.networktopology.js', config);
jsHintTest('horizon.quota.js', '/static/horizon/js/horizon.quota.js', config);
jsHintTest('horizon.tables.js', '/static/horizon/js/horizon.tables.js', config);
jsHintTest('horizon.tables_inline_edit.js', '/static/horizon/js/horizon.tables_inline_edit.js', config);
jsHintTest('horizon.tabs.js', '/static/horizon/js/horizon.tabs.js', config);
jsHintTest('horizon.templates.js', '/static/horizon/js/horizon.templates.js', config);
jsHintTest('horizon.users.js', '/static/horizon/js/horizon.users.js', config);
@ -43,10 +49,6 @@ horizon.addInitFunction(function () {
jsHintTest('tests/modals.js', '/static/horizon/tests/modals.js', config);
jsHintTest('tests/tables.js', '/static/horizon/tests/tables.js', config);
jsHintTest('tests/templates.js', '/static/horizon/tests/templates.js', config);
jsHintTest('angular/horizon.js', '/static/horizon/js/angular/horizon.js', config);
jsHintTest('angular/directives/forms.js', '/static/horizon/js/angular/directives/forms.js', config);
jsHintTest('angular/controllers/dummy.js', '/static/horizon/js/angular/controllers/dummy.js', config);
});
});