openstack/horizon
Code Issues Proposed changes

Merge "Revert "Network Topology graph "twitches"""

Browse Source
This commit is contained in:
Zuul 2018-08-20 14:24:02 +00:00 committed by Gerrit Code Review
commit 4aac674591
1 changed files with 4 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
openstack_dashboard/static/js/horizon.networktopologycommon.js
View File

@ -20,59 +20,6 @@ horizon.networktopologycommon = {
}
};
function isEqual(data1, data2) {
var list1 = [], list2 = [];
function compare2Objects (data1, data2) {
var item;
if (isNaN(data1) && isNaN(data2) && typeof data1 === 'number' && typeof data2 === 'number') {
return true;
}
// Compare primitives and functions.
// Check if both arguments link to the same object.
// Especially useful on the step where we compare prototypes
if (data1 === data2) {
return true;
}
for (item in data1) {
if (data2.hasOwnProperty(item) !== data1.hasOwnProperty(item)) {
return false;
}
else if (typeof data2[item] !== typeof data1[item]) {
return false;
}
switch (typeof (data1[item])) {
case 'object':
if (!compare2Objects (data1[item], data2[item])) {
return false;
}
break;
default:
if (data1[item] !== data2[item]) {
list1.push(data1[item]);
list2.push(data2[item]);
}
break;
}
}
return true;
}
if (!compare2Objects(data1, data2)) {
return false;
} else {
list1 = list1.sort();
list2 = list2.sort();
for (var i in list1) {
if (list2[i] != list1[i])
return false;
}
}
return true;
}
/**
* Common data loader for network topology views
*/
@ -83,7 +30,7 @@ horizon.networktopologyloader = {
reload_duration: 10000,
// timer controlling update intervals
update_timer: null,
previous_data : {},
init:function() {
var self = this;
if($('#networktopology').length === 0) {
@ -101,11 +48,8 @@ horizon.networktopologyloader = {
angular.element('#networktopology').data('networktopology') + '?' + angular.element.now(),
function(data) {
self.model = data;
if (!isEqual(data,self.previous_data)) {
angular.copy(data, self.previous_data);
$('#networktopology').trigger('change');
}
self.update_timer = setTimeout(function() {
$('#networktopology').trigger('change');
self.update_timer = setTimeout(function(){
self.update();
}, self.reload_duration);
}
@ -154,7 +98,7 @@ horizon.networktopologymessager = {
setTimeout(function() {
self.previous_message = null;
self.delete_data = {};
}, self.reload_duration);
},self.reload_duration);
}
});
},