openstack
/
horizon
Code Issues Proposed changes

Fix styling issues in networktopologycommon.js 

Follow-up patch for https://review.openstack.org/#/c/543231/
No indent, 2-char indent and 4-char indent are used mixedly.

TrivialFix

Change-Id: I6e190d49c0ba908ab87b4d810ebbec70ee184b15
Related-Bug: #1716834
This commit is contained in:
Akihiro Motoki 2018-06-13 19:37:40 +09:00
parent 77ff5151c8
commit 1ca8555011
1 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,54 +21,54 @@ horizon.networktopologycommon = {
}; };
function isEqual(data1, data2) { function isEqual(data1, data2) {
var list1=[],list2=[]; var list1 = [], list2 = [];
function compare2Objects (data1, data2) { function compare2Objects (data1, data2) {
var item; var item;
if (isNaN(data1) && isNaN(data2) && typeof data1 === 'number' && typeof data2 === 'number') { if (isNaN(data1) && isNaN(data2) && typeof data1 === 'number' && typeof data2 === 'number') {
return true; return true;
} }
// Compare primitives and functions. // Compare primitives and functions.
// Check if both arguments link to the same object. // Check if both arguments link to the same object.
// Especially useful on the step where we compare prototypes // Especially useful on the step where we compare prototypes
if (data1 === data2) { if (data1 === data2) {
return true; return true;
} }
for (item in data1) { for (item in data1) {
if (data2.hasOwnProperty(item) !== data1.hasOwnProperty(item)) { if (data2.hasOwnProperty(item) !== data1.hasOwnProperty(item)) {
return false; return false;
} }
else if (typeof data2[item] !== typeof data1[item]) { else if (typeof data2[item] !== typeof data1[item]) {
return false; return false;
} }
switch (typeof (data1[item])) { switch (typeof (data1[item])) {
case 'object': case 'object':
if (!compare2Objects (data1[item], data2[item])) { if (!compare2Objects (data1[item], data2[item])) {
return false; return false;
} }
break; break;
default: default:
if (data1[item] !== data2[item]) { if (data1[item] !== data2[item]) {
list1.push(data1[item]); list1.push(data1[item]);
list2.push(data2[item]); list2.push(data2[item]);
} }
break; break;
} }
} }
return true; return true;
} }
if(!compare2Objects(data1, data2)){ if (!compare2Objects(data1, data2)) {
return false; return false;
}else{ } else {
list1 = list1.sort(); list1 = list1.sort();
list2 = list2.sort(); list2 = list2.sort();
for(var i in list1){ for (var i in list1) {
if(list2[i]!=list1[i]) if (list2[i] != list1[i])
return false; return false;
} }
} }
return true; return true;
} }
@ -101,12 +101,12 @@ horizon.networktopologyloader = {
angular.element('#networktopology').data('networktopology') + '?' + angular.element.now(), angular.element('#networktopology').data('networktopology') + '?' + angular.element.now(),
function(data) { function(data) {
self.model = data; self.model = data;
if(!isEqual(data,self.previous_data)) { if (!isEqual(data,self.previous_data)) {
angular.copy(data, self.previous_data); angular.copy(data, self.previous_data);
$('#networktopology').trigger('change'); $('#networktopology').trigger('change');
} }
self.update_timer = setTimeout(function(){ self.update_timer = setTimeout(function() {
self.update(); self.update();
}, self.reload_duration); }, self.reload_duration);
} }
); );
@ -154,7 +154,7 @@ horizon.networktopologymessager = {
setTimeout(function() { setTimeout(function() {
self.previous_message = null; self.previous_message = null;
self.delete_data = {}; self.delete_data = {};
},self.reload_duration); }, self.reload_duration);
} }
}); });
}, },